From ccb63bad052826d7f58a2a77814d822d8fafcfb4 Mon Sep 17 00:00:00 2001
From: "antje.faber" <antje.faber@open-xchange.com>
Date: Thu, 21 Dec 2023 15:53:06 +0100
Subject: [PATCH] online help 8.20

---
 help/l10n/en_GB/bk01-toc.html                 |  48 +-
 help/l10n/en_GB/index.html                    |  69 +--
 .../en_GB/ox.appsuite.user.chap.calendar.html |   6 +-
 ...x.appsuite.user.chap.dataorganisation.html |   6 +-
 .../en_GB/ox.appsuite.user.chap.drive.html    |   4 +-
 .../en_GB/ox.appsuite.user.chap.email.html    |   2 +-
 .../en_GB/ox.appsuite.user.chap.guard.html    |   8 +-
 .../en_GB/ox.appsuite.user.chap.security.html |   4 +-
 .../en_GB/ox.appsuite.user.chap.settings.html |   4 +-
 .../en_GB/ox.appsuite.user.chap.tasks.html    |   4 +-
 help/l10n/en_GB/ox.appsuite.user.index.html   | 401 +++++++++-------
 .../ox.appsuite.user.sect.about.glossary.html |  10 +-
 ...ppsuite.user.sect.calendar.add.alarms.html |   6 +-
 ...te.user.sect.calendar.add.attachments.html |   8 +-
 ...uite.user.sect.calendar.add.attendees.html |  10 +-
 ....appsuite.user.sect.calendar.add.call.html |   6 +-
 ...er.sect.calendar.add.conflicthandling.html |  12 +-
 ...ppsuite.user.sect.calendar.add.create.html |  12 +-
 ...ite.user.sect.calendar.add.datepicker.html |   6 +-
 ...psuite.user.sect.calendar.add.display.html |   6 +-
 ...suite.user.sect.calendar.add.followup.html |  12 +-
 .../ox.appsuite.user.sect.calendar.add.html   |   8 +-
 ...user.sect.calendar.add.icalattachment.html |  10 +-
 ...e.user.sect.calendar.add.participants.html |   7 +-
 ...ite.user.sect.calendar.add.recipients.html |  10 +-
 ...ite.user.sect.calendar.add.scheduling.html |  12 +-
 ...ppsuite.user.sect.calendar.add.serial.html |   6 +-
 ...psuite.user.sect.calendar.attachments.html |   2 +-
 ...ox.appsuite.user.sect.calendar.deputy.html |   4 +-
 ...ppsuite.user.sect.calendar.gui.create.html |   2 +-
 ...ite.user.sect.calendar.gui.detailview.html |   7 +-
 ...ite.user.sect.calendar.gui.foldertree.html |   2 +-
 ....appsuite.user.sect.calendar.gui.list.html |   2 +-
 ...x.appsuite.user.sect.calendar.gui.new.html |   5 +-
 ...appsuite.user.sect.calendar.gui.popup.html |  12 +-
 ...ite.user.sect.calendar.gui.scheduling.html |   2 +-
 ...psuite.user.sect.calendar.gui.toolbar.html |   9 +-
 ...ppsuite.user.sect.calendar.invitation.html |   4 +-
 ....user.sect.calendar.manage.categories.html | 106 +++++
 ....sect.calendar.manage.changeorganizer.html |   3 +-
 ...r.sect.calendar.manage.changereminder.html |   6 +-
 ...ser.sect.calendar.manage.changestatus.html |   5 +-
 ...uite.user.sect.calendar.manage.colors.html |  22 +-
 ...uite.user.sect.calendar.manage.delete.html |   7 +-
 ...uite.user.sect.calendar.manage.export.html |   8 +-
 ...ox.appsuite.user.sect.calendar.manage.html |   5 +-
 ...uite.user.sect.calendar.manage.import.html |  22 +-
 ...psuite.user.sect.calendar.manage.move.html |   5 +-
 ...suite.user.sect.calendar.manage.print.html |  12 +-
 ...e.user.sect.calendar.manage.timezones.html |   4 +-
 ...ox.appsuite.user.sect.calendar.search.html |   2 +-
 ....appsuite.user.sect.calendar.settings.html |  14 +-
 ....user.sect.calendar.view.appointments.html |   6 +-
 .../ox.appsuite.user.sect.calendar.view.html  |   8 -
 ...ite.user.sect.calendar.view.timezones.html |   2 +-
 ...ppsuite.user.sect.calendar.view.views.html |   2 +-
 ...ppsuite.user.sect.contacts.gui.create.html |  13 +-
 ...ite.user.sect.contacts.gui.detailview.html |  18 +-
 ...ite.user.sect.contacts.gui.foldertree.html |   1 +
 ....appsuite.user.sect.contacts.gui.list.html |   9 +-
 ...x.appsuite.user.sect.contacts.gui.new.html |   4 +-
 ...e.user.sect.contacts.gui.settingsmenu.html |   2 +-
 ...psuite.user.sect.contacts.gui.toolbar.html |   8 +-
 ....user.sect.contacts.manage.categories.html | 103 ++++
 ...uite.user.sect.contacts.manage.delete.html |  11 +-
 ...uite.user.sect.contacts.manage.export.html |  10 +-
 ...ox.appsuite.user.sect.contacts.manage.html |   1 +
 ...uite.user.sect.contacts.manage.import.html |  18 +-
 ...ect.contacts.manage.inviteappointment.html |  10 +-
 ...te.user.sect.contacts.manage.movecopy.html |  11 +-
 ...suite.user.sect.contacts.manage.print.html |  14 +-
 ...te.user.sect.contacts.manage.sendmail.html |   8 +-
 ...e.user.sect.contacts.manage.sendvcard.html |   9 +-
 ...ox.appsuite.user.sect.contacts.search.html |   2 +-
 ....appsuite.user.sect.contacts.settings.html |   2 +-
 ...ite.user.sect.contacts.useaddressbook.html |   4 +-
 ...ser.sect.contacts.useaddressdirectory.html |   4 +-
 ...uite.user.sect.contacts.view.haloview.html |  10 +-
 ...r.sect.dataorganisation.accounts.edit.html |   2 +-
 ...aorganisation.accounts.functionalmail.html |   2 +-
 ...user.sect.dataorganisation.categories.html |  43 +-
 ...user.sect.dataorganisation.deputy.add.html |   8 +-
 ...ser.sect.dataorganisation.deputy.edit.html |   6 +-
 ...ite.user.sect.dataorganisation.deputy.html |   4 +-
 ...ect.dataorganisation.sharing.examples.html |   2 +-
 ...r.sect.dataorganisation.sharing.share.html |   4 +-
 ....appsuite.user.sect.drive.gui.content.html |   1 +
 ...psuite.user.sect.drive.gui.foldertree.html |   1 +
 ....appsuite.user.sect.drive.gui.toolbar.html |  15 +-
 ...x.appsuite.user.sect.drive.gui.viewer.html |  20 +-
 .../ox.appsuite.user.sect.drive.settings.html |   4 +-
 .../ox.appsuite.user.sect.email.accounts.html |   2 +-
 ....appsuite.user.sect.email.attachments.html |   2 +-
 .../ox.appsuite.user.sect.email.deputy.html   |   4 +-
 ...x.appsuite.user.sect.email.gui.create.html |  16 +-
 ...psuite.user.sect.email.gui.detailview.html |   8 +-
 ...psuite.user.sect.email.gui.foldertree.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.html      |   2 +-
 .../ox.appsuite.user.sect.email.gui.list.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.new.html  |   2 +-
 ...ox.appsuite.user.sect.email.gui.popup.html |   3 +-
 ...uite.user.sect.email.gui.settingsmenu.html |   1 -
 .../ox.appsuite.user.sect.email.gui.tabs.html |  15 +-
 ....appsuite.user.sect.email.gui.toolbar.html |  22 +-
 ...uite.user.sect.email.manage.addportal.html |   7 +-
 ...psuite.user.sect.email.manage.archive.html |  18 +-
 ...ite.user.sect.email.manage.categories.html |  95 ++++
 ...user.sect.email.manage.collectaddress.html |  20 +-
 ...ppsuite.user.sect.email.manage.delete.html | 106 ++---
 ....user.sect.email.manage.deleteforever.html |  92 ++++
 ...appsuite.user.sect.email.manage.draft.html |   9 +-
 ....user.sect.email.manage.expungefolder.html |  18 +-
 .../ox.appsuite.user.sect.email.manage.html   |   8 +-
 ...ppsuite.user.sect.email.manage.import.html |  17 +-
 ...ser.sect.email.manage.inboxcategories.html |  17 +-
 ...appsuite.user.sect.email.manage.label.html |  12 +-
 ....appsuite.user.sect.email.manage.mark.html |   6 +-
 ...suite.user.sect.email.manage.movecopy.html |   6 +-
 ...uite.user.sect.email.manage.pdfexport.html |   7 +-
 ...appsuite.user.sect.email.manage.print.html |   8 +-
 ...psuite.user.sect.email.manage.recover.html |  97 ++++
 ...suite.user.sect.email.manage.reminder.html |   7 +-
 ....appsuite.user.sect.email.manage.save.html |   9 +-
 ...ppsuite.user.sect.email.manage.source.html |   8 +-
 ...suite.user.sect.email.manage.undelete.html |  75 +++
 ...te.user.sect.email.manage.unifiedmail.html |   2 +-
 .../ox.appsuite.user.sect.email.openai.html   |   2 +-
 ....appsuite.user.sect.email.openai.send.html |   2 +-
 .../ox.appsuite.user.sect.email.search.html   |   9 +-
 ...er.sect.email.send.attachmentexisting.html |  16 +-
 ...e.user.sect.email.send.attachmentlink.html |  14 +-
 ...uite.user.sect.email.send.attachments.html |  14 +-
 ...psuite.user.sect.email.send.attendees.html |  31 +-
 ...uite.user.sect.email.send.autoforward.html |   8 +-
 ...appsuite.user.sect.email.send.forward.html |   8 +-
 .../ox.appsuite.user.sect.email.send.html     |  14 +-
 .../ox.appsuite.user.sect.email.send.new.html |  35 +-
 ...x.appsuite.user.sect.email.send.reply.html |   8 +-
 ...appsuite.user.sect.email.send.replyto.html |  18 +-
 ....appsuite.user.sect.email.send.sender.html |  14 +-
 ...suite.user.sect.email.send.signatures.html |   8 +-
 ...psuite.user.sect.email.send.templates.html |  10 +-
 ...e.user.sect.email.send.vacationnotice.html |   8 +-
 .../ox.appsuite.user.sect.email.settings.html |  33 +-
 .../ox.appsuite.user.sect.email.view.html     |   3 +-
 ....sect.firststeps.gui.notificationarea.html |   2 +-
 ...uite.user.sect.guard.autocrypt.manage.html |   2 +-
 ....sect.guard.documents.createencrypted.html |   8 +-
 ...ox.appsuite.user.sect.guard.documents.html |   4 +-
 ...psuite.user.sect.guard.documents.open.html |   6 +-
 ...er.sect.guard.documents.saveencrypted.html |   6 +-
 ...ppsuite.user.sect.guard.drive.decrypt.html |   2 +-
 ...x.appsuite.user.sect.guard.email.send.html |   8 +-
 .../ox.appsuite.user.sect.guard.keys.html     |  23 +-
 ...te.user.sect.guard.keys.pgppublickeys.html |  57 +--
 ....user.sect.guard.keys.smimepublickeys.html |  85 ++++
 ...uite.user.sect.guard.keys.yourpgpkeys.html | 128 ++---
 ...te.user.sect.guard.keys.yoursmimekeys.html |  92 ++--
 ...suite.user.sect.guard.password.change.html |  75 +++
 ...er.sect.guard.password.deleterecovery.html |  74 +++
 .../ox.appsuite.user.sect.guard.password.html | 106 +----
 ...psuite.user.sect.guard.password.reset.html |  91 ++++
 .../ox.appsuite.user.sect.guard.settings.html | 170 +++++--
 ...ite.user.sect.settings.commonsettings.html |   6 +-
 ...appsuite.user.sect.settings.countdown.html |   6 +-
 ...e.user.sect.settings.notificationarea.html |   8 +-
 ...uite.user.sect.settings.notifications.html |  18 +-
 ...suite.user.sect.settings.personaldata.html |   2 +-
 ...ox.appsuite.user.sect.settings.search.html |   5 +-
 .../ox.appsuite.user.sect.tasks.add.html      |   2 +-
 ...psuite.user.sect.tasks.gui.detailview.html |   9 +-
 ...psuite.user.sect.tasks.gui.foldertree.html |   1 +
 .../ox.appsuite.user.sect.tasks.gui.list.html |  10 +-
 ...uite.user.sect.tasks.gui.settingsmenu.html |   5 +-
 ....appsuite.user.sect.tasks.gui.toolbar.html |   8 +-
 ...ite.user.sect.tasks.manage.categories.html | 103 ++++
 ....user.sect.tasks.manage.changeduedate.html |   9 +-
 ...e.user.sect.tasks.manage.changestatus.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.delete.html |  11 +-
 ...ppsuite.user.sect.tasks.manage.export.html |  10 +-
 .../ox.appsuite.user.sect.tasks.manage.html   |   1 +
 ...ppsuite.user.sect.tasks.manage.import.html |  18 +-
 ...ite.user.sect.tasks.manage.markasdone.html |   5 +-
 ....appsuite.user.sect.tasks.manage.move.html |  12 +-
 ...appsuite.user.sect.tasks.manage.print.html |  11 +-
 .../ox.appsuite.user.sect.tasks.search.html   |   2 +-
 help/l10n/es_ES/bk01-toc.html                 |  44 +-
 help/l10n/es_ES/index.html                    |  65 +--
 .../es_ES/ox.appsuite.user.chap.calendar.html |   6 +-
 ...x.appsuite.user.chap.dataorganisation.html |   6 +-
 .../es_ES/ox.appsuite.user.chap.drive.html    |   4 +-
 .../es_ES/ox.appsuite.user.chap.email.html    |   2 +-
 .../es_ES/ox.appsuite.user.chap.guard.html    |   4 +-
 .../es_ES/ox.appsuite.user.chap.security.html |   4 +-
 .../es_ES/ox.appsuite.user.chap.settings.html |   4 +-
 .../es_ES/ox.appsuite.user.chap.tasks.html    |   4 +-
 help/l10n/es_ES/ox.appsuite.user.index.html   | 401 +++++++++-------
 .../ox.appsuite.user.sect.about.glossary.html |  20 +-
 ...ppsuite.user.sect.calendar.add.alarms.html |   6 +-
 ...te.user.sect.calendar.add.attachments.html |   6 +-
 ...uite.user.sect.calendar.add.attendees.html |  12 +-
 ....appsuite.user.sect.calendar.add.call.html |  10 +-
 ...er.sect.calendar.add.conflicthandling.html |  10 +-
 ...ppsuite.user.sect.calendar.add.create.html |  14 +-
 ...ite.user.sect.calendar.add.datepicker.html |   8 +-
 ...psuite.user.sect.calendar.add.display.html |   6 +-
 ...suite.user.sect.calendar.add.followup.html |  10 +-
 .../ox.appsuite.user.sect.calendar.add.html   |  10 +-
 ...user.sect.calendar.add.icalattachment.html |  10 +-
 ...e.user.sect.calendar.add.participants.html |   7 +-
 ...ite.user.sect.calendar.add.recipients.html |  12 +-
 ...ite.user.sect.calendar.add.scheduling.html |  10 +-
 ...ppsuite.user.sect.calendar.add.serial.html |   8 +-
 ...psuite.user.sect.calendar.attachments.html |   2 +-
 .../ox.appsuite.user.sect.calendar.call.html  |   2 +-
 ...ox.appsuite.user.sect.calendar.deputy.html |   4 +-
 .../ox.appsuite.user.sect.calendar.edit.html  |   2 +-
 ...ppsuite.user.sect.calendar.gui.create.html |   2 +-
 ...ite.user.sect.calendar.gui.detailview.html |   7 +-
 ...ite.user.sect.calendar.gui.foldertree.html |   2 +-
 ....appsuite.user.sect.calendar.gui.list.html |   2 +-
 ...x.appsuite.user.sect.calendar.gui.new.html |   5 +-
 ...appsuite.user.sect.calendar.gui.popup.html |  12 +-
 ...psuite.user.sect.calendar.gui.toolbar.html |  11 +-
 ...ppsuite.user.sect.calendar.invitation.html |   2 +-
 ....user.sect.calendar.manage.categories.html | 106 +++++
 ....sect.calendar.manage.changeorganizer.html |   3 +-
 ...r.sect.calendar.manage.changereminder.html |   4 +-
 ...ser.sect.calendar.manage.changestatus.html |   1 +
 ...uite.user.sect.calendar.manage.colors.html |  22 +-
 ...uite.user.sect.calendar.manage.delete.html |   7 +-
 ...uite.user.sect.calendar.manage.export.html |   8 +-
 ...ox.appsuite.user.sect.calendar.manage.html |   1 +
 ...uite.user.sect.calendar.manage.import.html |  22 +-
 ...psuite.user.sect.calendar.manage.move.html |   5 +-
 ...suite.user.sect.calendar.manage.print.html |  12 +-
 ...e.user.sect.calendar.manage.timezones.html |   4 +-
 ...ox.appsuite.user.sect.calendar.search.html |   2 +-
 ....appsuite.user.sect.calendar.settings.html |  18 +-
 ....user.sect.calendar.view.appointments.html |   6 +-
 .../ox.appsuite.user.sect.calendar.view.html  |   8 -
 ...ite.user.sect.calendar.view.timezones.html |   2 +-
 ...ppsuite.user.sect.calendar.view.views.html |   2 +-
 .../ox.appsuite.user.sect.contacts.call.html  |   2 +-
 ...ppsuite.user.sect.contacts.gui.create.html |  13 +-
 ...ite.user.sect.contacts.gui.detailview.html |  18 +-
 ...ite.user.sect.contacts.gui.foldertree.html |   1 +
 ....appsuite.user.sect.contacts.gui.list.html |   9 +-
 ...x.appsuite.user.sect.contacts.gui.new.html |   4 +-
 ...e.user.sect.contacts.gui.settingsmenu.html |   2 +-
 ...psuite.user.sect.contacts.gui.toolbar.html |   8 +-
 ....user.sect.contacts.manage.categories.html | 103 ++++
 ...uite.user.sect.contacts.manage.delete.html |  11 +-
 ...uite.user.sect.contacts.manage.export.html |  10 +-
 ...ox.appsuite.user.sect.contacts.manage.html |   1 +
 ...uite.user.sect.contacts.manage.import.html |  18 +-
 ...ect.contacts.manage.inviteappointment.html |  10 +-
 ...te.user.sect.contacts.manage.movecopy.html |  11 +-
 ...suite.user.sect.contacts.manage.print.html |  14 +-
 ...te.user.sect.contacts.manage.sendmail.html |   8 +-
 ...e.user.sect.contacts.manage.sendvcard.html |   9 +-
 ...ox.appsuite.user.sect.contacts.search.html |   2 +-
 ....appsuite.user.sect.contacts.settings.html |   2 +-
 ...ite.user.sect.contacts.useaddressbook.html |   2 +-
 ...ser.sect.contacts.useaddressdirectory.html |   2 +-
 ...uite.user.sect.contacts.view.haloview.html |  10 +-
 ...r.sect.dataorganisation.accounts.edit.html |   2 +-
 ...aorganisation.accounts.functionalmail.html |   2 +-
 ...user.sect.dataorganisation.categories.html |  47 +-
 ...user.sect.dataorganisation.deputy.add.html |   8 +-
 ...ser.sect.dataorganisation.deputy.edit.html |   6 +-
 ...ite.user.sect.dataorganisation.deputy.html |   4 +-
 ...ect.dataorganisation.sharing.examples.html |   2 +-
 ...r.sect.dataorganisation.sharing.share.html |   4 +-
 ....appsuite.user.sect.drive.gui.content.html |   1 +
 ...psuite.user.sect.drive.gui.foldertree.html |   1 +
 ....appsuite.user.sect.drive.gui.toolbar.html |  15 +-
 ...x.appsuite.user.sect.drive.gui.viewer.html |  20 +-
 .../ox.appsuite.user.sect.drive.settings.html |   6 +-
 .../ox.appsuite.user.sect.email.accounts.html |   2 +-
 ....appsuite.user.sect.email.attachments.html |   2 +-
 .../ox.appsuite.user.sect.email.call.html     |   2 +-
 .../ox.appsuite.user.sect.email.deputy.html   |   4 +-
 ...x.appsuite.user.sect.email.gui.create.html |  16 +-
 ...psuite.user.sect.email.gui.detailview.html |   8 +-
 ...psuite.user.sect.email.gui.foldertree.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.html      |   2 +-
 .../ox.appsuite.user.sect.email.gui.list.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.new.html  |   2 +-
 ...ox.appsuite.user.sect.email.gui.popup.html |   3 +-
 ...uite.user.sect.email.gui.settingsmenu.html |   1 -
 .../ox.appsuite.user.sect.email.gui.tabs.html |  16 +-
 ....appsuite.user.sect.email.gui.toolbar.html |  22 +-
 ...uite.user.sect.email.manage.addportal.html |   7 +-
 ...psuite.user.sect.email.manage.archive.html |  18 +-
 ...ite.user.sect.email.manage.categories.html |  95 ++++
 ...user.sect.email.manage.collectaddress.html |  20 +-
 ...ppsuite.user.sect.email.manage.delete.html | 106 ++---
 ....user.sect.email.manage.deleteforever.html |  92 ++++
 ...appsuite.user.sect.email.manage.draft.html |   9 +-
 ....user.sect.email.manage.expungefolder.html |  18 +-
 .../ox.appsuite.user.sect.email.manage.html   |   8 +-
 ...ppsuite.user.sect.email.manage.import.html |  17 +-
 ...ser.sect.email.manage.inboxcategories.html |  17 +-
 ...appsuite.user.sect.email.manage.label.html |  12 +-
 ....appsuite.user.sect.email.manage.mark.html |   6 +-
 ...suite.user.sect.email.manage.movecopy.html |   6 +-
 ...uite.user.sect.email.manage.pdfexport.html |   7 +-
 ...appsuite.user.sect.email.manage.print.html |   8 +-
 ...psuite.user.sect.email.manage.recover.html |  97 ++++
 ...suite.user.sect.email.manage.reminder.html |   7 +-
 ....appsuite.user.sect.email.manage.save.html |   9 +-
 ...ppsuite.user.sect.email.manage.source.html |   8 +-
 ...suite.user.sect.email.manage.undelete.html |  75 +++
 ...te.user.sect.email.manage.unifiedmail.html |   2 +-
 .../ox.appsuite.user.sect.email.openai.html   |   2 +-
 ....appsuite.user.sect.email.openai.send.html |   2 +-
 .../ox.appsuite.user.sect.email.search.html   |   9 +-
 ...er.sect.email.send.attachmentexisting.html |  16 +-
 ...e.user.sect.email.send.attachmentlink.html |  14 +-
 ...uite.user.sect.email.send.attachments.html |  14 +-
 ...psuite.user.sect.email.send.attendees.html |  31 +-
 ...uite.user.sect.email.send.autoforward.html |   8 +-
 ...appsuite.user.sect.email.send.forward.html |   8 +-
 .../ox.appsuite.user.sect.email.send.html     |  14 +-
 .../ox.appsuite.user.sect.email.send.new.html |  35 +-
 ...x.appsuite.user.sect.email.send.reply.html |   8 +-
 ...appsuite.user.sect.email.send.replyto.html |  16 +-
 ....appsuite.user.sect.email.send.sender.html |  14 +-
 ...suite.user.sect.email.send.signatures.html |   8 +-
 ...psuite.user.sect.email.send.templates.html |  10 +-
 ...e.user.sect.email.send.vacationnotice.html |   8 +-
 .../ox.appsuite.user.sect.email.settings.html |  33 +-
 .../ox.appsuite.user.sect.email.view.html     |   3 +-
 ....sect.firststeps.gui.notificationarea.html |   2 +-
 ...x.appsuite.user.sect.guard.email.send.html |   6 +-
 .../ox.appsuite.user.sect.guard.keys.html     |  23 +-
 ...te.user.sect.guard.keys.pgppublickeys.html |  57 +--
 ....user.sect.guard.keys.smimepublickeys.html |  85 ++++
 ...uite.user.sect.guard.keys.yourpgpkeys.html | 142 +++---
 ...te.user.sect.guard.keys.yoursmimekeys.html |  90 ++--
 ...suite.user.sect.guard.password.change.html |  75 +++
 ...er.sect.guard.password.deleterecovery.html |  74 +++
 .../ox.appsuite.user.sect.guard.password.html | 108 +----
 ...psuite.user.sect.guard.password.reset.html |  91 ++++
 .../ox.appsuite.user.sect.guard.settings.html | 166 +++++--
 ...ite.user.sect.settings.commonsettings.html |   6 +-
 ...appsuite.user.sect.settings.countdown.html |   6 +-
 ...e.user.sect.settings.notificationarea.html |  14 +-
 ...uite.user.sect.settings.notifications.html |  20 +-
 ...suite.user.sect.settings.personaldata.html |   2 +-
 ...ite.user.sect.settings.presencestatus.html |   2 +-
 ...ox.appsuite.user.sect.settings.search.html |   5 +-
 .../ox.appsuite.user.sect.tasks.add.html      |   2 +-
 .../ox.appsuite.user.sect.tasks.call.html     |   2 +-
 ...psuite.user.sect.tasks.gui.detailview.html |   9 +-
 ...psuite.user.sect.tasks.gui.foldertree.html |   1 +
 .../ox.appsuite.user.sect.tasks.gui.list.html |  10 +-
 ...uite.user.sect.tasks.gui.settingsmenu.html |   5 +-
 ....appsuite.user.sect.tasks.gui.toolbar.html |   8 +-
 ...ite.user.sect.tasks.manage.categories.html | 103 ++++
 ....user.sect.tasks.manage.changeduedate.html |   9 +-
 ...e.user.sect.tasks.manage.changestatus.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.delete.html |  11 +-
 ...ppsuite.user.sect.tasks.manage.export.html |  10 +-
 .../ox.appsuite.user.sect.tasks.manage.html   |   1 +
 ...ppsuite.user.sect.tasks.manage.import.html |  18 +-
 ...ite.user.sect.tasks.manage.markasdone.html |   5 +-
 ....appsuite.user.sect.tasks.manage.move.html |  12 +-
 ...appsuite.user.sect.tasks.manage.print.html |  11 +-
 .../ox.appsuite.user.sect.tasks.search.html   |   2 +-
 help/l10n/es_MX/bk01-toc.html                 |  46 +-
 help/l10n/es_MX/index.html                    |  67 +--
 .../es_MX/ox.appsuite.user.chap.calendar.html |   6 +-
 ...x.appsuite.user.chap.dataorganisation.html |   6 +-
 .../es_MX/ox.appsuite.user.chap.drive.html    |   4 +-
 .../es_MX/ox.appsuite.user.chap.email.html    |   2 +-
 .../es_MX/ox.appsuite.user.chap.guard.html    |   6 +-
 .../es_MX/ox.appsuite.user.chap.security.html |   4 +-
 .../es_MX/ox.appsuite.user.chap.settings.html |   4 +-
 .../es_MX/ox.appsuite.user.chap.tasks.html    |   4 +-
 help/l10n/es_MX/ox.appsuite.user.index.html   | 399 +++++++++-------
 .../ox.appsuite.user.sect.about.glossary.html |  20 +-
 ...ppsuite.user.sect.calendar.add.alarms.html |   6 +-
 ...te.user.sect.calendar.add.attachments.html |   6 +-
 ...uite.user.sect.calendar.add.attendees.html |  12 +-
 ....appsuite.user.sect.calendar.add.call.html |  10 +-
 ...er.sect.calendar.add.conflicthandling.html |  10 +-
 ...ppsuite.user.sect.calendar.add.create.html |  14 +-
 ...ite.user.sect.calendar.add.datepicker.html |   8 +-
 ...psuite.user.sect.calendar.add.display.html |   6 +-
 ...suite.user.sect.calendar.add.followup.html |  10 +-
 .../ox.appsuite.user.sect.calendar.add.html   |  10 +-
 ...user.sect.calendar.add.icalattachment.html |  10 +-
 ...e.user.sect.calendar.add.participants.html |   7 +-
 ...ite.user.sect.calendar.add.recipients.html |  12 +-
 ...ite.user.sect.calendar.add.scheduling.html |  10 +-
 ...ppsuite.user.sect.calendar.add.serial.html |   8 +-
 ...psuite.user.sect.calendar.attachments.html |   2 +-
 .../ox.appsuite.user.sect.calendar.call.html  |   2 +-
 ...ox.appsuite.user.sect.calendar.deputy.html |   4 +-
 .../ox.appsuite.user.sect.calendar.edit.html  |   2 +-
 ...ppsuite.user.sect.calendar.gui.create.html |   2 +-
 ...ite.user.sect.calendar.gui.detailview.html |   7 +-
 ...ite.user.sect.calendar.gui.foldertree.html |   2 +-
 ....appsuite.user.sect.calendar.gui.list.html |   2 +-
 ...x.appsuite.user.sect.calendar.gui.new.html |   5 +-
 ...appsuite.user.sect.calendar.gui.popup.html |  12 +-
 ...psuite.user.sect.calendar.gui.toolbar.html |  11 +-
 ...ppsuite.user.sect.calendar.invitation.html |   2 +-
 ....user.sect.calendar.manage.categories.html | 106 +++++
 ....sect.calendar.manage.changeorganizer.html |   3 +-
 ...r.sect.calendar.manage.changereminder.html |   4 +-
 ...ser.sect.calendar.manage.changestatus.html |   1 +
 ...uite.user.sect.calendar.manage.colors.html |  22 +-
 ...uite.user.sect.calendar.manage.delete.html |   7 +-
 ...uite.user.sect.calendar.manage.export.html |   8 +-
 ...ox.appsuite.user.sect.calendar.manage.html |   1 +
 ...uite.user.sect.calendar.manage.import.html |  22 +-
 ...psuite.user.sect.calendar.manage.move.html |   5 +-
 ...suite.user.sect.calendar.manage.print.html |  12 +-
 ...e.user.sect.calendar.manage.timezones.html |   4 +-
 ...ox.appsuite.user.sect.calendar.search.html |   2 +-
 ....appsuite.user.sect.calendar.settings.html |  18 +-
 ....user.sect.calendar.view.appointments.html |   6 +-
 .../ox.appsuite.user.sect.calendar.view.html  |   8 -
 ...ite.user.sect.calendar.view.timezones.html |   2 +-
 ...ppsuite.user.sect.calendar.view.views.html |   2 +-
 .../ox.appsuite.user.sect.contacts.call.html  |   2 +-
 ...ppsuite.user.sect.contacts.gui.create.html |  13 +-
 ...ite.user.sect.contacts.gui.detailview.html |  18 +-
 ...ite.user.sect.contacts.gui.foldertree.html |   1 +
 ....appsuite.user.sect.contacts.gui.list.html |   9 +-
 ...x.appsuite.user.sect.contacts.gui.new.html |   4 +-
 ...e.user.sect.contacts.gui.settingsmenu.html |   2 +-
 ...psuite.user.sect.contacts.gui.toolbar.html |   8 +-
 ....user.sect.contacts.manage.categories.html | 103 ++++
 ...uite.user.sect.contacts.manage.delete.html |  11 +-
 ...uite.user.sect.contacts.manage.export.html |  10 +-
 ...ox.appsuite.user.sect.contacts.manage.html |   1 +
 ...uite.user.sect.contacts.manage.import.html |  18 +-
 ...ect.contacts.manage.inviteappointment.html |  10 +-
 ...te.user.sect.contacts.manage.movecopy.html |  11 +-
 ...suite.user.sect.contacts.manage.print.html |  14 +-
 ...te.user.sect.contacts.manage.sendmail.html |   8 +-
 ...e.user.sect.contacts.manage.sendvcard.html |   9 +-
 ...ox.appsuite.user.sect.contacts.search.html |   2 +-
 ....appsuite.user.sect.contacts.settings.html |   2 +-
 ...ite.user.sect.contacts.useaddressbook.html |   2 +-
 ...ser.sect.contacts.useaddressdirectory.html |   2 +-
 ...uite.user.sect.contacts.view.haloview.html |  10 +-
 ...r.sect.dataorganisation.accounts.edit.html |   2 +-
 ...aorganisation.accounts.functionalmail.html |   2 +-
 ...user.sect.dataorganisation.categories.html |  47 +-
 ...user.sect.dataorganisation.deputy.add.html |   8 +-
 ...ser.sect.dataorganisation.deputy.edit.html |   6 +-
 ...ite.user.sect.dataorganisation.deputy.html |   4 +-
 ...ect.dataorganisation.sharing.examples.html |   2 +-
 ...r.sect.dataorganisation.sharing.share.html |   4 +-
 ....appsuite.user.sect.drive.gui.content.html |   1 +
 ...psuite.user.sect.drive.gui.foldertree.html |   1 +
 ....appsuite.user.sect.drive.gui.toolbar.html |  15 +-
 ...x.appsuite.user.sect.drive.gui.viewer.html |  20 +-
 .../ox.appsuite.user.sect.drive.settings.html |   6 +-
 .../ox.appsuite.user.sect.email.accounts.html |   2 +-
 ....appsuite.user.sect.email.attachments.html |   2 +-
 .../ox.appsuite.user.sect.email.call.html     |   2 +-
 .../ox.appsuite.user.sect.email.deputy.html   |   4 +-
 ...x.appsuite.user.sect.email.gui.create.html |  16 +-
 ...psuite.user.sect.email.gui.detailview.html |   8 +-
 ...psuite.user.sect.email.gui.foldertree.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.html      |   2 +-
 .../ox.appsuite.user.sect.email.gui.list.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.new.html  |   2 +-
 ...ox.appsuite.user.sect.email.gui.popup.html |   3 +-
 ...uite.user.sect.email.gui.settingsmenu.html |   1 -
 .../ox.appsuite.user.sect.email.gui.tabs.html |  16 +-
 ....appsuite.user.sect.email.gui.toolbar.html |  22 +-
 ...uite.user.sect.email.manage.addportal.html |   7 +-
 ...psuite.user.sect.email.manage.archive.html |  18 +-
 ...ite.user.sect.email.manage.categories.html |  95 ++++
 ...user.sect.email.manage.collectaddress.html |  20 +-
 ...ppsuite.user.sect.email.manage.delete.html | 106 ++---
 ....user.sect.email.manage.deleteforever.html |  92 ++++
 ...appsuite.user.sect.email.manage.draft.html |   9 +-
 ....user.sect.email.manage.expungefolder.html |  18 +-
 .../ox.appsuite.user.sect.email.manage.html   |   8 +-
 ...ppsuite.user.sect.email.manage.import.html |  17 +-
 ...ser.sect.email.manage.inboxcategories.html |  17 +-
 ...appsuite.user.sect.email.manage.label.html |  12 +-
 ....appsuite.user.sect.email.manage.mark.html |   6 +-
 ...suite.user.sect.email.manage.movecopy.html |   6 +-
 ...uite.user.sect.email.manage.pdfexport.html |   7 +-
 ...appsuite.user.sect.email.manage.print.html |   8 +-
 ...psuite.user.sect.email.manage.recover.html |  97 ++++
 ...suite.user.sect.email.manage.reminder.html |   7 +-
 ....appsuite.user.sect.email.manage.save.html |   9 +-
 ...ppsuite.user.sect.email.manage.source.html |   8 +-
 ...suite.user.sect.email.manage.undelete.html |  75 +++
 ...te.user.sect.email.manage.unifiedmail.html |   2 +-
 .../ox.appsuite.user.sect.email.openai.html   |   2 +-
 ....appsuite.user.sect.email.openai.send.html |   2 +-
 .../ox.appsuite.user.sect.email.search.html   |   9 +-
 ...er.sect.email.send.attachmentexisting.html |  16 +-
 ...e.user.sect.email.send.attachmentlink.html |  14 +-
 ...uite.user.sect.email.send.attachments.html |  14 +-
 ...psuite.user.sect.email.send.attendees.html |  31 +-
 ...uite.user.sect.email.send.autoforward.html |   8 +-
 ...appsuite.user.sect.email.send.forward.html |   8 +-
 .../ox.appsuite.user.sect.email.send.html     |  14 +-
 .../ox.appsuite.user.sect.email.send.new.html |  35 +-
 ...x.appsuite.user.sect.email.send.reply.html |   8 +-
 ...appsuite.user.sect.email.send.replyto.html |  16 +-
 ....appsuite.user.sect.email.send.sender.html |  14 +-
 ...suite.user.sect.email.send.signatures.html |   8 +-
 ...psuite.user.sect.email.send.templates.html |  10 +-
 ...e.user.sect.email.send.vacationnotice.html |   8 +-
 .../ox.appsuite.user.sect.email.settings.html |  33 +-
 .../ox.appsuite.user.sect.email.view.html     |   3 +-
 ....sect.firststeps.gui.notificationarea.html |   2 +-
 ...x.appsuite.user.sect.guard.email.send.html |   6 +-
 .../ox.appsuite.user.sect.guard.keys.html     |  27 +-
 ...te.user.sect.guard.keys.pgppublickeys.html |  63 +--
 ....user.sect.guard.keys.smimepublickeys.html |  85 ++++
 ...uite.user.sect.guard.keys.yourpgpkeys.html | 148 +++---
 ...te.user.sect.guard.keys.yoursmimekeys.html |  94 ++--
 ...suite.user.sect.guard.password.change.html |  75 +++
 ...er.sect.guard.password.deleterecovery.html |  74 +++
 .../ox.appsuite.user.sect.guard.password.html | 108 +----
 ...psuite.user.sect.guard.password.reset.html |  91 ++++
 .../ox.appsuite.user.sect.guard.settings.html | 166 +++++--
 ...ite.user.sect.settings.commonsettings.html |   6 +-
 ...appsuite.user.sect.settings.countdown.html |   6 +-
 ...e.user.sect.settings.notificationarea.html |  14 +-
 ...uite.user.sect.settings.notifications.html |  18 +-
 ...suite.user.sect.settings.personaldata.html |   2 +-
 ...ite.user.sect.settings.presencestatus.html |   2 +-
 ...ox.appsuite.user.sect.settings.search.html |   5 +-
 .../ox.appsuite.user.sect.tasks.add.html      |   2 +-
 .../ox.appsuite.user.sect.tasks.call.html     |   2 +-
 ...psuite.user.sect.tasks.gui.detailview.html |   9 +-
 ...psuite.user.sect.tasks.gui.foldertree.html |   1 +
 .../ox.appsuite.user.sect.tasks.gui.list.html |  10 +-
 ...uite.user.sect.tasks.gui.settingsmenu.html |   5 +-
 ....appsuite.user.sect.tasks.gui.toolbar.html |   8 +-
 ...ite.user.sect.tasks.manage.categories.html | 103 ++++
 ....user.sect.tasks.manage.changeduedate.html |   9 +-
 ...e.user.sect.tasks.manage.changestatus.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.delete.html |  11 +-
 ...ppsuite.user.sect.tasks.manage.export.html |  10 +-
 .../ox.appsuite.user.sect.tasks.manage.html   |   1 +
 ...ppsuite.user.sect.tasks.manage.import.html |  18 +-
 ...ite.user.sect.tasks.manage.markasdone.html |   5 +-
 ....appsuite.user.sect.tasks.manage.move.html |  12 +-
 ...appsuite.user.sect.tasks.manage.print.html |  11 +-
 .../ox.appsuite.user.sect.tasks.search.html   |   2 +-
 help/l10n/fr_FR/bk01-toc.html                 |  44 +-
 help/l10n/fr_FR/index.html                    |  67 +--
 .../fr_FR/ox.appsuite.user.chap.calendar.html |   6 +-
 ...x.appsuite.user.chap.dataorganisation.html |   6 +-
 .../fr_FR/ox.appsuite.user.chap.drive.html    |   4 +-
 .../fr_FR/ox.appsuite.user.chap.email.html    |   2 +-
 .../fr_FR/ox.appsuite.user.chap.guard.html    |   6 +-
 .../fr_FR/ox.appsuite.user.chap.security.html |   4 +-
 .../fr_FR/ox.appsuite.user.chap.settings.html |   4 +-
 .../fr_FR/ox.appsuite.user.chap.tasks.html    |   4 +-
 help/l10n/fr_FR/ox.appsuite.user.index.html   | 401 +++++++++-------
 .../ox.appsuite.user.sect.about.glossary.html |  20 +-
 ...ppsuite.user.sect.calendar.add.alarms.html |   6 +-
 ...te.user.sect.calendar.add.attachments.html |   6 +-
 ...uite.user.sect.calendar.add.attendees.html |   8 +-
 ....appsuite.user.sect.calendar.add.call.html |   6 +-
 ...er.sect.calendar.add.conflicthandling.html |  10 +-
 ...ppsuite.user.sect.calendar.add.create.html |  10 +-
 ...ite.user.sect.calendar.add.datepicker.html |   6 +-
 ...psuite.user.sect.calendar.add.display.html |   6 +-
 ...suite.user.sect.calendar.add.followup.html |   8 +-
 .../ox.appsuite.user.sect.calendar.add.html   |   6 +-
 ...user.sect.calendar.add.icalattachment.html |  10 +-
 ...e.user.sect.calendar.add.participants.html |   7 +-
 ...ite.user.sect.calendar.add.recipients.html |   8 +-
 ...ite.user.sect.calendar.add.scheduling.html |   8 +-
 ...ppsuite.user.sect.calendar.add.serial.html |   6 +-
 ...psuite.user.sect.calendar.attachments.html |   2 +-
 ...ox.appsuite.user.sect.calendar.deputy.html |   4 +-
 ...ppsuite.user.sect.calendar.gui.create.html |   2 +-
 ...ite.user.sect.calendar.gui.detailview.html |   7 +-
 ...ite.user.sect.calendar.gui.foldertree.html |   2 +-
 ....appsuite.user.sect.calendar.gui.list.html |   2 +-
 ...x.appsuite.user.sect.calendar.gui.new.html |   5 +-
 ...appsuite.user.sect.calendar.gui.popup.html |  12 +-
 ...psuite.user.sect.calendar.gui.toolbar.html |   9 +-
 ...ppsuite.user.sect.calendar.invitation.html |   4 +-
 ....user.sect.calendar.manage.categories.html | 106 +++++
 ....sect.calendar.manage.changeorganizer.html |   3 +-
 ...r.sect.calendar.manage.changereminder.html |   6 +-
 ...ser.sect.calendar.manage.changestatus.html |   5 +-
 ...uite.user.sect.calendar.manage.colors.html |  22 +-
 ...uite.user.sect.calendar.manage.delete.html |   7 +-
 ...uite.user.sect.calendar.manage.export.html |   8 +-
 ...ox.appsuite.user.sect.calendar.manage.html |   5 +-
 ...uite.user.sect.calendar.manage.import.html |  22 +-
 ...psuite.user.sect.calendar.manage.move.html |   5 +-
 ...suite.user.sect.calendar.manage.print.html |  12 +-
 ...e.user.sect.calendar.manage.timezones.html |   4 +-
 ...ox.appsuite.user.sect.calendar.search.html |   2 +-
 ....appsuite.user.sect.calendar.settings.html |  12 +-
 ....user.sect.calendar.view.appointments.html |   6 +-
 .../ox.appsuite.user.sect.calendar.view.html  |   8 -
 ...ite.user.sect.calendar.view.timezones.html |   2 +-
 ...ppsuite.user.sect.calendar.view.views.html |   2 +-
 ...ppsuite.user.sect.contacts.gui.create.html |  13 +-
 ...ite.user.sect.contacts.gui.detailview.html |  16 +-
 ...ite.user.sect.contacts.gui.foldertree.html |   1 +
 ....appsuite.user.sect.contacts.gui.list.html |   9 +-
 ...x.appsuite.user.sect.contacts.gui.new.html |   4 +-
 ...e.user.sect.contacts.gui.settingsmenu.html |   2 +-
 ...psuite.user.sect.contacts.gui.toolbar.html |   8 +-
 ....user.sect.contacts.manage.categories.html | 103 ++++
 ...uite.user.sect.contacts.manage.delete.html |  11 +-
 ...uite.user.sect.contacts.manage.export.html |  10 +-
 ...ox.appsuite.user.sect.contacts.manage.html |   1 +
 ...uite.user.sect.contacts.manage.import.html |  18 +-
 ...ect.contacts.manage.inviteappointment.html |  10 +-
 ...te.user.sect.contacts.manage.movecopy.html |  11 +-
 ...suite.user.sect.contacts.manage.print.html |  14 +-
 ...te.user.sect.contacts.manage.sendmail.html |   8 +-
 ...e.user.sect.contacts.manage.sendvcard.html |   9 +-
 ...ox.appsuite.user.sect.contacts.search.html |   2 +-
 ....appsuite.user.sect.contacts.settings.html |   2 +-
 ...ite.user.sect.contacts.useaddressbook.html |   2 +-
 ...ser.sect.contacts.useaddressdirectory.html |   2 +-
 ...uite.user.sect.contacts.view.haloview.html |   8 +-
 ...r.sect.dataorganisation.accounts.edit.html |   2 +-
 ...aorganisation.accounts.functionalmail.html |   2 +-
 ...user.sect.dataorganisation.categories.html |  43 +-
 ...user.sect.dataorganisation.deputy.add.html |   8 +-
 ...ser.sect.dataorganisation.deputy.edit.html |   6 +-
 ...ite.user.sect.dataorganisation.deputy.html |   4 +-
 ...ect.dataorganisation.sharing.examples.html |   2 +-
 ...r.sect.dataorganisation.sharing.share.html |   4 +-
 ....appsuite.user.sect.drive.gui.content.html |   1 +
 ...psuite.user.sect.drive.gui.foldertree.html |   1 +
 ....appsuite.user.sect.drive.gui.toolbar.html |  15 +-
 ...x.appsuite.user.sect.drive.gui.viewer.html |  20 +-
 .../ox.appsuite.user.sect.drive.settings.html |   4 +-
 .../ox.appsuite.user.sect.email.accounts.html |   2 +-
 ....appsuite.user.sect.email.attachments.html |   2 +-
 .../ox.appsuite.user.sect.email.deputy.html   |   4 +-
 ...x.appsuite.user.sect.email.gui.create.html |  16 +-
 ...psuite.user.sect.email.gui.detailview.html |   8 +-
 ...psuite.user.sect.email.gui.foldertree.html |   8 +-
 .../ox.appsuite.user.sect.email.gui.html      |   2 +-
 .../ox.appsuite.user.sect.email.gui.list.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.new.html  |   2 +-
 ...ox.appsuite.user.sect.email.gui.popup.html |   3 +-
 ...uite.user.sect.email.gui.settingsmenu.html |   1 -
 .../ox.appsuite.user.sect.email.gui.tabs.html |  16 +-
 ....appsuite.user.sect.email.gui.toolbar.html |  22 +-
 ...uite.user.sect.email.manage.addportal.html |   7 +-
 ...psuite.user.sect.email.manage.archive.html |  18 +-
 ...ite.user.sect.email.manage.categories.html |  95 ++++
 ...user.sect.email.manage.collectaddress.html |  20 +-
 ...ppsuite.user.sect.email.manage.delete.html | 106 ++---
 ....user.sect.email.manage.deleteforever.html |  92 ++++
 ...appsuite.user.sect.email.manage.draft.html |   9 +-
 ....user.sect.email.manage.expungefolder.html |  18 +-
 .../ox.appsuite.user.sect.email.manage.html   |   8 +-
 ...ppsuite.user.sect.email.manage.import.html |  17 +-
 ...ser.sect.email.manage.inboxcategories.html |  17 +-
 ...appsuite.user.sect.email.manage.label.html |  12 +-
 ....appsuite.user.sect.email.manage.mark.html |   6 +-
 ...suite.user.sect.email.manage.movecopy.html |   6 +-
 ...uite.user.sect.email.manage.pdfexport.html |   7 +-
 ...appsuite.user.sect.email.manage.print.html |   8 +-
 ...psuite.user.sect.email.manage.recover.html |  97 ++++
 ...suite.user.sect.email.manage.reminder.html |   7 +-
 ....appsuite.user.sect.email.manage.save.html |   9 +-
 ...ppsuite.user.sect.email.manage.source.html |   8 +-
 ...suite.user.sect.email.manage.undelete.html |  75 +++
 ...te.user.sect.email.manage.unifiedmail.html |   2 +-
 .../ox.appsuite.user.sect.email.openai.html   |   2 +-
 ....appsuite.user.sect.email.openai.send.html |   2 +-
 .../ox.appsuite.user.sect.email.search.html   |   9 +-
 ...er.sect.email.send.attachmentexisting.html |  16 +-
 ...e.user.sect.email.send.attachmentlink.html |  14 +-
 ...uite.user.sect.email.send.attachments.html |  14 +-
 ...psuite.user.sect.email.send.attendees.html |  31 +-
 ...uite.user.sect.email.send.autoforward.html |   8 +-
 ...appsuite.user.sect.email.send.forward.html |   8 +-
 .../ox.appsuite.user.sect.email.send.html     |  14 +-
 .../ox.appsuite.user.sect.email.send.new.html |  35 +-
 ...x.appsuite.user.sect.email.send.reply.html |   8 +-
 ...appsuite.user.sect.email.send.replyto.html |  16 +-
 ....appsuite.user.sect.email.send.sender.html |  14 +-
 ...suite.user.sect.email.send.signatures.html |   8 +-
 ...psuite.user.sect.email.send.templates.html |  10 +-
 ...e.user.sect.email.send.vacationnotice.html |   8 +-
 .../ox.appsuite.user.sect.email.settings.html |  33 +-
 .../ox.appsuite.user.sect.email.view.html     |   3 +-
 ....sect.firststeps.gui.notificationarea.html |   2 +-
 ....sect.guard.documents.createencrypted.html |   8 +-
 ...ox.appsuite.user.sect.guard.documents.html |   4 +-
 ...psuite.user.sect.guard.documents.open.html |   6 +-
 ...er.sect.guard.documents.saveencrypted.html |   6 +-
 ...ppsuite.user.sect.guard.drive.decrypt.html |   2 +-
 ...x.appsuite.user.sect.guard.email.send.html |   6 +-
 .../ox.appsuite.user.sect.guard.keys.html     |  23 +-
 ...te.user.sect.guard.keys.pgppublickeys.html |  57 +--
 ....user.sect.guard.keys.smimepublickeys.html |  85 ++++
 ...uite.user.sect.guard.keys.yourpgpkeys.html | 134 +++---
 ...te.user.sect.guard.keys.yoursmimekeys.html |  90 ++--
 ...suite.user.sect.guard.password.change.html |  75 +++
 ...er.sect.guard.password.deleterecovery.html |  74 +++
 .../ox.appsuite.user.sect.guard.password.html | 108 +----
 ...psuite.user.sect.guard.password.reset.html |  91 ++++
 .../ox.appsuite.user.sect.guard.settings.html | 166 +++++--
 ...ite.user.sect.settings.commonsettings.html |   4 +-
 ...appsuite.user.sect.settings.countdown.html |   6 +-
 ...e.user.sect.settings.notificationarea.html |  10 +-
 ...uite.user.sect.settings.notifications.html |  18 +-
 ...suite.user.sect.settings.personaldata.html |   2 +-
 ...ox.appsuite.user.sect.settings.search.html |   5 +-
 .../ox.appsuite.user.sect.tasks.add.html      |   2 +-
 ...psuite.user.sect.tasks.gui.detailview.html |   9 +-
 ...psuite.user.sect.tasks.gui.foldertree.html |   1 +
 .../ox.appsuite.user.sect.tasks.gui.list.html |  10 +-
 ...uite.user.sect.tasks.gui.settingsmenu.html |   5 +-
 ....appsuite.user.sect.tasks.gui.toolbar.html |   8 +-
 ...ite.user.sect.tasks.manage.categories.html | 103 ++++
 ....user.sect.tasks.manage.changeduedate.html |   9 +-
 ...e.user.sect.tasks.manage.changestatus.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.delete.html |  11 +-
 ...ppsuite.user.sect.tasks.manage.export.html |  10 +-
 .../ox.appsuite.user.sect.tasks.manage.html   |   1 +
 ...ppsuite.user.sect.tasks.manage.import.html |  18 +-
 ...ite.user.sect.tasks.manage.markasdone.html |   5 +-
 ....appsuite.user.sect.tasks.manage.move.html |  12 +-
 ...appsuite.user.sect.tasks.manage.print.html |  11 +-
 .../ox.appsuite.user.sect.tasks.search.html   |   2 +-
 help/l10n/it_IT/bk01-toc.html                 |  40 +-
 help/l10n/it_IT/index.html                    |  65 +--
 .../it_IT/ox.appsuite.user.chap.calendar.html |   6 +-
 ...x.appsuite.user.chap.dataorganisation.html |   6 +-
 .../it_IT/ox.appsuite.user.chap.drive.html    |   4 +-
 .../it_IT/ox.appsuite.user.chap.email.html    |   2 +-
 .../it_IT/ox.appsuite.user.chap.guard.html    |   6 +-
 .../it_IT/ox.appsuite.user.chap.security.html |   4 +-
 .../it_IT/ox.appsuite.user.chap.settings.html |   2 +-
 .../it_IT/ox.appsuite.user.chap.tasks.html    |   4 +-
 help/l10n/it_IT/ox.appsuite.user.index.html   | 389 +++++++++-------
 .../ox.appsuite.user.sect.about.glossary.html |  20 +-
 ...ppsuite.user.sect.calendar.add.alarms.html |   6 +-
 ...te.user.sect.calendar.add.attachments.html |   6 +-
 ...uite.user.sect.calendar.add.attendees.html |   8 +-
 ....appsuite.user.sect.calendar.add.call.html |   6 +-
 ...er.sect.calendar.add.conflicthandling.html |  10 +-
 ...ppsuite.user.sect.calendar.add.create.html |  10 +-
 ...ite.user.sect.calendar.add.datepicker.html |   6 +-
 ...psuite.user.sect.calendar.add.display.html |   6 +-
 ...suite.user.sect.calendar.add.followup.html |   8 +-
 .../ox.appsuite.user.sect.calendar.add.html   |   6 +-
 ...user.sect.calendar.add.icalattachment.html |  10 +-
 ...e.user.sect.calendar.add.participants.html |   7 +-
 ...ite.user.sect.calendar.add.recipients.html |   8 +-
 ...ite.user.sect.calendar.add.scheduling.html |   8 +-
 ...ppsuite.user.sect.calendar.add.serial.html |   6 +-
 ...psuite.user.sect.calendar.attachments.html |   2 +-
 ...ox.appsuite.user.sect.calendar.deputy.html |   4 +-
 ...ppsuite.user.sect.calendar.gui.create.html |   2 +-
 ...ite.user.sect.calendar.gui.detailview.html |   7 +-
 ...ite.user.sect.calendar.gui.foldertree.html |   2 +-
 ....appsuite.user.sect.calendar.gui.list.html |   2 +-
 ...x.appsuite.user.sect.calendar.gui.new.html |   5 +-
 ...appsuite.user.sect.calendar.gui.popup.html |  12 +-
 ...psuite.user.sect.calendar.gui.toolbar.html |   9 +-
 ...ppsuite.user.sect.calendar.invitation.html |   2 +-
 ....user.sect.calendar.manage.categories.html | 106 +++++
 ....sect.calendar.manage.changeorganizer.html |   3 +-
 ...r.sect.calendar.manage.changereminder.html |   4 +-
 ...ser.sect.calendar.manage.changestatus.html |   1 +
 ...uite.user.sect.calendar.manage.colors.html |  22 +-
 ...uite.user.sect.calendar.manage.delete.html |   7 +-
 ...uite.user.sect.calendar.manage.export.html |   8 +-
 ...ox.appsuite.user.sect.calendar.manage.html |   1 +
 ...uite.user.sect.calendar.manage.import.html |  22 +-
 ...psuite.user.sect.calendar.manage.move.html |   5 +-
 ...suite.user.sect.calendar.manage.print.html |  12 +-
 ...e.user.sect.calendar.manage.timezones.html |   4 +-
 ...r.sect.calendar.resourcecalendar.view.html |   2 +-
 ...ox.appsuite.user.sect.calendar.search.html |   2 +-
 ....appsuite.user.sect.calendar.settings.html |  14 +-
 ....user.sect.calendar.view.appointments.html |   6 +-
 .../ox.appsuite.user.sect.calendar.view.html  |   8 -
 ...ite.user.sect.calendar.view.timezones.html |   2 +-
 ...ppsuite.user.sect.calendar.view.views.html |   4 +-
 ...ppsuite.user.sect.contacts.gui.create.html |  13 +-
 ...ite.user.sect.contacts.gui.detailview.html |  16 +-
 ...ite.user.sect.contacts.gui.foldertree.html |   1 +
 ....appsuite.user.sect.contacts.gui.list.html |   9 +-
 ...x.appsuite.user.sect.contacts.gui.new.html |   4 +-
 ...e.user.sect.contacts.gui.settingsmenu.html |   2 +-
 ...psuite.user.sect.contacts.gui.toolbar.html |   8 +-
 ....user.sect.contacts.manage.categories.html | 103 ++++
 ...uite.user.sect.contacts.manage.delete.html |  11 +-
 ...uite.user.sect.contacts.manage.export.html |  10 +-
 ...ox.appsuite.user.sect.contacts.manage.html |   1 +
 ...uite.user.sect.contacts.manage.import.html |  18 +-
 ...ect.contacts.manage.inviteappointment.html |  10 +-
 ...te.user.sect.contacts.manage.movecopy.html |  11 +-
 ...suite.user.sect.contacts.manage.print.html |  14 +-
 ...te.user.sect.contacts.manage.sendmail.html |   8 +-
 ...e.user.sect.contacts.manage.sendvcard.html |   9 +-
 ...ox.appsuite.user.sect.contacts.search.html |   2 +-
 ....appsuite.user.sect.contacts.settings.html |   2 +-
 ...ite.user.sect.contacts.useaddressbook.html |   2 +-
 ...ser.sect.contacts.useaddressdirectory.html |   2 +-
 ...uite.user.sect.contacts.view.haloview.html |   8 +-
 ...r.sect.dataorganisation.accounts.edit.html |   2 +-
 ...aorganisation.accounts.functionalmail.html |   2 +-
 ...user.sect.dataorganisation.categories.html |  43 +-
 ...user.sect.dataorganisation.deputy.add.html |   8 +-
 ...ser.sect.dataorganisation.deputy.edit.html |   6 +-
 ...ite.user.sect.dataorganisation.deputy.html |   4 +-
 ...ect.dataorganisation.sharing.examples.html |   2 +-
 ...r.sect.dataorganisation.sharing.share.html |   4 +-
 ....appsuite.user.sect.drive.gui.content.html |   1 +
 ...psuite.user.sect.drive.gui.foldertree.html |   1 +
 ....appsuite.user.sect.drive.gui.toolbar.html |  15 +-
 ...x.appsuite.user.sect.drive.gui.viewer.html |  20 +-
 .../ox.appsuite.user.sect.drive.settings.html |   6 +-
 .../ox.appsuite.user.sect.email.accounts.html |   2 +-
 ....appsuite.user.sect.email.attachments.html |   2 +-
 .../ox.appsuite.user.sect.email.deputy.html   |   4 +-
 ...x.appsuite.user.sect.email.gui.create.html |  16 +-
 ...psuite.user.sect.email.gui.detailview.html |   8 +-
 ...psuite.user.sect.email.gui.foldertree.html |   8 +-
 .../ox.appsuite.user.sect.email.gui.html      |   2 +-
 .../ox.appsuite.user.sect.email.gui.list.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.new.html  |   2 +-
 ...ox.appsuite.user.sect.email.gui.popup.html |   3 +-
 ...uite.user.sect.email.gui.settingsmenu.html |   1 -
 .../ox.appsuite.user.sect.email.gui.tabs.html |  16 +-
 ....appsuite.user.sect.email.gui.toolbar.html |  22 +-
 ...uite.user.sect.email.manage.addportal.html |   7 +-
 ...psuite.user.sect.email.manage.archive.html |  18 +-
 ...ite.user.sect.email.manage.categories.html |  95 ++++
 ...user.sect.email.manage.collectaddress.html |  20 +-
 ...ppsuite.user.sect.email.manage.delete.html | 106 ++---
 ....user.sect.email.manage.deleteforever.html |  92 ++++
 ...appsuite.user.sect.email.manage.draft.html |   9 +-
 ....user.sect.email.manage.expungefolder.html |  18 +-
 .../ox.appsuite.user.sect.email.manage.html   |   8 +-
 ...ppsuite.user.sect.email.manage.import.html |  17 +-
 ...ser.sect.email.manage.inboxcategories.html |  17 +-
 ...appsuite.user.sect.email.manage.label.html |  12 +-
 ....appsuite.user.sect.email.manage.mark.html |   6 +-
 ...suite.user.sect.email.manage.movecopy.html |   6 +-
 ...uite.user.sect.email.manage.pdfexport.html |   7 +-
 ...appsuite.user.sect.email.manage.print.html |   8 +-
 ...psuite.user.sect.email.manage.recover.html |  97 ++++
 ...suite.user.sect.email.manage.reminder.html |   7 +-
 ....appsuite.user.sect.email.manage.save.html |   9 +-
 ...ppsuite.user.sect.email.manage.source.html |   8 +-
 ...suite.user.sect.email.manage.undelete.html |  75 +++
 ...te.user.sect.email.manage.unifiedmail.html |   2 +-
 .../ox.appsuite.user.sect.email.openai.html   |   8 +-
 ....appsuite.user.sect.email.openai.send.html |   2 +-
 .../ox.appsuite.user.sect.email.search.html   |   9 +-
 ...er.sect.email.send.attachmentexisting.html |  16 +-
 ...e.user.sect.email.send.attachmentlink.html |  14 +-
 ...uite.user.sect.email.send.attachments.html |  14 +-
 ...psuite.user.sect.email.send.attendees.html |  31 +-
 ...uite.user.sect.email.send.autoforward.html |   8 +-
 ...appsuite.user.sect.email.send.forward.html |   8 +-
 .../ox.appsuite.user.sect.email.send.html     |  14 +-
 .../ox.appsuite.user.sect.email.send.new.html |  35 +-
 ...x.appsuite.user.sect.email.send.reply.html |   8 +-
 ...appsuite.user.sect.email.send.replyto.html |  16 +-
 ....appsuite.user.sect.email.send.sender.html |  14 +-
 ...suite.user.sect.email.send.signatures.html |   8 +-
 ...psuite.user.sect.email.send.templates.html |  10 +-
 ...e.user.sect.email.send.vacationnotice.html |   8 +-
 .../ox.appsuite.user.sect.email.settings.html |  33 +-
 .../ox.appsuite.user.sect.email.view.html     |   3 +-
 ....sect.firststeps.gui.notificationarea.html |   2 +-
 ....sect.guard.documents.createencrypted.html |   8 +-
 ...ox.appsuite.user.sect.guard.documents.html |   6 +-
 ...psuite.user.sect.guard.documents.open.html |   6 +-
 ...er.sect.guard.documents.saveencrypted.html |   6 +-
 ...ppsuite.user.sect.guard.drive.decrypt.html |   2 +-
 ...x.appsuite.user.sect.guard.email.send.html |   6 +-
 .../ox.appsuite.user.sect.guard.keys.html     |  23 +-
 ...te.user.sect.guard.keys.pgppublickeys.html |  58 +--
 ....user.sect.guard.keys.smimepublickeys.html |  85 ++++
 ...uite.user.sect.guard.keys.yourpgpkeys.html | 134 +++---
 ...te.user.sect.guard.keys.yoursmimekeys.html |  90 ++--
 ...suite.user.sect.guard.password.change.html |  75 +++
 ...er.sect.guard.password.deleterecovery.html |  74 +++
 .../ox.appsuite.user.sect.guard.password.html | 108 +----
 ...psuite.user.sect.guard.password.reset.html |  91 ++++
 .../ox.appsuite.user.sect.guard.settings.html | 166 +++++--
 ...ite.user.sect.settings.commonsettings.html |   4 +-
 ...appsuite.user.sect.settings.countdown.html |   2 +-
 ...e.user.sect.settings.notificationarea.html |  10 +-
 ...uite.user.sect.settings.notifications.html |  10 +-
 ...suite.user.sect.settings.personaldata.html |   2 +-
 ...ox.appsuite.user.sect.settings.search.html |   3 +
 .../ox.appsuite.user.sect.tasks.add.html      |   2 +-
 ...psuite.user.sect.tasks.gui.detailview.html |   9 +-
 ...psuite.user.sect.tasks.gui.foldertree.html |   1 +
 .../ox.appsuite.user.sect.tasks.gui.list.html |  10 +-
 ...uite.user.sect.tasks.gui.settingsmenu.html |   7 +-
 ....appsuite.user.sect.tasks.gui.toolbar.html |   8 +-
 ...ite.user.sect.tasks.manage.categories.html | 103 ++++
 ....user.sect.tasks.manage.changeduedate.html |   9 +-
 ...e.user.sect.tasks.manage.changestatus.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.delete.html |  11 +-
 ...ppsuite.user.sect.tasks.manage.export.html |  10 +-
 .../ox.appsuite.user.sect.tasks.manage.html   |   1 +
 ...ppsuite.user.sect.tasks.manage.import.html |  18 +-
 ...ite.user.sect.tasks.manage.markasdone.html |   5 +-
 ....appsuite.user.sect.tasks.manage.move.html |  12 +-
 ...appsuite.user.sect.tasks.manage.print.html |  11 +-
 .../ox.appsuite.user.sect.tasks.search.html   |   2 +-
 help/l10n/ja_JP/bk01-toc.html                 |  28 +-
 help/l10n/ja_JP/index.html                    |  51 +-
 .../ja_JP/ox.appsuite.user.chap.calendar.html |   4 +-
 ...x.appsuite.user.chap.dataorganisation.html |   4 +-
 .../ja_JP/ox.appsuite.user.chap.drive.html    |   4 +-
 .../ja_JP/ox.appsuite.user.chap.guard.html    |   6 +-
 .../ja_JP/ox.appsuite.user.chap.security.html |   4 +-
 .../ja_JP/ox.appsuite.user.chap.tasks.html    |   4 +-
 help/l10n/ja_JP/ox.appsuite.user.index.html   | 116 +++--
 .../ox.appsuite.user.sect.about.glossary.html |   8 +-
 ...e.user.sect.calendar.add.participants.html |   1 +
 ...ppsuite.user.sect.calendar.gui.create.html |   2 +-
 ...ite.user.sect.calendar.gui.detailview.html |   5 +-
 ...ite.user.sect.calendar.gui.foldertree.html |   2 +-
 ....appsuite.user.sect.calendar.gui.list.html |   2 +-
 ...x.appsuite.user.sect.calendar.gui.new.html |   5 +-
 ...appsuite.user.sect.calendar.gui.popup.html |  10 +-
 ...psuite.user.sect.calendar.gui.toolbar.html |   9 +-
 ....user.sect.calendar.manage.categories.html |  88 ++++
 ....sect.calendar.manage.changeorganizer.html |   3 +-
 ...r.sect.calendar.manage.changereminder.html |   4 +-
 ...ser.sect.calendar.manage.changestatus.html |   1 +
 ...uite.user.sect.calendar.manage.colors.html |  11 +-
 ...uite.user.sect.calendar.manage.delete.html |   5 +-
 ...uite.user.sect.calendar.manage.export.html |   8 +-
 ...ox.appsuite.user.sect.calendar.manage.html |   1 +
 ...uite.user.sect.calendar.manage.import.html |   5 +-
 ...psuite.user.sect.calendar.manage.move.html |   5 +-
 ...suite.user.sect.calendar.manage.print.html |   6 +-
 ...e.user.sect.calendar.manage.timezones.html |   4 +-
 ...ox.appsuite.user.sect.calendar.search.html |   2 +-
 ....user.sect.calendar.view.appointments.html |   6 +-
 .../ox.appsuite.user.sect.calendar.view.html  |   3 -
 ...ite.user.sect.calendar.view.timezones.html |   2 +-
 ...ppsuite.user.sect.calendar.view.views.html |   2 +-
 ...ppsuite.user.sect.contacts.gui.create.html |   9 +-
 ...ite.user.sect.contacts.gui.detailview.html |   6 +-
 ...ite.user.sect.contacts.gui.foldertree.html |   1 +
 ....appsuite.user.sect.contacts.gui.list.html |   5 +-
 ...x.appsuite.user.sect.contacts.gui.new.html |   2 +-
 ...psuite.user.sect.contacts.gui.toolbar.html |   8 +-
 ....user.sect.contacts.manage.categories.html |  85 ++++
 ...uite.user.sect.contacts.manage.delete.html |   7 +-
 ...uite.user.sect.contacts.manage.export.html |  10 +-
 ...ox.appsuite.user.sect.contacts.manage.html |   1 +
 ...uite.user.sect.contacts.manage.import.html |   5 +-
 ...ect.contacts.manage.inviteappointment.html |  10 +-
 ...te.user.sect.contacts.manage.movecopy.html |  11 +-
 ...suite.user.sect.contacts.manage.print.html |   8 +-
 ...te.user.sect.contacts.manage.sendmail.html |   6 +-
 ...e.user.sect.contacts.manage.sendvcard.html |   9 +-
 ...ox.appsuite.user.sect.contacts.search.html |   2 +-
 ...r.sect.dataorganisation.accounts.edit.html |   2 +-
 ...aorganisation.accounts.functionalmail.html |   2 +-
 ...user.sect.dataorganisation.categories.html |  31 +-
 ...r.sect.dataorganisation.sharing.share.html |   2 +-
 ....appsuite.user.sect.drive.gui.content.html |   1 +
 ...psuite.user.sect.drive.gui.foldertree.html |   1 +
 ....appsuite.user.sect.drive.gui.toolbar.html |  15 +-
 ...x.appsuite.user.sect.drive.gui.viewer.html |   8 +-
 .../ox.appsuite.user.sect.email.accounts.html |   2 +-
 ...x.appsuite.user.sect.email.gui.create.html |  16 +-
 ...psuite.user.sect.email.gui.detailview.html |   8 +-
 ...psuite.user.sect.email.gui.foldertree.html |   8 +-
 .../ox.appsuite.user.sect.email.gui.html      |   2 +-
 .../ox.appsuite.user.sect.email.gui.list.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.new.html  |   2 +-
 ...ox.appsuite.user.sect.email.gui.popup.html |   3 +-
 ...uite.user.sect.email.gui.settingsmenu.html |   1 -
 .../ox.appsuite.user.sect.email.gui.tabs.html |  11 +-
 ....appsuite.user.sect.email.gui.toolbar.html |  22 +-
 ...uite.user.sect.email.manage.addportal.html |   7 +-
 ...psuite.user.sect.email.manage.archive.html |   9 +-
 ...ite.user.sect.email.manage.categories.html |  90 ++++
 ...user.sect.email.manage.collectaddress.html |   8 +-
 ...ppsuite.user.sect.email.manage.delete.html | 106 ++---
 ....user.sect.email.manage.deleteforever.html |  87 ++++
 ...appsuite.user.sect.email.manage.draft.html |   7 +-
 ....user.sect.email.manage.expungefolder.html |   9 +-
 .../ox.appsuite.user.sect.email.manage.html   |   8 +-
 ...ppsuite.user.sect.email.manage.import.html |   8 +-
 ...ser.sect.email.manage.inboxcategories.html |  17 +-
 ...appsuite.user.sect.email.manage.label.html |  12 +-
 ....appsuite.user.sect.email.manage.mark.html |   6 +-
 ...suite.user.sect.email.manage.movecopy.html |   6 +-
 ...uite.user.sect.email.manage.pdfexport.html |   7 +-
 ...appsuite.user.sect.email.manage.print.html |   8 +-
 ...psuite.user.sect.email.manage.recover.html |  92 ++++
 ...suite.user.sect.email.manage.reminder.html |   7 +-
 ....appsuite.user.sect.email.manage.save.html |   9 +-
 ...ppsuite.user.sect.email.manage.source.html |   8 +-
 ...suite.user.sect.email.manage.undelete.html |  70 +++
 ...te.user.sect.email.manage.unifiedmail.html |   2 +-
 .../ox.appsuite.user.sect.email.openai.html   |   2 +-
 .../ox.appsuite.user.sect.email.search.html   |   5 +-
 ...er.sect.email.send.attachmentexisting.html |   8 +-
 ...e.user.sect.email.send.attachmentlink.html |   8 +-
 ...uite.user.sect.email.send.attachments.html |   6 +-
 ...psuite.user.sect.email.send.attendees.html |  12 +-
 .../ox.appsuite.user.sect.email.send.html     |   6 +-
 .../ox.appsuite.user.sect.email.send.new.html |  23 +-
 ...appsuite.user.sect.email.send.replyto.html |   8 +-
 ....appsuite.user.sect.email.send.sender.html |   4 +-
 ...psuite.user.sect.email.send.templates.html |   2 +-
 .../ox.appsuite.user.sect.email.settings.html |  11 +-
 .../ox.appsuite.user.sect.email.view.html     |   3 +-
 ....sect.guard.documents.createencrypted.html |   8 +-
 ...ox.appsuite.user.sect.guard.documents.html |   4 +-
 ...psuite.user.sect.guard.documents.open.html |   6 +-
 ...er.sect.guard.documents.saveencrypted.html |   6 +-
 ...ppsuite.user.sect.guard.drive.decrypt.html |   2 +-
 ...x.appsuite.user.sect.guard.email.send.html |   4 +-
 .../ox.appsuite.user.sect.guard.keys.html     |  16 +-
 ...te.user.sect.guard.keys.pgppublickeys.html |  57 +--
 ....user.sect.guard.keys.smimepublickeys.html |  76 +++
 ...uite.user.sect.guard.keys.yourpgpkeys.html | 124 ++---
 ...te.user.sect.guard.keys.yoursmimekeys.html |  90 ++--
 ...suite.user.sect.guard.password.change.html |  66 +++
 ...er.sect.guard.password.deleterecovery.html |  65 +++
 .../ox.appsuite.user.sect.guard.password.html |  98 +---
 ...psuite.user.sect.guard.password.reset.html |  82 ++++
 .../ox.appsuite.user.sect.guard.settings.html | 128 +++--
 ...ite.user.sect.settings.commonsettings.html |   2 +-
 ...e.user.sect.settings.notificationarea.html |   2 +-
 ...uite.user.sect.settings.notifications.html |   2 +-
 ...ox.appsuite.user.sect.settings.search.html |   1 +
 ...psuite.user.sect.tasks.gui.detailview.html |   5 +-
 ...psuite.user.sect.tasks.gui.foldertree.html |   1 +
 .../ox.appsuite.user.sect.tasks.gui.list.html |  10 +-
 ...uite.user.sect.tasks.gui.settingsmenu.html |   5 +-
 ....appsuite.user.sect.tasks.gui.toolbar.html |   8 +-
 ...ite.user.sect.tasks.manage.categories.html |  85 ++++
 ....user.sect.tasks.manage.changeduedate.html |   9 +-
 ...e.user.sect.tasks.manage.changestatus.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.delete.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.export.html |  10 +-
 .../ox.appsuite.user.sect.tasks.manage.html   |   1 +
 ...ppsuite.user.sect.tasks.manage.import.html |   5 +-
 ...ite.user.sect.tasks.manage.markasdone.html |   5 +-
 ....appsuite.user.sect.tasks.manage.move.html |  12 +-
 ...appsuite.user.sect.tasks.manage.print.html |   7 +-
 .../ox.appsuite.user.sect.tasks.search.html   |   2 +-
 help/l10n/nl_NL/bk01-toc.html                 |  42 +-
 help/l10n/nl_NL/index.html                    |  65 +--
 .../nl_NL/ox.appsuite.user.chap.calendar.html |   6 +-
 ...x.appsuite.user.chap.dataorganisation.html |   6 +-
 .../nl_NL/ox.appsuite.user.chap.drive.html    |   4 +-
 .../nl_NL/ox.appsuite.user.chap.email.html    |   2 +-
 .../nl_NL/ox.appsuite.user.chap.guard.html    |   6 +-
 .../nl_NL/ox.appsuite.user.chap.security.html |   4 +-
 .../nl_NL/ox.appsuite.user.chap.settings.html |   2 +-
 .../nl_NL/ox.appsuite.user.chap.tasks.html    |   4 +-
 help/l10n/nl_NL/ox.appsuite.user.index.html   | 355 ++++++++------
 .../ox.appsuite.user.sect.about.glossary.html |  10 +-
 ...ppsuite.user.sect.calendar.add.alarms.html |   6 +-
 ...te.user.sect.calendar.add.attachments.html |   6 +-
 ...uite.user.sect.calendar.add.attendees.html |   8 +-
 ....appsuite.user.sect.calendar.add.call.html |   6 +-
 ...er.sect.calendar.add.conflicthandling.html |  10 +-
 ...ppsuite.user.sect.calendar.add.create.html |  10 +-
 ...ite.user.sect.calendar.add.datepicker.html |   6 +-
 ...psuite.user.sect.calendar.add.display.html |   6 +-
 ...suite.user.sect.calendar.add.followup.html |   8 +-
 .../ox.appsuite.user.sect.calendar.add.html   |   6 +-
 ...user.sect.calendar.add.icalattachment.html |  10 +-
 ...e.user.sect.calendar.add.participants.html |   7 +-
 ...ite.user.sect.calendar.add.recipients.html |   8 +-
 ...ite.user.sect.calendar.add.scheduling.html |   8 +-
 ...ppsuite.user.sect.calendar.add.serial.html |   6 +-
 ...psuite.user.sect.calendar.attachments.html |   2 +-
 ...ox.appsuite.user.sect.calendar.deputy.html |   4 +-
 ...ppsuite.user.sect.calendar.gui.create.html |   2 +-
 ...ite.user.sect.calendar.gui.detailview.html |   7 +-
 ...ite.user.sect.calendar.gui.foldertree.html |   2 +-
 ....appsuite.user.sect.calendar.gui.list.html |   2 +-
 ...x.appsuite.user.sect.calendar.gui.new.html |   5 +-
 ...appsuite.user.sect.calendar.gui.popup.html |  12 +-
 ...psuite.user.sect.calendar.gui.toolbar.html |   9 +-
 ...ppsuite.user.sect.calendar.invitation.html |   4 +-
 ....user.sect.calendar.manage.categories.html | 106 +++++
 ....sect.calendar.manage.changeorganizer.html |   3 +-
 ...r.sect.calendar.manage.changereminder.html |   6 +-
 ...ser.sect.calendar.manage.changestatus.html |   5 +-
 ...uite.user.sect.calendar.manage.colors.html |  22 +-
 ...uite.user.sect.calendar.manage.delete.html |   7 +-
 ...uite.user.sect.calendar.manage.export.html |   8 +-
 ...ox.appsuite.user.sect.calendar.manage.html |   5 +-
 ...uite.user.sect.calendar.manage.import.html |  22 +-
 ...psuite.user.sect.calendar.manage.move.html |   5 +-
 ...suite.user.sect.calendar.manage.print.html |  12 +-
 ...e.user.sect.calendar.manage.timezones.html |   4 +-
 ...ox.appsuite.user.sect.calendar.search.html |   2 +-
 ....appsuite.user.sect.calendar.settings.html |  12 +-
 ....user.sect.calendar.view.appointments.html |   6 +-
 .../ox.appsuite.user.sect.calendar.view.html  |   8 -
 ...ite.user.sect.calendar.view.timezones.html |   2 +-
 ...ppsuite.user.sect.calendar.view.views.html |   2 +-
 ...ppsuite.user.sect.contacts.gui.create.html |  13 +-
 ...ite.user.sect.contacts.gui.detailview.html |  18 +-
 ...ite.user.sect.contacts.gui.foldertree.html |   1 +
 ....appsuite.user.sect.contacts.gui.list.html |   9 +-
 ...x.appsuite.user.sect.contacts.gui.new.html |   4 +-
 ...e.user.sect.contacts.gui.settingsmenu.html |   2 +-
 ...psuite.user.sect.contacts.gui.toolbar.html |   8 +-
 ....user.sect.contacts.manage.categories.html | 103 ++++
 ...uite.user.sect.contacts.manage.delete.html |  11 +-
 ...uite.user.sect.contacts.manage.export.html |  10 +-
 ...ox.appsuite.user.sect.contacts.manage.html |   1 +
 ...uite.user.sect.contacts.manage.import.html |  18 +-
 ...ect.contacts.manage.inviteappointment.html |  10 +-
 ...te.user.sect.contacts.manage.movecopy.html |  11 +-
 ...suite.user.sect.contacts.manage.print.html |  14 +-
 ...te.user.sect.contacts.manage.sendmail.html |   8 +-
 ...e.user.sect.contacts.manage.sendvcard.html |   9 +-
 ...ox.appsuite.user.sect.contacts.search.html |   2 +-
 ....appsuite.user.sect.contacts.settings.html |   2 +-
 ...ite.user.sect.contacts.useaddressbook.html |   2 +-
 ...ser.sect.contacts.useaddressdirectory.html |   2 +-
 ...uite.user.sect.contacts.view.haloview.html |  10 +-
 ...r.sect.dataorganisation.accounts.edit.html |   2 +-
 ...aorganisation.accounts.functionalmail.html |   2 +-
 ...user.sect.dataorganisation.categories.html |  43 +-
 ...user.sect.dataorganisation.deputy.add.html |   8 +-
 ...ser.sect.dataorganisation.deputy.edit.html |   6 +-
 ...ite.user.sect.dataorganisation.deputy.html |   4 +-
 ...ect.dataorganisation.sharing.examples.html |   2 +-
 ...r.sect.dataorganisation.sharing.share.html |   4 +-
 ....appsuite.user.sect.drive.gui.content.html |   1 +
 ...psuite.user.sect.drive.gui.foldertree.html |   1 +
 ....appsuite.user.sect.drive.gui.toolbar.html |  15 +-
 ...x.appsuite.user.sect.drive.gui.viewer.html |  20 +-
 .../ox.appsuite.user.sect.drive.settings.html |   4 +-
 .../ox.appsuite.user.sect.email.accounts.html |   2 +-
 ....appsuite.user.sect.email.attachments.html |   2 +-
 .../ox.appsuite.user.sect.email.deputy.html   |   4 +-
 ...x.appsuite.user.sect.email.gui.create.html |  14 +-
 ...psuite.user.sect.email.gui.detailview.html |   8 +-
 ...psuite.user.sect.email.gui.foldertree.html |   8 +-
 .../ox.appsuite.user.sect.email.gui.html      |   2 +-
 .../ox.appsuite.user.sect.email.gui.list.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.new.html  |   2 +-
 ...ox.appsuite.user.sect.email.gui.popup.html |   3 +-
 ...uite.user.sect.email.gui.settingsmenu.html |   1 -
 .../ox.appsuite.user.sect.email.gui.tabs.html |  15 +-
 ....appsuite.user.sect.email.gui.toolbar.html |  22 +-
 ...uite.user.sect.email.manage.addportal.html |   7 +-
 ...psuite.user.sect.email.manage.archive.html |  18 +-
 ...ite.user.sect.email.manage.categories.html |  95 ++++
 ...user.sect.email.manage.collectaddress.html |  20 +-
 ...ppsuite.user.sect.email.manage.delete.html | 104 ++---
 ....user.sect.email.manage.deleteforever.html |  92 ++++
 ...appsuite.user.sect.email.manage.draft.html |   9 +-
 ....user.sect.email.manage.expungefolder.html |  18 +-
 .../ox.appsuite.user.sect.email.manage.html   |   8 +-
 ...ppsuite.user.sect.email.manage.import.html |  17 +-
 ...ser.sect.email.manage.inboxcategories.html |  17 +-
 ...appsuite.user.sect.email.manage.label.html |  12 +-
 ....appsuite.user.sect.email.manage.mark.html |   6 +-
 ...suite.user.sect.email.manage.movecopy.html |   6 +-
 ...uite.user.sect.email.manage.pdfexport.html |   7 +-
 ...appsuite.user.sect.email.manage.print.html |   8 +-
 ...psuite.user.sect.email.manage.recover.html |  97 ++++
 ...suite.user.sect.email.manage.reminder.html |   7 +-
 ....appsuite.user.sect.email.manage.save.html |   9 +-
 ...ppsuite.user.sect.email.manage.source.html |   8 +-
 ...suite.user.sect.email.manage.undelete.html |  75 +++
 ...te.user.sect.email.manage.unifiedmail.html |   2 +-
 .../ox.appsuite.user.sect.email.openai.html   |   2 +-
 ....appsuite.user.sect.email.openai.send.html |   2 +-
 .../ox.appsuite.user.sect.email.search.html   |   9 +-
 ...er.sect.email.send.attachmentexisting.html |  16 +-
 ...e.user.sect.email.send.attachmentlink.html |  14 +-
 ...uite.user.sect.email.send.attachments.html |  14 +-
 ...psuite.user.sect.email.send.attendees.html |  31 +-
 ...uite.user.sect.email.send.autoforward.html |   8 +-
 ...appsuite.user.sect.email.send.forward.html |   8 +-
 .../ox.appsuite.user.sect.email.send.html     |  14 +-
 .../ox.appsuite.user.sect.email.send.new.html |  35 +-
 ...x.appsuite.user.sect.email.send.reply.html |   8 +-
 ...appsuite.user.sect.email.send.replyto.html |  16 +-
 ....appsuite.user.sect.email.send.sender.html |  14 +-
 ...suite.user.sect.email.send.signatures.html |   8 +-
 ...psuite.user.sect.email.send.templates.html |  10 +-
 ...e.user.sect.email.send.vacationnotice.html |   8 +-
 .../ox.appsuite.user.sect.email.settings.html |  33 +-
 .../ox.appsuite.user.sect.email.view.html     |   3 +-
 ....sect.firststeps.gui.notificationarea.html |   2 +-
 ....sect.guard.documents.createencrypted.html |   8 +-
 ...ox.appsuite.user.sect.guard.documents.html |   4 +-
 ...psuite.user.sect.guard.documents.open.html |   6 +-
 ...er.sect.guard.documents.saveencrypted.html |   6 +-
 ...ppsuite.user.sect.guard.drive.decrypt.html |   2 +-
 ...x.appsuite.user.sect.guard.email.send.html |   6 +-
 .../ox.appsuite.user.sect.guard.keys.html     |  23 +-
 ...te.user.sect.guard.keys.pgppublickeys.html |  57 +--
 ....user.sect.guard.keys.smimepublickeys.html |  85 ++++
 ...uite.user.sect.guard.keys.yourpgpkeys.html | 140 +++---
 ...te.user.sect.guard.keys.yoursmimekeys.html |  90 ++--
 ...suite.user.sect.guard.password.change.html |  75 +++
 ...er.sect.guard.password.deleterecovery.html |  74 +++
 .../ox.appsuite.user.sect.guard.password.html | 108 +----
 ...psuite.user.sect.guard.password.reset.html |  91 ++++
 .../ox.appsuite.user.sect.guard.settings.html | 166 +++++--
 ...ite.user.sect.settings.commonsettings.html |   4 +-
 ...appsuite.user.sect.settings.countdown.html |   2 +-
 ...e.user.sect.settings.notificationarea.html |  12 +-
 ...uite.user.sect.settings.notifications.html |  12 +-
 ...suite.user.sect.settings.personaldata.html |   2 +-
 ...ox.appsuite.user.sect.settings.search.html |   3 +
 .../ox.appsuite.user.sect.tasks.add.html      |   2 +-
 ...psuite.user.sect.tasks.gui.detailview.html |   9 +-
 ...psuite.user.sect.tasks.gui.foldertree.html |   1 +
 .../ox.appsuite.user.sect.tasks.gui.list.html |  10 +-
 ...uite.user.sect.tasks.gui.settingsmenu.html |   5 +-
 ....appsuite.user.sect.tasks.gui.toolbar.html |   8 +-
 ...ite.user.sect.tasks.manage.categories.html | 103 ++++
 ....user.sect.tasks.manage.changeduedate.html |   9 +-
 ...e.user.sect.tasks.manage.changestatus.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.delete.html |  11 +-
 ...ppsuite.user.sect.tasks.manage.export.html |  10 +-
 .../ox.appsuite.user.sect.tasks.manage.html   |   1 +
 ...ppsuite.user.sect.tasks.manage.import.html |  18 +-
 ...ite.user.sect.tasks.manage.markasdone.html |   5 +-
 ....appsuite.user.sect.tasks.manage.move.html |  12 +-
 ...appsuite.user.sect.tasks.manage.print.html |  11 +-
 .../ox.appsuite.user.sect.tasks.search.html   |   2 +-
 help/l10n/pl_PL/bk01-toc.html                 |  26 +-
 help/l10n/pl_PL/index.html                    |  55 ++-
 .../pl_PL/ox.appsuite.user.chap.calendar.html |   4 +-
 ...x.appsuite.user.chap.dataorganisation.html |   4 +-
 .../pl_PL/ox.appsuite.user.chap.drive.html    |   4 +-
 .../pl_PL/ox.appsuite.user.chap.guard.html    |   4 +-
 .../pl_PL/ox.appsuite.user.chap.security.html |   4 +-
 .../pl_PL/ox.appsuite.user.chap.tasks.html    |   4 +-
 help/l10n/pl_PL/ox.appsuite.user.index.html   | 438 ++++++++++--------
 .../ox.appsuite.user.sect.about.glossary.html |  16 +-
 ...uite.user.sect.calendar.add.attendees.html |   4 +-
 ...ppsuite.user.sect.calendar.add.create.html |   2 +-
 ...suite.user.sect.calendar.add.followup.html |   2 +-
 .../ox.appsuite.user.sect.calendar.add.html   |   2 +-
 ...e.user.sect.calendar.add.participants.html |   1 +
 ...ite.user.sect.calendar.add.recipients.html |   4 +-
 ...ite.user.sect.calendar.add.scheduling.html |   2 +-
 ...ppsuite.user.sect.calendar.gui.create.html |   2 +-
 ...ite.user.sect.calendar.gui.detailview.html |   5 +-
 ...ite.user.sect.calendar.gui.foldertree.html |   2 +-
 ....appsuite.user.sect.calendar.gui.list.html |   2 +-
 ...x.appsuite.user.sect.calendar.gui.new.html |   5 +-
 ...appsuite.user.sect.calendar.gui.popup.html |  10 +-
 ...psuite.user.sect.calendar.gui.toolbar.html |  11 +-
 ....user.sect.calendar.manage.categories.html | 106 +++++
 ....sect.calendar.manage.changeorganizer.html |   3 +-
 ...r.sect.calendar.manage.changereminder.html |   4 +-
 ...ser.sect.calendar.manage.changestatus.html |   1 +
 ...uite.user.sect.calendar.manage.colors.html |  22 +-
 ...uite.user.sect.calendar.manage.delete.html |   7 +-
 ...uite.user.sect.calendar.manage.export.html |   8 +-
 ...ox.appsuite.user.sect.calendar.manage.html |   1 +
 ...uite.user.sect.calendar.manage.import.html |  22 +-
 ...psuite.user.sect.calendar.manage.move.html |   5 +-
 ...suite.user.sect.calendar.manage.print.html |  12 +-
 ...e.user.sect.calendar.manage.timezones.html |   4 +-
 ...ox.appsuite.user.sect.calendar.search.html |   2 +-
 ....appsuite.user.sect.calendar.settings.html |   8 +-
 ....user.sect.calendar.view.appointments.html |   6 +-
 .../ox.appsuite.user.sect.calendar.view.html  |   8 -
 ...ite.user.sect.calendar.view.timezones.html |   2 +-
 ...ppsuite.user.sect.calendar.view.views.html |   2 +-
 ...ppsuite.user.sect.contacts.gui.create.html |  13 +-
 ...ite.user.sect.contacts.gui.detailview.html |  16 +-
 ...ite.user.sect.contacts.gui.foldertree.html |   1 +
 ....appsuite.user.sect.contacts.gui.list.html |   9 +-
 ...x.appsuite.user.sect.contacts.gui.new.html |   4 +-
 ...e.user.sect.contacts.gui.settingsmenu.html |   2 +-
 ...psuite.user.sect.contacts.gui.toolbar.html |   8 +-
 ....user.sect.contacts.manage.categories.html | 103 ++++
 ...uite.user.sect.contacts.manage.delete.html |  11 +-
 ...uite.user.sect.contacts.manage.export.html |  10 +-
 ...ox.appsuite.user.sect.contacts.manage.html |   1 +
 ...uite.user.sect.contacts.manage.import.html |  18 +-
 ...ect.contacts.manage.inviteappointment.html |  10 +-
 ...te.user.sect.contacts.manage.movecopy.html |  11 +-
 ...suite.user.sect.contacts.manage.print.html |  14 +-
 ...te.user.sect.contacts.manage.sendmail.html |   8 +-
 ...e.user.sect.contacts.manage.sendvcard.html |   9 +-
 ...ox.appsuite.user.sect.contacts.search.html |   2 +-
 ...ite.user.sect.contacts.useaddressbook.html |   2 +-
 ...ser.sect.contacts.useaddressdirectory.html |   2 +-
 ...uite.user.sect.contacts.view.haloview.html |   6 +-
 ...user.sect.dataorganisation.categories.html |  45 +-
 ...r.sect.dataorganisation.sharing.share.html |   2 +-
 ....appsuite.user.sect.drive.gui.content.html |   1 +
 ...psuite.user.sect.drive.gui.foldertree.html |   1 +
 ....appsuite.user.sect.drive.gui.toolbar.html |  15 +-
 ...x.appsuite.user.sect.drive.gui.viewer.html |  20 +-
 .../ox.appsuite.user.sect.drive.settings.html |   6 +-
 ...x.appsuite.user.sect.email.gui.create.html |  18 +-
 ...psuite.user.sect.email.gui.detailview.html |  10 +-
 ...psuite.user.sect.email.gui.foldertree.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.html      |   2 +-
 .../ox.appsuite.user.sect.email.gui.list.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.new.html  |   2 +-
 ...ox.appsuite.user.sect.email.gui.popup.html |   3 +-
 ...uite.user.sect.email.gui.settingsmenu.html |   1 -
 .../ox.appsuite.user.sect.email.gui.tabs.html |  16 +-
 ....appsuite.user.sect.email.gui.toolbar.html |  24 +-
 ...uite.user.sect.email.manage.addportal.html |   7 +-
 ...psuite.user.sect.email.manage.archive.html |  18 +-
 ...ite.user.sect.email.manage.categories.html |  95 ++++
 ...user.sect.email.manage.collectaddress.html |  20 +-
 ...ppsuite.user.sect.email.manage.delete.html | 106 ++---
 ....user.sect.email.manage.deleteforever.html |  92 ++++
 ...appsuite.user.sect.email.manage.draft.html |   7 +-
 ....user.sect.email.manage.expungefolder.html |  18 +-
 .../ox.appsuite.user.sect.email.manage.html   |   8 +-
 ...ppsuite.user.sect.email.manage.import.html |  17 +-
 ...ser.sect.email.manage.inboxcategories.html |  17 +-
 ...appsuite.user.sect.email.manage.label.html |  12 +-
 ....appsuite.user.sect.email.manage.mark.html |   6 +-
 ...suite.user.sect.email.manage.movecopy.html |   6 +-
 ...uite.user.sect.email.manage.pdfexport.html |   7 +-
 ...appsuite.user.sect.email.manage.print.html |   8 +-
 ...psuite.user.sect.email.manage.recover.html |  97 ++++
 ...suite.user.sect.email.manage.reminder.html |   7 +-
 ....appsuite.user.sect.email.manage.save.html |   9 +-
 ...ppsuite.user.sect.email.manage.source.html |   8 +-
 ...suite.user.sect.email.manage.undelete.html |  75 +++
 ...te.user.sect.email.manage.unifiedmail.html |   2 +-
 .../ox.appsuite.user.sect.email.openai.html   |   4 +-
 ....appsuite.user.sect.email.openai.send.html |   2 +-
 .../ox.appsuite.user.sect.email.search.html   |   9 +-
 ...er.sect.email.send.attachmentexisting.html |   6 +-
 ...e.user.sect.email.send.attachmentlink.html |   6 +-
 ...uite.user.sect.email.send.attachments.html |   4 +-
 ...psuite.user.sect.email.send.attendees.html |  25 +-
 ...uite.user.sect.email.send.autoforward.html |   2 +-
 ...appsuite.user.sect.email.send.forward.html |   2 +-
 .../ox.appsuite.user.sect.email.send.html     |   6 +-
 .../ox.appsuite.user.sect.email.send.new.html |  21 +-
 ...x.appsuite.user.sect.email.send.reply.html |   2 +-
 ...appsuite.user.sect.email.send.replyto.html |   8 +-
 ....appsuite.user.sect.email.send.sender.html |   4 +-
 ...suite.user.sect.email.send.signatures.html |   2 +-
 ...psuite.user.sect.email.send.templates.html |   4 +-
 ...e.user.sect.email.send.vacationnotice.html |   2 +-
 .../ox.appsuite.user.sect.email.settings.html |  17 +-
 .../ox.appsuite.user.sect.email.view.html     |   3 +-
 ...x.appsuite.user.sect.guard.email.send.html |   6 +-
 .../ox.appsuite.user.sect.guard.keys.html     |  23 +-
 ...te.user.sect.guard.keys.pgppublickeys.html |  57 +--
 ....user.sect.guard.keys.smimepublickeys.html |  85 ++++
 ...uite.user.sect.guard.keys.yourpgpkeys.html | 134 +++---
 ...te.user.sect.guard.keys.yoursmimekeys.html |  92 ++--
 ...suite.user.sect.guard.password.change.html |  75 +++
 ...er.sect.guard.password.deleterecovery.html |  74 +++
 .../ox.appsuite.user.sect.guard.password.html | 108 +----
 ...psuite.user.sect.guard.password.reset.html |  91 ++++
 .../ox.appsuite.user.sect.guard.settings.html | 166 +++++--
 ...ite.user.sect.settings.commonsettings.html |   2 +-
 ...e.user.sect.settings.notificationarea.html |   6 +-
 ...uite.user.sect.settings.notifications.html |   8 +-
 ...ox.appsuite.user.sect.settings.search.html |   3 +
 ...psuite.user.sect.tasks.gui.detailview.html |   9 +-
 ...psuite.user.sect.tasks.gui.foldertree.html |   1 +
 .../ox.appsuite.user.sect.tasks.gui.list.html |  10 +-
 ...uite.user.sect.tasks.gui.settingsmenu.html |   5 +-
 ....appsuite.user.sect.tasks.gui.toolbar.html |   8 +-
 ...ite.user.sect.tasks.manage.categories.html | 103 ++++
 ....user.sect.tasks.manage.changeduedate.html |   9 +-
 ...e.user.sect.tasks.manage.changestatus.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.delete.html |  11 +-
 ...ppsuite.user.sect.tasks.manage.export.html |  10 +-
 .../ox.appsuite.user.sect.tasks.manage.html   |   1 +
 ...ppsuite.user.sect.tasks.manage.import.html |  18 +-
 ...ite.user.sect.tasks.manage.markasdone.html |   5 +-
 ....appsuite.user.sect.tasks.manage.move.html |  12 +-
 ...appsuite.user.sect.tasks.manage.print.html |  11 +-
 .../ox.appsuite.user.sect.tasks.search.html   |   2 +-
 help/l10n/tr_TR/bk01-toc.html                 |  46 +-
 help/l10n/tr_TR/index.html                    |  61 +--
 .../tr_TR/ox.appsuite.user.chap.calendar.html |   6 +-
 ...x.appsuite.user.chap.dataorganisation.html |   6 +-
 .../tr_TR/ox.appsuite.user.chap.drive.html    |   4 +-
 .../tr_TR/ox.appsuite.user.chap.email.html    |   2 +-
 .../tr_TR/ox.appsuite.user.chap.guard.html    |   8 +-
 .../tr_TR/ox.appsuite.user.chap.security.html |   4 +-
 .../tr_TR/ox.appsuite.user.chap.settings.html |   4 +-
 .../tr_TR/ox.appsuite.user.chap.tasks.html    |   4 +-
 help/l10n/tr_TR/ox.appsuite.user.index.html   | 298 +++++++-----
 .../ox.appsuite.user.sect.about.glossary.html |  10 +-
 ...ppsuite.user.sect.calendar.add.alarms.html |   6 +-
 ...te.user.sect.calendar.add.attachments.html |   8 +-
 ...uite.user.sect.calendar.add.attendees.html |  10 +-
 ....appsuite.user.sect.calendar.add.call.html |   6 +-
 ...er.sect.calendar.add.conflicthandling.html |  12 +-
 ...ppsuite.user.sect.calendar.add.create.html |  12 +-
 ...ite.user.sect.calendar.add.datepicker.html |   6 +-
 ...psuite.user.sect.calendar.add.display.html |   6 +-
 ...suite.user.sect.calendar.add.followup.html |  12 +-
 .../ox.appsuite.user.sect.calendar.add.html   |   8 +-
 ...user.sect.calendar.add.icalattachment.html |  10 +-
 ...e.user.sect.calendar.add.participants.html |   7 +-
 ...ite.user.sect.calendar.add.recipients.html |  10 +-
 ...ite.user.sect.calendar.add.scheduling.html |  12 +-
 ...ppsuite.user.sect.calendar.add.serial.html |   6 +-
 ...psuite.user.sect.calendar.attachments.html |   2 +-
 ...ox.appsuite.user.sect.calendar.deputy.html |   4 +-
 ...ppsuite.user.sect.calendar.gui.create.html |   2 +-
 ...ite.user.sect.calendar.gui.detailview.html |   7 +-
 ...ite.user.sect.calendar.gui.foldertree.html |   2 +-
 ....appsuite.user.sect.calendar.gui.list.html |   2 +-
 ...x.appsuite.user.sect.calendar.gui.new.html |   5 +-
 ...appsuite.user.sect.calendar.gui.popup.html |  12 +-
 ...ite.user.sect.calendar.gui.scheduling.html |   2 +-
 ...psuite.user.sect.calendar.gui.toolbar.html |   9 +-
 ...ppsuite.user.sect.calendar.invitation.html |   2 +-
 ....user.sect.calendar.manage.categories.html |  88 ++++
 ....sect.calendar.manage.changeorganizer.html |   3 +-
 ...r.sect.calendar.manage.changereminder.html |   4 +-
 ...ser.sect.calendar.manage.changestatus.html |   1 +
 ...uite.user.sect.calendar.manage.colors.html |  11 +-
 ...uite.user.sect.calendar.manage.delete.html |   5 +-
 ...uite.user.sect.calendar.manage.export.html |   8 +-
 ...ox.appsuite.user.sect.calendar.manage.html |   1 +
 ...uite.user.sect.calendar.manage.import.html |   7 +-
 ...psuite.user.sect.calendar.manage.move.html |   5 +-
 ...suite.user.sect.calendar.manage.print.html |   6 +-
 ...e.user.sect.calendar.manage.timezones.html |   4 +-
 ...ox.appsuite.user.sect.calendar.search.html |   2 +-
 ....appsuite.user.sect.calendar.settings.html |  14 +-
 ....user.sect.calendar.view.appointments.html |   6 +-
 .../ox.appsuite.user.sect.calendar.view.html  |   3 -
 ...ite.user.sect.calendar.view.timezones.html |   2 +-
 ...ppsuite.user.sect.calendar.view.views.html |   2 +-
 ...ppsuite.user.sect.contacts.gui.create.html |  13 +-
 ...ite.user.sect.contacts.gui.detailview.html |  18 +-
 ...ite.user.sect.contacts.gui.foldertree.html |   1 +
 ....appsuite.user.sect.contacts.gui.list.html |   9 +-
 ...x.appsuite.user.sect.contacts.gui.new.html |   4 +-
 ...e.user.sect.contacts.gui.settingsmenu.html |   2 +-
 ...psuite.user.sect.contacts.gui.toolbar.html |   8 +-
 ....user.sect.contacts.manage.categories.html |  85 ++++
 ...uite.user.sect.contacts.manage.delete.html |   7 +-
 ...uite.user.sect.contacts.manage.export.html |  10 +-
 ...ox.appsuite.user.sect.contacts.manage.html |   1 +
 ...uite.user.sect.contacts.manage.import.html |   5 +-
 ...ect.contacts.manage.inviteappointment.html |  10 +-
 ...te.user.sect.contacts.manage.movecopy.html |  11 +-
 ...suite.user.sect.contacts.manage.print.html |   8 +-
 ...te.user.sect.contacts.manage.sendmail.html |   8 +-
 ...e.user.sect.contacts.manage.sendvcard.html |   9 +-
 ...ox.appsuite.user.sect.contacts.search.html |   2 +-
 ....appsuite.user.sect.contacts.settings.html |   2 +-
 ...ite.user.sect.contacts.useaddressbook.html |   4 +-
 ...ser.sect.contacts.useaddressdirectory.html |   4 +-
 ...uite.user.sect.contacts.view.haloview.html |   8 +-
 ...r.sect.dataorganisation.accounts.edit.html |   2 +-
 ...aorganisation.accounts.functionalmail.html |   2 +-
 ...user.sect.dataorganisation.categories.html |  31 +-
 ...user.sect.dataorganisation.deputy.add.html |   8 +-
 ...ser.sect.dataorganisation.deputy.edit.html |   6 +-
 ...ite.user.sect.dataorganisation.deputy.html |   4 +-
 ...ect.dataorganisation.sharing.examples.html |   2 +-
 ...r.sect.dataorganisation.sharing.share.html |   4 +-
 ....appsuite.user.sect.drive.gui.content.html |   1 +
 ...psuite.user.sect.drive.gui.foldertree.html |   1 +
 ....appsuite.user.sect.drive.gui.toolbar.html |  15 +-
 ...x.appsuite.user.sect.drive.gui.viewer.html |   8 +-
 .../ox.appsuite.user.sect.drive.settings.html |   4 +-
 .../ox.appsuite.user.sect.email.accounts.html |   2 +-
 ....appsuite.user.sect.email.attachments.html |   2 +-
 .../ox.appsuite.user.sect.email.deputy.html   |   4 +-
 ...x.appsuite.user.sect.email.gui.create.html |  16 +-
 ...psuite.user.sect.email.gui.detailview.html |   8 +-
 ...psuite.user.sect.email.gui.foldertree.html |   8 +-
 .../ox.appsuite.user.sect.email.gui.html      |   2 +-
 .../ox.appsuite.user.sect.email.gui.list.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.new.html  |   2 +-
 ...ox.appsuite.user.sect.email.gui.popup.html |   3 +-
 ...uite.user.sect.email.gui.settingsmenu.html |   1 -
 .../ox.appsuite.user.sect.email.gui.tabs.html |  12 +-
 ....appsuite.user.sect.email.gui.toolbar.html |  24 +-
 ...uite.user.sect.email.manage.addportal.html |   7 +-
 ...psuite.user.sect.email.manage.archive.html |   9 +-
 ...ite.user.sect.email.manage.categories.html |  90 ++++
 ...user.sect.email.manage.collectaddress.html |   8 +-
 ...ppsuite.user.sect.email.manage.delete.html | 106 ++---
 ....user.sect.email.manage.deleteforever.html |  87 ++++
 ...appsuite.user.sect.email.manage.draft.html |   9 +-
 ....user.sect.email.manage.expungefolder.html |   9 +-
 .../ox.appsuite.user.sect.email.manage.html   |   8 +-
 ...ppsuite.user.sect.email.manage.import.html |   8 +-
 ...ser.sect.email.manage.inboxcategories.html |  17 +-
 ...appsuite.user.sect.email.manage.label.html |  12 +-
 ....appsuite.user.sect.email.manage.mark.html |   6 +-
 ...suite.user.sect.email.manage.movecopy.html |   6 +-
 ...uite.user.sect.email.manage.pdfexport.html |   7 +-
 ...appsuite.user.sect.email.manage.print.html |   8 +-
 ...psuite.user.sect.email.manage.recover.html |  92 ++++
 ...suite.user.sect.email.manage.reminder.html |   7 +-
 ....appsuite.user.sect.email.manage.save.html |   9 +-
 ...ppsuite.user.sect.email.manage.source.html |   8 +-
 ...suite.user.sect.email.manage.undelete.html |  70 +++
 ...te.user.sect.email.manage.unifiedmail.html |   2 +-
 .../ox.appsuite.user.sect.email.openai.html   |   2 +-
 ....appsuite.user.sect.email.openai.send.html |   2 +-
 .../ox.appsuite.user.sect.email.search.html   |   5 +-
 ...er.sect.email.send.attachmentexisting.html |  16 +-
 ...e.user.sect.email.send.attachmentlink.html |  14 +-
 ...uite.user.sect.email.send.attachments.html |  14 +-
 ...psuite.user.sect.email.send.attendees.html |  18 +-
 ...uite.user.sect.email.send.autoforward.html |   8 +-
 ...appsuite.user.sect.email.send.forward.html |   8 +-
 .../ox.appsuite.user.sect.email.send.html     |  14 +-
 .../ox.appsuite.user.sect.email.send.new.html |  35 +-
 ...x.appsuite.user.sect.email.send.reply.html |   8 +-
 ...appsuite.user.sect.email.send.replyto.html |  18 +-
 ....appsuite.user.sect.email.send.sender.html |  14 +-
 ...suite.user.sect.email.send.signatures.html |   8 +-
 ...psuite.user.sect.email.send.templates.html |  10 +-
 ...e.user.sect.email.send.vacationnotice.html |   8 +-
 .../ox.appsuite.user.sect.email.settings.html |  33 +-
 .../ox.appsuite.user.sect.email.view.html     |   3 +-
 ....sect.firststeps.gui.notificationarea.html |   2 +-
 ...uite.user.sect.guard.autocrypt.manage.html |   2 +-
 ....sect.guard.documents.createencrypted.html |   8 +-
 ...ox.appsuite.user.sect.guard.documents.html |   4 +-
 ...psuite.user.sect.guard.documents.open.html |   6 +-
 ...er.sect.guard.documents.saveencrypted.html |   6 +-
 ...ppsuite.user.sect.guard.drive.decrypt.html |   2 +-
 ...x.appsuite.user.sect.guard.email.send.html |   8 +-
 .../ox.appsuite.user.sect.guard.keys.html     |  16 +-
 ...te.user.sect.guard.keys.pgppublickeys.html |  57 +--
 ....user.sect.guard.keys.smimepublickeys.html |  76 +++
 ...uite.user.sect.guard.keys.yourpgpkeys.html | 124 ++---
 ...te.user.sect.guard.keys.yoursmimekeys.html |  90 ++--
 ...suite.user.sect.guard.password.change.html |  66 +++
 ...er.sect.guard.password.deleterecovery.html |  65 +++
 .../ox.appsuite.user.sect.guard.password.html |  96 +---
 ...psuite.user.sect.guard.password.reset.html |  82 ++++
 .../ox.appsuite.user.sect.guard.settings.html | 131 ++++--
 ...ite.user.sect.settings.commonsettings.html |   6 +-
 ...appsuite.user.sect.settings.countdown.html |   6 +-
 ...e.user.sect.settings.notificationarea.html |   8 +-
 ...uite.user.sect.settings.notifications.html |  18 +-
 ...suite.user.sect.settings.personaldata.html |   2 +-
 ...ox.appsuite.user.sect.settings.search.html |   3 +-
 .../ox.appsuite.user.sect.tasks.add.html      |   2 +-
 ...psuite.user.sect.tasks.gui.detailview.html |   9 +-
 ...psuite.user.sect.tasks.gui.foldertree.html |   1 +
 .../ox.appsuite.user.sect.tasks.gui.list.html |  10 +-
 ...uite.user.sect.tasks.gui.settingsmenu.html |   5 +-
 ....appsuite.user.sect.tasks.gui.toolbar.html |   8 +-
 ...ite.user.sect.tasks.manage.categories.html |  85 ++++
 ....user.sect.tasks.manage.changeduedate.html |   9 +-
 ...e.user.sect.tasks.manage.changestatus.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.delete.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.export.html |  10 +-
 .../ox.appsuite.user.sect.tasks.manage.html   |   1 +
 ...ppsuite.user.sect.tasks.manage.import.html |   5 +-
 ...ite.user.sect.tasks.manage.markasdone.html |   5 +-
 ....appsuite.user.sect.tasks.manage.move.html |  12 +-
 ...appsuite.user.sect.tasks.manage.print.html |   7 +-
 .../ox.appsuite.user.sect.tasks.search.html   |   2 +-
 help/l10n/zh_CN/bk01-toc.html                 |  22 +-
 help/l10n/zh_CN/index.html                    |  49 +-
 .../zh_CN/ox.appsuite.user.chap.calendar.html |   4 +-
 ...x.appsuite.user.chap.dataorganisation.html |   4 +-
 .../zh_CN/ox.appsuite.user.chap.drive.html    |   4 +-
 .../zh_CN/ox.appsuite.user.chap.guard.html    |   4 +-
 .../zh_CN/ox.appsuite.user.chap.security.html |   4 +-
 .../zh_CN/ox.appsuite.user.chap.tasks.html    |   4 +-
 help/l10n/zh_CN/ox.appsuite.user.index.html   | 137 ++++--
 .../ox.appsuite.user.sect.about.glossary.html |   8 +-
 ...ppsuite.user.sect.calendar.add.create.html |   2 +-
 ...ite.user.sect.calendar.add.datepicker.html |   2 +-
 ...e.user.sect.calendar.add.participants.html |   1 +
 ...ppsuite.user.sect.calendar.add.serial.html |   4 +-
 ...ppsuite.user.sect.calendar.gui.create.html |   2 +-
 ...ite.user.sect.calendar.gui.datepicker.html |   6 +-
 ...ite.user.sect.calendar.gui.detailview.html |   5 +-
 ...ite.user.sect.calendar.gui.foldertree.html |   2 +-
 ....appsuite.user.sect.calendar.gui.list.html |   2 +-
 ...e.user.sect.calendar.gui.minicalendar.html |   6 +-
 ...x.appsuite.user.sect.calendar.gui.new.html |   5 +-
 ...appsuite.user.sect.calendar.gui.popup.html |  10 +-
 ...psuite.user.sect.calendar.gui.toolbar.html |   9 +-
 ...ppsuite.user.sect.calendar.invitation.html |   2 +-
 ....user.sect.calendar.manage.categories.html |  88 ++++
 ....sect.calendar.manage.changeorganizer.html |   3 +-
 ...r.sect.calendar.manage.changereminder.html |   6 +-
 ...ser.sect.calendar.manage.changestatus.html |   7 +-
 ...uite.user.sect.calendar.manage.colors.html |  11 +-
 ...uite.user.sect.calendar.manage.delete.html |   5 +-
 ...uite.user.sect.calendar.manage.export.html |   8 +-
 ...ox.appsuite.user.sect.calendar.manage.html |   5 +-
 ...uite.user.sect.calendar.manage.import.html |   5 +-
 ...psuite.user.sect.calendar.manage.move.html |   5 +-
 ...suite.user.sect.calendar.manage.print.html |   6 +-
 ...e.user.sect.calendar.manage.timezones.html |   4 +-
 ...ox.appsuite.user.sect.calendar.search.html |   4 +-
 ....user.sect.calendar.view.appointments.html |   6 +-
 .../ox.appsuite.user.sect.calendar.view.html  |   3 -
 ...ite.user.sect.calendar.view.timezones.html |   2 +-
 ...ppsuite.user.sect.calendar.view.views.html |   2 +-
 ...ppsuite.user.sect.contacts.add.create.html |   2 +-
 ...ppsuite.user.sect.contacts.gui.create.html |   9 +-
 ...ite.user.sect.contacts.gui.detailview.html |   8 +-
 ...ite.user.sect.contacts.gui.foldertree.html |   1 +
 ....appsuite.user.sect.contacts.gui.list.html |   5 +-
 ...x.appsuite.user.sect.contacts.gui.new.html |   2 +-
 ...psuite.user.sect.contacts.gui.toolbar.html |   8 +-
 ....user.sect.contacts.manage.categories.html |  85 ++++
 ...uite.user.sect.contacts.manage.delete.html |   7 +-
 ...uite.user.sect.contacts.manage.export.html |  14 +-
 ...ox.appsuite.user.sect.contacts.manage.html |   1 +
 ...uite.user.sect.contacts.manage.import.html |   5 +-
 ...ect.contacts.manage.inviteappointment.html |  10 +-
 ...te.user.sect.contacts.manage.movecopy.html |  11 +-
 ...suite.user.sect.contacts.manage.print.html |   8 +-
 ...te.user.sect.contacts.manage.sendmail.html |   6 +-
 ...e.user.sect.contacts.manage.sendvcard.html |   9 +-
 ...ox.appsuite.user.sect.contacts.search.html |   4 +-
 ...ite.user.sect.contacts.useaddressbook.html |   2 +-
 ...ser.sect.contacts.useaddressdirectory.html |   2 +-
 ...uite.user.sect.contacts.view.haloview.html |   2 +-
 ...user.sect.dataorganisation.categories.html |  31 +-
 ....appsuite.user.sect.drive.gui.content.html |   1 +
 ...psuite.user.sect.drive.gui.foldertree.html |   3 +-
 ....appsuite.user.sect.drive.gui.toolbar.html |  15 +-
 ...x.appsuite.user.sect.drive.gui.viewer.html |   8 +-
 .../ox.appsuite.user.sect.drive.search.html   |   2 +-
 ...x.appsuite.user.sect.email.gui.create.html |  16 +-
 ...psuite.user.sect.email.gui.detailview.html |   8 +-
 ...psuite.user.sect.email.gui.foldertree.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.html      |   2 +-
 .../ox.appsuite.user.sect.email.gui.list.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.new.html  |   2 +-
 ...ox.appsuite.user.sect.email.gui.popup.html |   3 +-
 ...uite.user.sect.email.gui.settingsmenu.html |   1 -
 .../ox.appsuite.user.sect.email.gui.tabs.html |  12 +-
 ....appsuite.user.sect.email.gui.toolbar.html |  22 +-
 ...uite.user.sect.email.manage.addportal.html |   7 +-
 ...psuite.user.sect.email.manage.archive.html |  11 +-
 ...ite.user.sect.email.manage.categories.html |  90 ++++
 ...user.sect.email.manage.collectaddress.html |   8 +-
 ...ppsuite.user.sect.email.manage.delete.html | 122 ++---
 ....user.sect.email.manage.deleteforever.html |  87 ++++
 ...appsuite.user.sect.email.manage.draft.html |   7 +-
 ....user.sect.email.manage.expungefolder.html |   9 +-
 .../ox.appsuite.user.sect.email.manage.html   |   8 +-
 ...ppsuite.user.sect.email.manage.import.html |   8 +-
 ...ser.sect.email.manage.inboxcategories.html |  17 +-
 ...appsuite.user.sect.email.manage.label.html |  12 +-
 ....appsuite.user.sect.email.manage.mark.html |   6 +-
 ...suite.user.sect.email.manage.movecopy.html |   6 +-
 ...uite.user.sect.email.manage.pdfexport.html |   7 +-
 ...appsuite.user.sect.email.manage.print.html |   8 +-
 ...psuite.user.sect.email.manage.recover.html |  92 ++++
 ...suite.user.sect.email.manage.reminder.html |   7 +-
 ....appsuite.user.sect.email.manage.save.html |   9 +-
 ...ppsuite.user.sect.email.manage.source.html |   8 +-
 ...suite.user.sect.email.manage.undelete.html |  70 +++
 ...te.user.sect.email.manage.unifiedmail.html |   2 +-
 .../ox.appsuite.user.sect.email.openai.html   |   2 +-
 .../ox.appsuite.user.sect.email.search.html   |   7 +-
 ...psuite.user.sect.email.send.attendees.html |  12 +-
 .../ox.appsuite.user.sect.email.send.new.html |  15 +-
 ...appsuite.user.sect.email.send.replyto.html |   4 +-
 .../ox.appsuite.user.sect.email.settings.html |  21 +-
 .../ox.appsuite.user.sect.email.view.html     |   3 +-
 ...ite.user.sect.guard.autocrypt.clients.html |   2 +-
 ...e.user.sect.guard.autocrypt.importkey.html |   2 +-
 ...uite.user.sect.guard.autocrypt.manage.html |   2 +-
 ....sect.guard.documents.createencrypted.html |   2 +-
 ...psuite.user.sect.guard.email.incoming.html |   8 +-
 ...x.appsuite.user.sect.guard.email.send.html |   6 +-
 .../ox.appsuite.user.sect.guard.keys.html     |  16 +-
 ...te.user.sect.guard.keys.pgppublickeys.html |  57 +--
 ....user.sect.guard.keys.smimepublickeys.html |  75 +++
 ...uite.user.sect.guard.keys.yourpgpkeys.html | 124 ++---
 ...te.user.sect.guard.keys.yoursmimekeys.html |  92 ++--
 .../ox.appsuite.user.sect.guard.logout.html   |   2 +-
 ...suite.user.sect.guard.password.change.html |  65 +++
 ...er.sect.guard.password.deleterecovery.html |  64 +++
 .../ox.appsuite.user.sect.guard.password.html |  96 +---
 ...psuite.user.sect.guard.password.reset.html |  81 ++++
 .../ox.appsuite.user.sect.guard.settings.html | 130 ++++--
 .../ox.appsuite.user.sect.guard.setup.html    |   2 +-
 ...e.user.sect.settings.notificationarea.html |   2 +-
 ...uite.user.sect.settings.notifications.html |   2 +-
 ...ox.appsuite.user.sect.settings.search.html |   1 +
 ...x.appsuite.user.sect.tasks.add.create.html |   2 +-
 ...psuite.user.sect.tasks.gui.detailview.html |   5 +-
 ...psuite.user.sect.tasks.gui.foldertree.html |   1 +
 .../ox.appsuite.user.sect.tasks.gui.list.html |  10 +-
 ...uite.user.sect.tasks.gui.settingsmenu.html |   5 +-
 ....appsuite.user.sect.tasks.gui.toolbar.html |   8 +-
 ...ite.user.sect.tasks.manage.categories.html |  85 ++++
 ....user.sect.tasks.manage.changeduedate.html |   9 +-
 ...e.user.sect.tasks.manage.changestatus.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.delete.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.export.html |  14 +-
 .../ox.appsuite.user.sect.tasks.manage.html   |   1 +
 ...ppsuite.user.sect.tasks.manage.import.html |   5 +-
 ...ite.user.sect.tasks.manage.markasdone.html |   5 +-
 ....appsuite.user.sect.tasks.manage.move.html |  12 +-
 ...appsuite.user.sect.tasks.manage.print.html |   7 +-
 .../ox.appsuite.user.sect.tasks.search.html   |   4 +-
 help/l10n/zh_TW/bk01-toc.html                 |  28 +-
 help/l10n/zh_TW/index.html                    |  55 ++-
 .../zh_TW/ox.appsuite.user.chap.calendar.html |   6 +-
 ...x.appsuite.user.chap.dataorganisation.html |   4 +-
 .../zh_TW/ox.appsuite.user.chap.drive.html    |   4 +-
 .../zh_TW/ox.appsuite.user.chap.email.html    |   2 +-
 .../zh_TW/ox.appsuite.user.chap.guard.html    |   6 +-
 .../zh_TW/ox.appsuite.user.chap.security.html |   4 +-
 .../zh_TW/ox.appsuite.user.chap.tasks.html    |   4 +-
 help/l10n/zh_TW/ox.appsuite.user.index.html   | 138 ++++--
 .../ox.appsuite.user.sect.about.glossary.html |   8 +-
 ...ppsuite.user.sect.calendar.add.alarms.html |   6 +-
 ...te.user.sect.calendar.add.attachments.html |   6 +-
 ...uite.user.sect.calendar.add.attendees.html |   6 +-
 ....appsuite.user.sect.calendar.add.call.html |   6 +-
 ...er.sect.calendar.add.conflicthandling.html |   6 +-
 ...ppsuite.user.sect.calendar.add.create.html |   8 +-
 ...ite.user.sect.calendar.add.datepicker.html |   6 +-
 ...psuite.user.sect.calendar.add.display.html |   6 +-
 ...suite.user.sect.calendar.add.followup.html |   6 +-
 .../ox.appsuite.user.sect.calendar.add.html   |   4 +-
 ...user.sect.calendar.add.icalattachment.html |   6 +-
 ...e.user.sect.calendar.add.participants.html |   7 +-
 ...ite.user.sect.calendar.add.recipients.html |   6 +-
 ...ite.user.sect.calendar.add.scheduling.html |   6 +-
 ...ppsuite.user.sect.calendar.add.serial.html |   6 +-
 ...psuite.user.sect.calendar.attachments.html |   2 +-
 ...ox.appsuite.user.sect.calendar.deputy.html |   2 +-
 ...ppsuite.user.sect.calendar.gui.create.html |   2 +-
 ...ite.user.sect.calendar.gui.detailview.html |   5 +-
 ...ite.user.sect.calendar.gui.foldertree.html |   2 +-
 ....appsuite.user.sect.calendar.gui.list.html |   2 +-
 ...x.appsuite.user.sect.calendar.gui.new.html |   5 +-
 ...appsuite.user.sect.calendar.gui.popup.html |  10 +-
 ...psuite.user.sect.calendar.gui.toolbar.html |   9 +-
 ....user.sect.calendar.manage.categories.html |  88 ++++
 ....sect.calendar.manage.changeorganizer.html |   3 +-
 ...r.sect.calendar.manage.changereminder.html |   4 +-
 ...ser.sect.calendar.manage.changestatus.html |   1 +
 ...uite.user.sect.calendar.manage.colors.html |  11 +-
 ...uite.user.sect.calendar.manage.delete.html |   5 +-
 ...uite.user.sect.calendar.manage.export.html |   8 +-
 ...ox.appsuite.user.sect.calendar.manage.html |   1 +
 ...uite.user.sect.calendar.manage.import.html |   7 +-
 ...psuite.user.sect.calendar.manage.move.html |   5 +-
 ...suite.user.sect.calendar.manage.print.html |   6 +-
 ...e.user.sect.calendar.manage.timezones.html |   4 +-
 ...ox.appsuite.user.sect.calendar.search.html |   2 +-
 ....appsuite.user.sect.calendar.settings.html |   2 +-
 ....user.sect.calendar.view.appointments.html |   6 +-
 .../ox.appsuite.user.sect.calendar.view.html  |   3 -
 ...ite.user.sect.calendar.view.timezones.html |   2 +-
 ...ppsuite.user.sect.calendar.view.views.html |   2 +-
 ...ppsuite.user.sect.contacts.gui.create.html |   9 +-
 ...ite.user.sect.contacts.gui.detailview.html |   6 +-
 ...ite.user.sect.contacts.gui.foldertree.html |   1 +
 ....appsuite.user.sect.contacts.gui.list.html |   5 +-
 ...x.appsuite.user.sect.contacts.gui.new.html |   2 +-
 ...psuite.user.sect.contacts.gui.toolbar.html |   8 +-
 ....user.sect.contacts.manage.categories.html |  85 ++++
 ...uite.user.sect.contacts.manage.delete.html |   7 +-
 ...uite.user.sect.contacts.manage.export.html |  10 +-
 ...ox.appsuite.user.sect.contacts.manage.html |   1 +
 ...uite.user.sect.contacts.manage.import.html |   5 +-
 ...ect.contacts.manage.inviteappointment.html |  10 +-
 ...te.user.sect.contacts.manage.movecopy.html |  11 +-
 ...suite.user.sect.contacts.manage.print.html |   8 +-
 ...te.user.sect.contacts.manage.sendmail.html |   8 +-
 ...e.user.sect.contacts.manage.sendvcard.html |   9 +-
 ...ox.appsuite.user.sect.contacts.search.html |   2 +-
 ...ite.user.sect.contacts.useaddressbook.html |   2 +-
 ...ser.sect.contacts.useaddressdirectory.html |   2 +-
 ...user.sect.dataorganisation.categories.html |  31 +-
 ...r.sect.dataorganisation.sharing.share.html |   2 +-
 ....appsuite.user.sect.drive.gui.content.html |   1 +
 ...psuite.user.sect.drive.gui.foldertree.html |   1 +
 ....appsuite.user.sect.drive.gui.toolbar.html |  15 +-
 ...x.appsuite.user.sect.drive.gui.viewer.html |   8 +-
 ....appsuite.user.sect.email.attachments.html |   2 +-
 .../ox.appsuite.user.sect.email.deputy.html   |   2 +-
 ...x.appsuite.user.sect.email.gui.create.html |  16 +-
 ...psuite.user.sect.email.gui.detailview.html |   8 +-
 ...psuite.user.sect.email.gui.foldertree.html |   8 +-
 .../ox.appsuite.user.sect.email.gui.html      |   2 +-
 .../ox.appsuite.user.sect.email.gui.list.html |  10 +-
 .../ox.appsuite.user.sect.email.gui.new.html  |   2 +-
 ...ox.appsuite.user.sect.email.gui.popup.html |   3 +-
 ...uite.user.sect.email.gui.settingsmenu.html |   1 -
 .../ox.appsuite.user.sect.email.gui.tabs.html |  12 +-
 ....appsuite.user.sect.email.gui.toolbar.html |  22 +-
 ...uite.user.sect.email.manage.addportal.html |   7 +-
 ...psuite.user.sect.email.manage.archive.html |   9 +-
 ...ite.user.sect.email.manage.categories.html |  90 ++++
 ...user.sect.email.manage.collectaddress.html |   8 +-
 ...ppsuite.user.sect.email.manage.delete.html | 106 ++---
 ....user.sect.email.manage.deleteforever.html |  87 ++++
 ...appsuite.user.sect.email.manage.draft.html |   9 +-
 ....user.sect.email.manage.expungefolder.html |   9 +-
 .../ox.appsuite.user.sect.email.manage.html   |   8 +-
 ...ppsuite.user.sect.email.manage.import.html |   8 +-
 ...ser.sect.email.manage.inboxcategories.html |  17 +-
 ...appsuite.user.sect.email.manage.label.html |  12 +-
 ....appsuite.user.sect.email.manage.mark.html |   6 +-
 ...suite.user.sect.email.manage.movecopy.html |   6 +-
 ...uite.user.sect.email.manage.pdfexport.html |   7 +-
 ...appsuite.user.sect.email.manage.print.html |   8 +-
 ...psuite.user.sect.email.manage.recover.html |  92 ++++
 ...suite.user.sect.email.manage.reminder.html |   7 +-
 ....appsuite.user.sect.email.manage.save.html |   9 +-
 ...ppsuite.user.sect.email.manage.source.html |   8 +-
 ...suite.user.sect.email.manage.undelete.html |  70 +++
 ...te.user.sect.email.manage.unifiedmail.html |   2 +-
 .../ox.appsuite.user.sect.email.openai.html   |   2 +-
 ....appsuite.user.sect.email.openai.send.html |   2 +-
 .../ox.appsuite.user.sect.email.search.html   |   5 +-
 ...er.sect.email.send.attachmentexisting.html |   8 +-
 ...e.user.sect.email.send.attachmentlink.html |   8 +-
 ...uite.user.sect.email.send.attachments.html |   8 +-
 ...psuite.user.sect.email.send.attendees.html |  18 +-
 ...uite.user.sect.email.send.autoforward.html |   8 +-
 ...appsuite.user.sect.email.send.forward.html |   8 +-
 .../ox.appsuite.user.sect.email.send.html     |   8 +-
 .../ox.appsuite.user.sect.email.send.new.html |  27 +-
 ...x.appsuite.user.sect.email.send.reply.html |   8 +-
 ...appsuite.user.sect.email.send.replyto.html |  10 +-
 ....appsuite.user.sect.email.send.sender.html |  10 +-
 ...suite.user.sect.email.send.signatures.html |   8 +-
 ...psuite.user.sect.email.send.templates.html |   8 +-
 ...e.user.sect.email.send.vacationnotice.html |   8 +-
 .../ox.appsuite.user.sect.email.settings.html |  15 +-
 .../ox.appsuite.user.sect.email.view.html     |   3 +-
 ...uite.user.sect.guard.autocrypt.manage.html |   2 +-
 ...x.appsuite.user.sect.guard.email.send.html |   8 +-
 .../ox.appsuite.user.sect.guard.keys.html     |  16 +-
 ...te.user.sect.guard.keys.pgppublickeys.html |  57 +--
 ....user.sect.guard.keys.smimepublickeys.html |  75 +++
 ...uite.user.sect.guard.keys.yourpgpkeys.html | 126 ++---
 ...te.user.sect.guard.keys.yoursmimekeys.html |  92 ++--
 ...suite.user.sect.guard.password.change.html |  65 +++
 ...er.sect.guard.password.deleterecovery.html |  64 +++
 .../ox.appsuite.user.sect.guard.password.html |  96 +---
 ...psuite.user.sect.guard.password.reset.html |  81 ++++
 .../ox.appsuite.user.sect.guard.settings.html | 132 ++++--
 ...e.user.sect.settings.notificationarea.html |   2 +-
 ...ox.appsuite.user.sect.settings.search.html |   1 +
 .../ox.appsuite.user.sect.tasks.add.html      |   2 +-
 ...psuite.user.sect.tasks.gui.detailview.html |   5 +-
 ...psuite.user.sect.tasks.gui.foldertree.html |   1 +
 .../ox.appsuite.user.sect.tasks.gui.list.html |  10 +-
 ...uite.user.sect.tasks.gui.settingsmenu.html |   5 +-
 ....appsuite.user.sect.tasks.gui.toolbar.html |   8 +-
 ...ite.user.sect.tasks.manage.categories.html |  85 ++++
 ....user.sect.tasks.manage.changeduedate.html |   9 +-
 ...e.user.sect.tasks.manage.changestatus.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.delete.html |   7 +-
 ...ppsuite.user.sect.tasks.manage.export.html |  10 +-
 .../ox.appsuite.user.sect.tasks.manage.html   |   1 +
 ...ppsuite.user.sect.tasks.manage.import.html |   5 +-
 ...ite.user.sect.tasks.manage.markasdone.html |   5 +-
 ....appsuite.user.sect.tasks.manage.move.html |  12 +-
 ...appsuite.user.sect.tasks.manage.print.html |   7 +-
 .../ox.appsuite.user.sect.tasks.search.html   |   2 +-
 1896 files changed, 22606 insertions(+), 12569 deletions(-)
 create mode 100644 help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.categories.html
 create mode 100644 help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.categories.html
 create mode 100644 help/l10n/en_GB/ox.appsuite.user.sect.email.manage.categories.html
 create mode 100644 help/l10n/en_GB/ox.appsuite.user.sect.email.manage.deleteforever.html
 create mode 100644 help/l10n/en_GB/ox.appsuite.user.sect.email.manage.recover.html
 create mode 100644 help/l10n/en_GB/ox.appsuite.user.sect.email.manage.undelete.html
 create mode 100644 help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
 create mode 100644 help/l10n/en_GB/ox.appsuite.user.sect.guard.password.change.html
 create mode 100644 help/l10n/en_GB/ox.appsuite.user.sect.guard.password.deleterecovery.html
 create mode 100644 help/l10n/en_GB/ox.appsuite.user.sect.guard.password.reset.html
 create mode 100644 help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.categories.html
 create mode 100644 help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.categories.html
 create mode 100644 help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.categories.html
 create mode 100644 help/l10n/es_ES/ox.appsuite.user.sect.email.manage.categories.html
 create mode 100644 help/l10n/es_ES/ox.appsuite.user.sect.email.manage.deleteforever.html
 create mode 100644 help/l10n/es_ES/ox.appsuite.user.sect.email.manage.recover.html
 create mode 100644 help/l10n/es_ES/ox.appsuite.user.sect.email.manage.undelete.html
 create mode 100644 help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
 create mode 100644 help/l10n/es_ES/ox.appsuite.user.sect.guard.password.change.html
 create mode 100644 help/l10n/es_ES/ox.appsuite.user.sect.guard.password.deleterecovery.html
 create mode 100644 help/l10n/es_ES/ox.appsuite.user.sect.guard.password.reset.html
 create mode 100644 help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.categories.html
 create mode 100644 help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.categories.html
 create mode 100644 help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.categories.html
 create mode 100644 help/l10n/es_MX/ox.appsuite.user.sect.email.manage.categories.html
 create mode 100644 help/l10n/es_MX/ox.appsuite.user.sect.email.manage.deleteforever.html
 create mode 100644 help/l10n/es_MX/ox.appsuite.user.sect.email.manage.recover.html
 create mode 100644 help/l10n/es_MX/ox.appsuite.user.sect.email.manage.undelete.html
 create mode 100644 help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
 create mode 100644 help/l10n/es_MX/ox.appsuite.user.sect.guard.password.change.html
 create mode 100644 help/l10n/es_MX/ox.appsuite.user.sect.guard.password.deleterecovery.html
 create mode 100644 help/l10n/es_MX/ox.appsuite.user.sect.guard.password.reset.html
 create mode 100644 help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.categories.html
 create mode 100644 help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.categories.html
 create mode 100644 help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.categories.html
 create mode 100644 help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.categories.html
 create mode 100644 help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.deleteforever.html
 create mode 100644 help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.recover.html
 create mode 100644 help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.undelete.html
 create mode 100644 help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
 create mode 100644 help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.change.html
 create mode 100644 help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.deleterecovery.html
 create mode 100644 help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.reset.html
 create mode 100644 help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.categories.html
 create mode 100644 help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.categories.html
 create mode 100644 help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.categories.html
 create mode 100644 help/l10n/it_IT/ox.appsuite.user.sect.email.manage.categories.html
 create mode 100644 help/l10n/it_IT/ox.appsuite.user.sect.email.manage.deleteforever.html
 create mode 100644 help/l10n/it_IT/ox.appsuite.user.sect.email.manage.recover.html
 create mode 100644 help/l10n/it_IT/ox.appsuite.user.sect.email.manage.undelete.html
 create mode 100644 help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
 create mode 100644 help/l10n/it_IT/ox.appsuite.user.sect.guard.password.change.html
 create mode 100644 help/l10n/it_IT/ox.appsuite.user.sect.guard.password.deleterecovery.html
 create mode 100644 help/l10n/it_IT/ox.appsuite.user.sect.guard.password.reset.html
 create mode 100644 help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.categories.html
 create mode 100644 help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.categories.html
 create mode 100644 help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.categories.html
 create mode 100644 help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.categories.html
 create mode 100644 help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.deleteforever.html
 create mode 100644 help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.recover.html
 create mode 100644 help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.undelete.html
 create mode 100644 help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
 create mode 100644 help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.change.html
 create mode 100644 help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.deleterecovery.html
 create mode 100644 help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.reset.html
 create mode 100644 help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.categories.html
 create mode 100644 help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.categories.html
 create mode 100644 help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.categories.html
 create mode 100644 help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.categories.html
 create mode 100644 help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.deleteforever.html
 create mode 100644 help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.recover.html
 create mode 100644 help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.undelete.html
 create mode 100644 help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
 create mode 100644 help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.change.html
 create mode 100644 help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.deleterecovery.html
 create mode 100644 help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.reset.html
 create mode 100644 help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.categories.html
 create mode 100644 help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.categories.html
 create mode 100644 help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.categories.html
 create mode 100644 help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.categories.html
 create mode 100644 help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.deleteforever.html
 create mode 100644 help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.recover.html
 create mode 100644 help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.undelete.html
 create mode 100644 help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
 create mode 100644 help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.change.html
 create mode 100644 help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.deleterecovery.html
 create mode 100644 help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.reset.html
 create mode 100644 help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.categories.html
 create mode 100644 help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.categories.html
 create mode 100644 help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.categories.html
 create mode 100644 help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.categories.html
 create mode 100644 help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.deleteforever.html
 create mode 100644 help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.recover.html
 create mode 100644 help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.undelete.html
 create mode 100644 help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
 create mode 100644 help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.change.html
 create mode 100644 help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.deleterecovery.html
 create mode 100644 help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.reset.html
 create mode 100644 help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.categories.html
 create mode 100644 help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.categories.html
 create mode 100644 help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.categories.html
 create mode 100644 help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.categories.html
 create mode 100644 help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.deleteforever.html
 create mode 100644 help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.recover.html
 create mode 100644 help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.undelete.html
 create mode 100644 help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
 create mode 100644 help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.change.html
 create mode 100644 help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.deleterecovery.html
 create mode 100644 help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.reset.html
 create mode 100644 help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.categories.html
 create mode 100644 help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.categories.html
 create mode 100644 help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.categories.html
 create mode 100644 help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.categories.html
 create mode 100644 help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.deleteforever.html
 create mode 100644 help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.recover.html
 create mode 100644 help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.undelete.html
 create mode 100644 help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
 create mode 100644 help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.change.html
 create mode 100644 help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.deleterecovery.html
 create mode 100644 help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.reset.html
 create mode 100644 help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.categories.html

diff --git a/help/l10n/en_GB/bk01-toc.html b/help/l10n/en_GB/bk01-toc.html
index 4f443b5f2..c28ee9822 100644
--- a/help/l10n/en_GB/bk01-toc.html
+++ b/help/l10n/en_GB/bk01-toc.html
@@ -63,8 +63,8 @@
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a></li>
-<li class="sect1 feat-io-ox-core-countdown"><a href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a></li>
-<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">Use the notification area</a></li>
+<li class="sect1 feat-io-ox-core-countdown"><a href="ox.appsuite.user.sect.settings.countdown.html">Using countdowns for appointments</a></li>
+<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">use the notification area</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.personaldata.html">Changing Personal Contact Data</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.wizard.html">Using a Wizard to Set Up Local Apps</a></li>
 <li class="sect1 cap-switchboard"><a href="ox.appsuite.user.sect.settings.presencestatus.html">Setting the Presence Status</a></li>
@@ -134,7 +134,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.new.html">The New email button</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">E-Mail</span> folder view</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">The <span class="phrase">E-Mail</span> tabs bar</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">The inbox categories bar</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.popup.html">The <span class="phrase">E-Mail</span> pop-up</a></li>
@@ -144,13 +144,13 @@
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.view.html">Viewing Email Messages</a></li>
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving email Attachments</a></li>
 <li class="sect1 cap-webmail">
-<a href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a><ul>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a></li>
+<a href="ox.appsuite.user.sect.email.send.html">send email messages</a><ul>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">select a sender address</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.replyto.html">Setting reply-to address</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing email messages</a></li>
-<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></li>
+<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></li>
 <li class="sect2 feat-io-ox-core-templates"><a href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.reply.html">Replying to email messages</a></li>
@@ -174,6 +174,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying E-Mail messages</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.mark.html">Marking email messages as read or unread</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecting addresses</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new email messages</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.label.html">Categorising E-Mail messages</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.draft.html">Using E-Mail drafts</a></li>
@@ -185,6 +186,9 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.print.html">Printing email messages</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.archive.html">Archiving E-Mail messages</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.delete.html">Deleting E-Mail messages</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.recover.html">Recovering email messages</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting E-Mail messages</a></li>
+<li class="sect2 cap-dumpster"><a href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted email messages</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up E-Mail folders</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a></li>
 </ul>
@@ -238,7 +242,7 @@
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.attachments.html">Viewing or Saving Appointment Attachments</a></li>
 <li class="sect1 cap-calendar">
-<a href="ox.appsuite.user.sect.calendar.add.html">create appointments</a><ul>
+<a href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a><ul>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.datepicker.html">Using the date picker</a></li>
 <li class="sect2 cap-calendar cap-switchboard"><a href="ox.appsuite.user.sect.calendar.add.call.html">Scheduling audio/video conferences</a></li>
@@ -247,12 +251,12 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.alarms.html">Using appointment reminders</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.participants.html">Adding participants or resources</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attachments.html">Adding attachments</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviting E-Mail recipients to new appointments</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creating appointments from iCal attachments</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></li>
 </ul>
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></li>
@@ -269,10 +273,11 @@
 </li>
 <li class="sect1 cap-calendar">
 <a href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a><ul>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing appointment status</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing the appointment status</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organiser</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.timezones.html">Managing favourite time zones</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.colors.html">Using calendar colours</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.move.html">Moving appointments to another calendar</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a></li>
@@ -360,6 +365,7 @@
 <a href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Sending Email Messages from within an address book</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Inviting contacts to an appointment</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Moving or copying contacts</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a></li>
@@ -413,6 +419,7 @@
 <a href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marking tasks as done</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Changing a task's due date</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.move.html">Moving tasks to another folder</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Changing task confirmations</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a></li>
@@ -515,7 +522,7 @@
 </ul>
 </li>
 <li class="sect1 cap-deputy">
-<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a><ul>
+<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a><ul>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.add.html">Adding deputies</a></li>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">Viewing, editing, deleting deputies</a></li>
 </ul>
@@ -577,22 +584,29 @@
 </ul>
 </li>
 <li class="sect1 cap-guard">
-<a href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office documents</a><ul>
+<a href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office Documents</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.createencrypted.html">Creating new encrypted documents</a></li>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Saving selected documents in an encrypted format</a></li>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.open.html">Opening encrypted documents</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.logout.html">Signing Out from <span class="phrase">Guard</span></a></li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.password.html">Password Management</a></li>
+<li class="sect1 cap-guard">
+<a href="ox.appsuite.user.sect.guard.password.html">Password Management</a><ul>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.change.html">Changing the password</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.reset.html">reset the password</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Removing the password reset function</a></li>
+</ul>
+</li>
 <li class="sect1 cap-guard">
 <a href="ox.appsuite.user.sect.guard.keys.html">Key Management</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Managing own PGP keys</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing PGP keys of recipients</a></li>
 <li class="sect2 cap-smime"><a href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Managing own S/MIME keys</a></li>
-<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing public keys</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Managing S/MIME keys of recipients</a></li>
 </ul>
 </li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Settings</a></li>
+<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a></li>
 </ul>
 </li>
 <li class="index"><a href="ox.appsuite.user.index.html">Index</a></li>
diff --git a/help/l10n/en_GB/index.html b/help/l10n/en_GB/index.html
index 5146bcf2b..db55690cf 100644
--- a/help/l10n/en_GB/index.html
+++ b/help/l10n/en_GB/index.html
@@ -34,7 +34,7 @@
 </h3></div></div>
 <div><p class="copyright">Copyright ©  OX Software GmbH </p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">Legal Notice</a></div>
-<div><p class="pubdate">Tuesday, 21. November 2023 Version 8.19.0 </p></div>
+<div><p class="pubdate">Thursday, 21. December 2023 Version 8.20.0 </p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">Help Topics Overview</h2>
@@ -81,10 +81,10 @@
                 <a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a>
+                <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using countdowns for appointments</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Use the notification area</a>
+                <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">use the notification area</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Using a Wizard to Set Up Local Apps</a>
@@ -97,6 +97,19 @@
               </p></li>
 </ul>
 </li>
+<li class="listitem" id="ox.appsuite.user.startpage.toc.keyboard" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.chap.keyboard.html"><i>Keyboard Input</i></a>
+            </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.navigation.html">Using the Keyboard Navigation</a>
+              </p></li>
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.shortkeys.html">Using Keyboard Shortcuts</a>
+              </p></li>
+</ul>
+</li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.portal" style="list-style-type: none">
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.chap.portal.html"><i>
@@ -135,12 +148,12 @@
                 <a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Email Messages</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a>
+                <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a>
               </p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.5.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.6.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.5.1.6"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -155,13 +168,13 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.search.html">Searching for E-Mail Messages</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.5.1.11"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.11"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Email Messages as Deputy</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Adding E-Mail Accounts</a>
               </p></li>
-<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.5.1.13"><p role="presentation">
+<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
               </p></li>
 </ul>
@@ -183,7 +196,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Viewing Appointments</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a>
+                <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a>
@@ -191,7 +204,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.7"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -200,25 +213,25 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a>
               </p></li>
-<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.6.1.10"><p role="presentation">
+<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.7.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Using Resource Calendars</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.12"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.7.1.12"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creating, Editing or Managing Appointments as Deputy</a>
               </p></li>
-<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation">
+<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.7.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">Using Groups</a>
               </p></li>
-<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.6.1.14"><p role="presentation">
+<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">Using Resources</a>
               </p></li>
-<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.6.1.15"><p role="presentation">
+<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.7.1.15"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">Using Managed Resources</a>
               </p></li>
-<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.6.1.16"><p role="presentation">
+<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.7.1.16"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
               </p></li>
 </ul>
@@ -242,7 +255,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a>
               </p></li>
-<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.7.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.8.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -254,7 +267,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Editing Contacts or Distribution Lists</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.9"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.8.1.9"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Calling Contacts</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -269,7 +282,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Searching for Contacts</a>
               </p></li>
-<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation">
+<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.8.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Address Book Settings</a>
               </p></li>
 </ul>
@@ -344,7 +357,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Adding Storage Accounts</a>
               </p></li>
-<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.9.1.10"><p role="presentation">
+<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.10.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span> Settings</a>
               </p></li>
 </ul>
@@ -357,19 +370,19 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Managing Data with Folders</a>
               </p></li>
-<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.10.1.3"><p role="presentation">
+<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.11.1.3"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.10.1.4"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.11.1.4"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Managing Accounts</a>
               </p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.10.1.6"><p role="presentation">
+<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.11.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>
               </p></li>
-<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.10.1.7"><p role="presentation">
+<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.11.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a>
               </p></li>
 </ul>
@@ -388,7 +401,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.sessions.html">Displaying or Signing Out from Active Clients</a>
               </p></li>
-<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.11.1.5"><p role="presentation">
+<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.12.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a>
               </p></li>
 </ul>
@@ -411,7 +424,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Encrypting or Decrypting Files</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office documents</a>
+                <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office Documents</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.guard.logout.html">Signing Out from <span class="phrase">Guard</span></a>
@@ -423,7 +436,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Settings</a>
+                <a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a>
               </p></li>
 </ul>
 </li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.chap.calendar.html b/help/l10n/en_GB/ox.appsuite.user.chap.calendar.html
index 23795a583..33fe89a45 100644
--- a/help/l10n/en_GB/ox.appsuite.user.chap.calendar.html
+++ b/help/l10n/en_GB/ox.appsuite.user.chap.calendar.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="Email Settings">
+<link rel="prev" href="ox.appsuite.user.sect.email.mailfilter.apply.html" title="Applying a rule to existing E-Mail messages">
 <link rel="next" href="ox.appsuite.user.sect.calendar.gui.html" title="The Calendar Components">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.mailfilter.apply.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.gui.html">Next</a></li>
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">The <span class="phrase">Calendar</span> Components</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Viewing Appointments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.attachments.html">Viewing or Saving Appointment Attachments</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.8.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a></p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/en_GB/ox.appsuite.user.chap.dataorganisation.html
index 11c00981a..9c224c2c2 100644
--- a/help/l10n/en_GB/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/en_GB/ox.appsuite.user.chap.dataorganisation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="Setting up WebDAV under Windows">
+<link rel="prev" href="ox.appsuite.user.sect.drive.settings.html" title="Drive Settings">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.folder.html" title="Managing Data with Folders">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.settings.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.folder.html">Next</a></li>
@@ -35,7 +35,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Managing Data with Folders</a></p></li>
 <li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.12.2.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a></p></li>
-<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a></p></li>
+<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Managing Accounts</a></p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.12.2.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
 <li class="listitem cap-dataexport" id="id-1.12.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.chap.drive.html b/help/l10n/en_GB/ox.appsuite.user.chap.drive.html
index c5605a826..2395e3162 100644
--- a/help/l10n/en_GB/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/en_GB/ox.appsuite.user.chap.drive.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.search.html" title="Searching for Tasks">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.delete.html" title="Deleting tasks">
 <link rel="next" href="ox.appsuite.user.sect.drive.gui.html" title="The Drive Components">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.search.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.delete.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.drive.gui.html">Next</a></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.chap.email.html b/help/l10n/en_GB/ox.appsuite.user.chap.email.html
index a31e35ad4..8072ca192 100644
--- a/help/l10n/en_GB/ox.appsuite.user.chap.email.html
+++ b/help/l10n/en_GB/ox.appsuite.user.chap.email.html
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html">The <span class="phrase">E-Mail</span> Components</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Email Messages</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving email Attachments</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.7.7.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Adding E-Mail Folders</a></p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.chap.guard.html b/help/l10n/en_GB/ox.appsuite.user.chap.guard.html
index adaee9e16..09b46e7bb 100644
--- a/help/l10n/en_GB/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/en_GB/ox.appsuite.user.chap.guard.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="Managing verification methods">
+<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="Signing out Automatically">
 <link rel="next" href="ox.appsuite.user.sect.guard.setup.html" title="Setting up Guard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.autologout.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.setup.html">Next</a></li>
@@ -45,11 +45,11 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.html">Encrypting E-Mail Conversations</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">Encrypting E-Mail Conversations with Autocrypt</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Encrypting or Decrypting Files</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office documents</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office Documents</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.logout.html">Signing Out from <span class="phrase">Guard</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Password Management</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Settings</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.guard">Information on additional security-related topics can be found in <a class="xref" href="ox.appsuite.user.chap.security.html"><i>Data Security</i></a>.</p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.chap.security.html b/help/l10n/en_GB/ox.appsuite.user.chap.security.html
index 2c919cb11..e13dcc3a5 100644
--- a/help/l10n/en_GB/ox.appsuite.user.chap.security.html
+++ b/help/l10n/en_GB/ox.appsuite.user.chap.security.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="Viewing, editing, deleting accounts">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="Downloading Personal Data">
 <link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="Displaying or Signing Out from Active Clients">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">Next</a></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.chap.settings.html b/help/l10n/en_GB/ox.appsuite.user.chap.settings.html
index 71b580758..6791ff232 100644
--- a/help/l10n/en_GB/ox.appsuite.user.chap.settings.html
+++ b/help/l10n/en_GB/ox.appsuite.user.chap.settings.html
@@ -36,8 +36,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Use the notification area</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using countdowns for appointments</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">use the notification area</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.personaldata.html">Changing Personal Contact Data</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Using a Wizard to Set Up Local Apps</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.4.3.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Setting the Presence Status</a></p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.chap.tasks.html b/help/l10n/en_GB/ox.appsuite.user.chap.tasks.html
index cd70d058d..8a1a62098 100644
--- a/help/l10n/en_GB/ox.appsuite.user.chap.tasks.html
+++ b/help/l10n/en_GB/ox.appsuite.user.chap.tasks.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="Address Book Settings">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.delete.html" title="Deleting contacts">
 <link rel="next" href="ox.appsuite.user.sect.tasks.gui.html" title="The Tasks Components">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.settings.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.delete.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.gui.html">Next</a></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.index.html b/help/l10n/en_GB/ox.appsuite.user.index.html
index 3c135baee..28c1f6729 100644
--- a/help/l10n/en_GB/ox.appsuite.user.index.html
+++ b/help/l10n/en_GB/ox.appsuite.user.index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="Guard Settings">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Managing S/MIME keys of recipients">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -21,7 +21,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.settings.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 </ul></div>
@@ -58,7 +58,7 @@
 </dt>
 <dt class="cap-contacts">contact, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.attachments.html">Adding attachments</a>, <a class="indexterm" href="ox.appsuite.user.sect.tasks.add.attachments.html">Adding attachments</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a>
+<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a>
 </dt>
 <dt class="cap-webmail">from existing email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing email messages</a>
 </dt>
@@ -86,7 +86,7 @@
 </dt>
 <dt class="cap-contacts">editing window, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.create.html">The contact editing window</a>
 </dt>
-<dt class="cap-contacts">folder view, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">The Address Book folder view</a>
+<dt class="cap-contacts">Folder view, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">The Address Book folder view</a>
 </dt>
 <dt class="cap-contacts">list view, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.list.html">The Address Book list view</a>
 </dt>
@@ -120,7 +120,7 @@
 </dt>
 <dt class="cap-contacts">link postal addresses with map service, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Address Book Settings</a>
 </dt>
-<dt class="cap-contacts">names, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Address Book Settings</a>
+<dt class="cap-contacts">Names, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Address Book Settings</a>
 </dt>
 </dl></dd>
 <dt class="feat-io-ox-core-enterprisePicker">Address directory</dt>
@@ -220,13 +220,13 @@
 </dt>
 <dt class="">Appointments</dt>
 <dd><dl>
-<dt class="cap-calendar">add participants or resources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.participants.html">Adding participants or resources</a>
+<dt class="cap-calendar">add attachments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Adding attachments</a>
 </dt>
-<dt class="cap-calendar">Adding attachments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Adding attachments</a>
+<dt class="cap-calendar">add participants or resources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.participants.html">Adding participants or resources</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">call appointment participants, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a>
 </dt>
-<dt class="cap-calendar">change appointment status, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing appointment status</a>
+<dt class="cap-calendar">change appointment status, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing the appointment status</a>
 </dt>
 <dt class="cap-calendar">change reminder, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a>
 </dt>
@@ -258,15 +258,15 @@
 </dt>
 <dt class="cap-calendar">export, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporting appointments</a>
 </dt>
-<dt class="cap-calendar">find free times, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a>
+<dt class="cap-calendar">find free times, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a>
 </dt>
-<dt class="cap-calendar">Import, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a>
+<dt class="cap-calendar">import, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a>
 </dt>
 <dt class="cap-calendar">invite E-Mail recipients to new appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviting E-Mail recipients to new appointments</a>
 </dt>
 <dt class="cap-calendar">invite from address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Inviting contacts to an appointment</a>
 </dt>
-<dt class="cap-calendar">Inviting participants to a new appointment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a>
+<dt class="cap-calendar">invite participants to a new appointment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a>
 </dt>
 <dt class="cap-calendar">manage, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a>
 </dt>
@@ -278,7 +278,7 @@
 </dt>
 <dt class="cap-calendar">reschedule to another day, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a>
 </dt>
-<dt class="cap-calendar">resolve conflicts, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a>
+<dt class="cap-calendar">resolve conflicts, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a>
 </dt>
 <dt class="cap-calendar">respond to invitations, <a class="indexterm" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a>
 </dt>
@@ -296,11 +296,13 @@
 </dt>
 <dt class="cap-calendar">use calendar colours, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Using calendar colours</a>
 </dt>
-<dt class="">use countdown, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a>
+<dt class="feat-io-ox-core-categories">use categories, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a>
+</dt>
+<dt class="">use countdown, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Using countdowns for appointments</a>
 </dt>
 <dt class="cap-calendar">use the date picker, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.datepicker.html">Using the date picker</a>
 </dt>
-<dt class="cap-calendar">use the scheduling view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a>
+<dt class="cap-calendar">use the scheduling view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a>
 </dt>
 <dt class="cap-calendar">view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.html">Viewing Appointments</a>
 </dt>
@@ -351,7 +353,7 @@
 </dt>
 <dt class="cap-calendar">components, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.html">The Calendar Components</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Creating appointments by using the resource calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creating appointments by using the resource calendar</a>
+<dt class="feat-io-ox-core-resourceCalendars">create appointments by using the resource calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creating appointments by using the resource calendar</a>
 </dt>
 <dt class="cap-calendar">date picker, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">The date picker</a>
 </dt>
@@ -359,11 +361,11 @@
 </dt>
 <dt class="cap-calendar">editing window, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.create.html">The appointment editing window</a>
 </dt>
-<dt class="cap-calendar">folder view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">The Calendar folder view</a>
+<dt class="cap-calendar">Folder view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">The Calendar folder view</a>
 </dt>
-<dt class="cap-calendar">Import, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
+<dt class="cap-calendar">import, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
 </dt>
-<dt class="cap-calendar">List view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">The Calendar list view</a>
+<dt class="cap-calendar">list view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">The Calendar list view</a>
 </dt>
 <dt class="cap-calendar">mini calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">The mini calendar</a>
 </dt>
@@ -375,35 +377,36 @@
 </dt>
 <dt class="cap-calendar">settings, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
+<dt class="cap-share_links cap-share_mail_attachments">share, see sharing, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a>
+</dt>
+<dt class="cap-calendar_google">subscribe to Google calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a>
+</dt>
 <dt class="cap-calendar">subscribe to iCal calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal URL</a>
 </dt>
 <dt class="cap-calendar">subscribe to public and shared calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a>
 </dt>
-<dt class="cap-calendar_google">Subscribing to Google calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a>
-</dt>
 <dt class="cap-calendar">the Settings menu, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">The Calendar settings menu</a>
 </dt>
 <dt class="cap-calendar">tool bar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">The Calendar tool bar</a>
 </dt>
 <dt class="cap-calendar">use calendar colours, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Using calendar colours</a>
 </dt>
-<dt class="cap-calendar">use the scheduling view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a>
+<dt class="feat-io-ox-core-categories">use categories, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a>
+</dt>
+<dt class="feat-io-ox-core-resourceCalendars">use resource calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Using Resource Calendars</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Using Resource Calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Using Resource Calendars</a>
+<dt class="cap-calendar">use the scheduling view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a>
 </dt>
 </dl></dd>
-<dt class="cap-share_links cap-share_mail_attachments">calendar</dt>
-<dd><dl><dt class="cap-share_links cap-share_mail_attachments">share, see sharing, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a>
-</dt></dl></dd>
 <dt class="">Calendar settings</dt>
 <dd><dl>
 <dt class="cap-portal">advanced settings, <a class="indexterm" href="ox.appsuite.user.sect.portal.settings.html">Portal Settings</a>, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Address Book Settings</a>
 </dt>
-<dt class="cap-calendar">Appointment reminders, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+<dt class="cap-calendar">appointment reminders, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
 <dt class="cap-calendar">automatically apply appointment changes received via email to your calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
-<dt class="">automatically delete the invitation email after the appointment has been accepted or declined, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
+<dt class="">Automatically delete the invitation email after the appointment has been accepted or declined, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
 </dt>
 <dt class="cap-calendar">automatically mark all day appointments as “free”, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
@@ -415,15 +418,15 @@
 </dt>
 <dt class="cap-calendar">participants can edit appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
-<dt class="">receive notification as appointment creator when participants accept or decline, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
+<dt class="">Receive notification as appointment creator when participants accept or decline, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
 </dt>
-<dt class="">receive notification as appointment participant when other participants accept or decline, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
+<dt class="">Receive notification as appointment participant when other participants accept or decline, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
 </dt>
 <dt class="">receive notifications when an appointment in which you participate is created, modified or deleted, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
 </dt>
 <dt class="cap-calendar">show birthday calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
-<dt class="cap-calendar">Show declined appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+<dt class="cap-calendar">show declined appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
 <dt class="cap-calendar">show reminders for past appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
@@ -435,7 +438,7 @@
 </dt>
 <dt class="cap-calendar">use first category colour for appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
-<dt class="cap-calendar">Work week, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+<dt class="cap-calendar">work week, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
 <dt class="cap-calendar">working time, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
@@ -454,8 +457,18 @@
 </dt>
 </dl></dd>
 <dt class="feat-io-ox-core-categories">Categories</dt>
-<dd><dl><dt class="feat-io-ox-core-categories">manage, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="feat-io-ox-core-categories">manage, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>
+</dt>
+<dt class="feat-io-ox-core-categories">use for appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a>
+</dt>
+<dt class="feat-io-ox-core-categories">use for contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a>
+</dt>
+<dt class="feat-io-ox-core-categories">use for email messages, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new email messages</a>
+</dt>
+<dt class="feat-io-ox-core-categories">use for tasks, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a>
+</dt>
+</dl></dd>
 <dt class="cap-calendar">Change the appointment organiser, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organiser</a>
 </dt>
 <dt class="cap-infostore">Cloud storage</dt>
@@ -529,6 +542,8 @@
 </dt>
 <dt class="cap-contacts">subscribe to public and shared address books, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Subscribing to public and shared address books</a>
 </dt>
+<dt class="feat-io-ox-core-categories">use categories, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a>
+</dt>
 <dt class="cap-contacts">view attachment, <a class="indexterm" href="ox.appsuite.user.sect.contacts.attachments.html">Viewing or Saving Contact Attachments</a>
 </dt>
 </dl></dd>
@@ -578,7 +593,7 @@
 </dt>
 <dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.delete.html">Deleting contacts</a>
 </dt>
-<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting E-Mail messages</a>
+<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting E-Mail messages</a>, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting E-Mail messages</a>
 </dt>
 <dt class="cap-infostore">files, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.delete.html">Deleting files or Drive folders</a>
 </dt>
@@ -599,7 +614,7 @@
 </dt>
 <dt class="cap-deputy">edit, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">Viewing, editing, deleting deputies</a>
 </dt>
-<dt class="cap-deputy">manage, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a>
+<dt class="cap-deputy">manage, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a>
 </dt>
 <dt class="cap-deputy">manage email messages, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Email Messages as Deputy</a>
 </dt>
@@ -753,7 +768,7 @@
 </dt>
 <dt class="cap-infostore">show hidden files and folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Settings</a>
 </dt>
-<dt class="cap-infostore">slideshow for images, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Settings</a>
+<dt class="cap-infostore">Slideshow for images, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Settings</a>
 </dt>
 <dt class="cap-infostore">version history, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Settings</a>
 </dt>
@@ -784,10 +799,12 @@
 </dt>
 <dt class="cap-webmail">editing window, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.create.html">The email editing window</a>
 </dt>
-<dt class="cap-webmail">folder view, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">The E-Mail folder view</a>
+<dt class="cap-webmail">Folder view, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">The E-Mail folder view</a>
 </dt>
 <dt class="cap-guard">import Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importing Autocrypt keys</a>
 </dt>
+<dt class="cap-webmail">inbox categories bar, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">The inbox categories bar</a>
+</dt>
 <dt class="cap-webmail">list view, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.list.html">The E-Mail list view</a>
 </dt>
 <dt class="cap-webmail">New email button, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.new.html">The New email button</a>
@@ -796,8 +813,6 @@
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">share, see sharing, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a>
 </dt>
-<dt class="cap-webmail">tabs bar, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">The E-Mail tabs bar</a>
-</dt>
 <dt class="cap-webmail">the Settings menu, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">The E-Mail settings menu</a>
 </dt>
 <dt class="cap-webmail">tool bar, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.toolbar.html">The E-Mail tool bar</a>
@@ -850,33 +865,10 @@
 </dt>
 <dt class="">email</dt>
 <dd><dl>
-<dt class="cap-guard">delete Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
-</dt>
-<dt class="cap-infostore">display attachments, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Displaying email attachments in Drive</a>
-</dt>
-<dt class="cap-guard">encrypt incoming E-Mail messages, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Encrypting incoming E-Mail messages by using a filter rule</a>
-</dt>
-<dt class="">external images, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in E-Mail Messages</a>
-</dt>
-<dt class="">notification sounds, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
-</dt>
-<dt class="cap-guard">read encrypted E-Mail messages, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Reading encrypted E-Mail messages</a>
-</dt>
-<dt class="cap-guard">send encrypted E-Mail messages, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Sending encrypted E-Mail messages</a>
-</dt>
-<dt class="cap-guard">show Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
-</dt>
-<dt class="cap-guard">verify Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
-</dt>
-</dl></dd>
-<dt class="cap-webmail">Email</dt>
-<dd><dl>
-<dt class="cap-webmail">add attachments, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a>
+<dt class="cap-webmail">add attachments, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a>
 </dt>
 <dt class="cap-webmail">add attachments from existing email messages, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing email messages</a>
 </dt>
-<dt class="cap-webmail">add email account, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Adding E-Mail Accounts</a>
-</dt>
 <dt class="cap-webmail">add folder, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Adding E-Mail Folders</a>
 </dt>
 <dt class="cap-portal">add to portal, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.addportal.html">Adding an E-Mail to the Portal</a>
@@ -885,32 +877,28 @@
 </dt>
 <dt class="cap-webmail">assign colour, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Categorising E-Mail messages</a>
 </dt>
-<dt class="cap-contacts">automatically add from address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a>
-</dt>
-<dt class="feat-io-ox-core-enterprisePicker">automatically add from address directory, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
-</dt>
 <dt class="cap-webmail">automatically forward, <a class="indexterm" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatically forwarding email messages</a>
 </dt>
-<dt class="cap-webmail cap-switchboard">call the sender or another recipient, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a>
-</dt>
 <dt class="cap-webmail">categorise, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Categorising E-Mail messages</a>
 </dt>
 <dt class="cap-webmail">clean up folders, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up E-Mail folders</a>
 </dt>
-<dt class="cap-webmail">collect addresses, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecting addresses</a>
-</dt>
 <dt class="cap-webmail">copy, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying E-Mail messages</a>
 </dt>
 <dt class="cap-tasks">create reminder, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.reminder.html">Creating E-Mail reminders</a>
 </dt>
 <dt class="cap-webmail">delete, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting E-Mail messages</a>
 </dt>
+<dt class="cap-guard">delete Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
+</dt>
 <dt class="cap-webmail">display, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Viewing Email Messages</a>
 </dt>
-<dt class="cap-deputy">edit, manage as deputy, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Email Messages as Deputy</a>
+<dt class="cap-guard">encrypt incoming E-Mail messages, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Encrypting incoming E-Mail messages by using a filter rule</a>
 </dt>
 <dt class="feat-io-ox-core-mailPDFExport">export as PDF, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting email messages as PDF</a>
 </dt>
+<dt class="">external images, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in E-Mail Messages</a>
+</dt>
 <dt class="cap-webmail">filters, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Using E-Mail Filters</a>
 </dt>
 <dt class="cap-webmail">forward, <a class="indexterm" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding email messages</a>
@@ -923,47 +911,43 @@
 </dt>
 <dt class="cap-webmail">mark as read, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marking email messages as read or unread</a>
 </dt>
-<dt class="cap-webmail">mark as read, setting for, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
-</dt>
 <dt class="cap-webmail">mark as unread, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marking email messages as read or unread</a>
 </dt>
 <dt class="cap-webmail">mark folder as read, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marking email messages as read or unread</a>
 </dt>
 <dt class="cap-webmail">move, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying E-Mail messages</a>
 </dt>
-<dt class="cap-webmail">print, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Printing email messages</a>
+<dt class="">notification sounds, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
+</dt>
+<dt class="cap-guard">read encrypted E-Mail messages, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Reading encrypted E-Mail messages</a>
+</dt>
+<dt class="cap-webmail">Recover, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Recovering email messages</a>
+</dt>
+<dt class="cap-dumpster">recover permanently deleted email messages, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted email messages</a>
 </dt>
 <dt class="cap-webmail">reply, <a class="indexterm" href="ox.appsuite.user.sect.email.send.reply.html">Replying to email messages</a>
 </dt>
 <dt class="cap-webmail">save as EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">Saving email messages</a>
 </dt>
-<dt class="cap-webmail">save attachment, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving email Attachments</a>
-</dt>
 <dt class="cap-webmail">search, <a class="indexterm" href="ox.appsuite.user.sect.email.search.html">Searching for E-Mail Messages</a>
 </dt>
-<dt class="cap-webmail">select a sender address, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a>
+<dt class="cap-webmail">select a sender address, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">select a sender address</a>
 </dt>
-<dt class="cap-webmail">send, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
+<dt class="cap-webmail">send, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a>
 </dt>
 <dt class="cap-webmail">send a vacation notice, <a class="indexterm" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Sending a vacation notice automatically</a>
 </dt>
-<dt class="cap-deputy">send as deputy, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Email Messages as Deputy</a>
+<dt class="cap-infostore">send attachments as link, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a>
 </dt>
-<dt class="cap-webmail">send from address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Sending Email Messages from within an address book</a>
+<dt class="cap-guard">send encrypted E-Mail messages, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Sending encrypted E-Mail messages</a>
 </dt>
 <dt class="cap-calendar">send to appointment participants, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attendees.html">Sending an E-Mail to appointment participants</a>
 </dt>
-<dt class="cap-infostore">Sending attachments as link, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a>
-</dt>
 <dt class="cap-webmail">set reply-to addresses, <a class="indexterm" href="ox.appsuite.user.sect.email.send.replyto.html">Setting reply-to address</a>
 </dt>
-<dt class="cap-webmail">settings, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
-</dt>
-<dt class="cap-webmail">show the email source, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a>
-</dt>
-<dt class="cap-webmail">unified Mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a>
+<dt class="cap-guard">show Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
 </dt>
-<dt class="feat-io-ox-core-openai">use AI functions for composing email messages, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Using AI functions when composing email messages</a>
+<dt class="cap-webmail">Unified Mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a>
 </dt>
 <dt class="feat-io-ox-core-openai">use AI functions for replies, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">Using AI functions when replying to email messages</a>
 </dt>
@@ -971,6 +955,45 @@
 </dt>
 <dt class="cap-webmail">use draft, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">Using E-Mail drafts</a>
 </dt>
+<dt class="cap-guard">verify Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
+</dt>
+</dl></dd>
+<dt class="cap-webmail">Email</dt>
+<dd><dl>
+<dt class="cap-webmail">add email account, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Adding E-Mail Accounts</a>
+</dt>
+<dt class="cap-contacts">automatically add from address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a>
+</dt>
+<dt class="feat-io-ox-core-enterprisePicker">automatically add from address directory, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
+</dt>
+<dt class="cap-webmail cap-switchboard">call the sender or another recipient, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a>
+</dt>
+<dt class="cap-webmail">collect addresses, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecting addresses</a>
+</dt>
+<dt class="cap-infostore">display attachments, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Displaying email attachments in Drive</a>
+</dt>
+<dt class="cap-deputy">edit, manage as deputy, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Email Messages as Deputy</a>
+</dt>
+<dt class="cap-webmail">mark as read, setting for, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+</dt>
+<dt class="cap-webmail">permanently delete, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting E-Mail messages</a>
+</dt>
+<dt class="cap-webmail">print, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Printing email messages</a>
+</dt>
+<dt class="cap-webmail">save attachment, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving email Attachments</a>
+</dt>
+<dt class="cap-deputy">send as deputy, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Email Messages as Deputy</a>
+</dt>
+<dt class="cap-webmail">send from address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Sending Email Messages from within an address book</a>
+</dt>
+<dt class="cap-webmail">settings, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+</dt>
+<dt class="cap-webmail">show the email source, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a>
+</dt>
+<dt class="feat-io-ox-core-openai">use AI functions for composing email messages, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Using AI functions when composing email messages</a>
+</dt>
+<dt class="feat-io-ox-core-categories">use categories, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new email messages</a>
+</dt>
 <dt class="cap-webmail">use signatures, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a>
 </dt>
 <dt class="feat-io-ox-core-templates">use templates, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a>
@@ -1000,7 +1023,7 @@
 </dt>
 <dt class="cap-webmail">fixed-width font, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
-<dt class="cap-webmail">forward email messages as, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+<dt class="cap-webmail">Forward email messages as, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">IMAP folder subscription, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Subscribing to shared or personal E-Mail folders</a>
 </dt>
@@ -1016,12 +1039,14 @@
 </dt>
 <dt class="">notification sounds, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
 </dt>
-<dt class="cap-webmail">permanently remove deleted email messages, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+<dt class="cap-webmail">Permanently remove deleted email messages, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
 <dt class="cap-webmail">reading pane, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
 <dt class="cap-webmail">select newest read message automatically at start, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
+<dt class="cap-webmail">show categories, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+</dt>
 <dt class="cap-webmail">show date and time, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
 <dt class="cap-webmail">show folder with all flagged messages, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
@@ -1032,7 +1057,7 @@
 </dt>
 <dt class="cap-webmail">show quoted text in different colour, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
-<dt class="cap-webmail">show requests for read receipts, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+<dt class="cap-webmail">Show requests for read receipts, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
 <dt class="cap-webmail">show text preview, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
@@ -1056,14 +1081,14 @@
 </dt>
 <dt class="cap-guard">E-Mail Messages with Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.html">Encrypting E-Mail Conversations with Autocrypt</a>
 </dt>
-<dt class="cap-guard">encrypt Office documents, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office documents</a>
+<dt class="cap-guard">encrypt Office documents, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office Documents</a>
 </dt>
 <dt class="cap-guard">files, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.html">Encrypting or Decrypting Files</a>, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.encrypt.html">Encrypting files</a>
 </dt>
 <dt class="cap-guard">save selected documents in an encrypted format, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Saving selected documents in an encrypted format</a>
 </dt>
 </dl></dd>
-<dt class="cap-guard">Encrypt Office documents, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office documents</a>
+<dt class="cap-guard">Encrypt Office documents, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office Documents</a>
 </dt>
 <dt class="cap-guard">Encrypted document</dt>
 <dd><dl>
@@ -1205,7 +1230,7 @@
 </dl></dd>
 <dt class="">Folder structure</dt>
 <dd><dl>
-<dt class="">Favourites, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Adding folders to favourites</a>
+<dt class="">favourites, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Adding folders to favourites</a>
 </dt>
 <dt class="">hide folders, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.hide.html">Hiding folders</a>
 </dt>
@@ -1214,10 +1239,11 @@
 </dl></dd>
 <dt class="">folder view, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.foldertree.html">The folder view</a>
 </dt>
+<dt class="">Folder view</dt>
 <dd><dl>
 <dt class="">change width, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Navigating within the folder structure</a>
 </dt>
-<dt class="">Favourites, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Adding folders to favourites</a>
+<dt class="">favourites, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Adding folders to favourites</a>
 </dt>
 <dt class="">hide folders, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.hide.html">Hiding folders</a>
 </dt>
@@ -1243,7 +1269,7 @@
 </dt>
 <dt class="">public folders, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.kind.html">What are folder types?</a>
 </dt>
-<dt class="">Rename, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Renaming folders</a>
+<dt class="">rename, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Renaming folders</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">share, see sharing, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a>
 </dt>
@@ -1292,7 +1318,7 @@
     , <a class="indexterm" href="ox.appsuite.user.chap.guard.html">Encrypting Data with Guard</a>
 </dt>
 <dd><dl>
-<dt class="cap-guard">change password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Password Management</a>
+<dt class="cap-guard">change password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Changing the password</a>
 </dt>
 <dt class="cap-guard">create new encrypted documents, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.createencrypted.html">Creating new encrypted documents</a>
 </dt>
@@ -1312,17 +1338,19 @@
 </dt>
 <dt class="cap-guard">file encryption, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.html">Encrypting or Decrypting Files</a>, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.encrypt.html">Encrypting files</a>
 </dt>
-<dt class="cap-guard">importing Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importing Autocrypt keys</a>
+<dt class="cap-guard">import Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importing Autocrypt keys</a>
 </dt>
-<dt class="cap-guard">key management, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a>
+<dt class="cap-guard">Key Management, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a>
 </dt>
-<dt class="cap-guard">manag own PGP keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Managing own PGP keys</a>
+<dt class="cap-guard">manage own PGP keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Managing own PGP keys</a>
 </dt>
 <dt class="cap-smime">manage own S/MIME keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Managing own S/MIME keys</a>
 </dt>
-<dt class="cap-guard">manage public keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing public keys</a>
+<dt class="cap-guard">manage PGP keys of recipients, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing PGP keys of recipients</a>
+</dt>
+<dt class="cap-guard">manage S/MIME keys of recipients, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Managing S/MIME keys of recipients</a>
 </dt>
-<dt class="cap-guard">Office document encryption, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office documents</a>
+<dt class="cap-guard">Office document encryption, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office Documents</a>
 </dt>
 <dt class="cap-guard">open encrypted documents, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.open.html">Opening encrypted documents</a>
 </dt>
@@ -1332,7 +1360,9 @@
 </dt>
 <dt class="cap-guard">read encrypted E-Mail messages, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Reading encrypted E-Mail messages</a>
 </dt>
-<dt class="cap-guard">reset the password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Password Management</a>
+<dt class="cap-guard">remove the password reset function, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Removing the password reset function</a>
+</dt>
+<dt class="cap-guard">reset the password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">reset the password</a>
 </dt>
 <dt class="cap-guard">save selected documents in an encrypted format, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Saving selected documents in an encrypted format</a>
 </dt>
@@ -1340,7 +1370,7 @@
 </dt>
 <dt class="cap-guard">set up, <a class="indexterm" href="ox.appsuite.user.sect.guard.setup.html">Setting up Guard</a>
 </dt>
-<dt class="cap-guard">settings, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">settings, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
 <dt class="cap-guard">show Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
 </dt>
@@ -1352,21 +1382,30 @@
 </dt>
 </dl></dd>
 <dt class="cap-guard">Guard security settings</dt>
-<dd><dl><dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dd><dl>
+<dt class="cap-guard">Autocrypt setting, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
+</dt>
+<dt class="cap-guard">email cache setting, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
+</dt>
+<dt class="cap-guard">reset options, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
+</dt>
+<dt class="cap-guard">show advanced settings for composing email, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
+</dt>
+</dl></dd>
+<dt class="cap-guard">Guard settings</dt>
+<dd><dl><dt class="cap-guard">compose options, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt></dl></dd>
 <dt class="cap-guard">Guardsecurity settings</dt>
 <dd><dl>
-<dt class="cap-guard">advanced settings, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
-</dt>
-<dt class="cap-guard">Default adding signature to outgoing email messages, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
-<dt class="cap-guard">default to send encrypted when composing e-mail, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">Default adding signature to outgoing email messages, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
-<dt class="cap-guard">default to using PGP inline for new e-mail messages, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">default to send encrypted when composing e-mail, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
-<dt class="cap-guard">Remember password default, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">default to using PGP inline for new e-mail messages, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
-<dt class="cap-guard">S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">Remember password default, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
 </dl></dd>
 </dl>
@@ -1374,7 +1413,7 @@
 <div class="indexdiv">
 <h3>H</h3>
 <dl>
-<dt class="cap-webmail cap-calendar cap-tasks">halo view, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Displaying contacts in the halo view</a>
+<dt class="cap-webmail cap-calendar cap-tasks">Halo view, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Displaying contacts in the halo view</a>
 </dt>
 <dt class="">Halo view, see pop-up, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.popup.html">The pop-up</a>
 </dt>
@@ -1397,19 +1436,17 @@
 </dt>
 </dl></dd>
 <dt class="cap-webmail">import</dt>
-<dd><dl>
-<dt class="cap-contacts">contacts in CSV format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
-</dt>
-<dt class="cap-contacts">contacts in vCard format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
-</dt>
-<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importing email messages</a>
-</dt>
-</dl></dd>
+<dd><dl><dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importing email messages</a>
+</dt></dl></dd>
 <dt class="cap-calendar">Import</dt>
 <dd><dl>
 <dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a>
 </dt>
-<dt class="cap-calendar">Calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
+<dt class="cap-calendar">calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
+</dt>
+<dt class="cap-contacts">contacts in CSV format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
+</dt>
+<dt class="cap-contacts">contacts in vCard format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
 </dt>
 <dt class="cap-tasks">tasks, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a>
 </dt>
@@ -1426,17 +1463,17 @@
 <dd><dl>
 <dt class="cap-calendar cap-switchboard">call appointment participants, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a>
 </dt>
+<dt class="cap-contacts cap-switchboard">call contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Calling Contacts</a>
+</dt>
 <dt class="cap-tasks cap-switchboard">call task participants, <a class="indexterm" href="ox.appsuite.user.sect.tasks.call.html">Calling Task Participants</a>
 </dt>
 <dt class="cap-webmail cap-switchboard">call the sender or another recipient, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a>
 </dt>
-<dt class="cap-contacts cap-switchboard">Calling Contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Calling Contacts</a>
-</dt>
 <dt class="cap-calendar cap-switchboard">schedule audio/video conferences, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Scheduling audio/video conferences</a>
 </dt>
 </dl></dd>
 <dt class="cap-calendar">Jitsi settings</dt>
-<dd><dl><dt class="cap-calendar">Automatically copy link to location, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+<dd><dl><dt class="cap-calendar">automatically copy link to location, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt></dl></dd>
 </dl>
 </div>
@@ -1537,7 +1574,7 @@
 </dt>
 <dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a>
 </dt>
-<dt class="cap-calendar">Calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a>
+<dt class="cap-calendar">calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a>
 </dt>
 <dt class="cap-contacts">contact, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.create.html">Creating a new contact</a>
 </dt>
@@ -1549,9 +1586,9 @@
 </dt>
 <dt class="cap-infostore">Drivefolders, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.html">Drive: Adding Folders</a>, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.personal.html">Drive: creating folders</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
+<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a>
 </dt>
-<dt class="cap-webmail">Email folders, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Adding E-Mail Folders</a>
+<dt class="cap-webmail">email folders, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Adding E-Mail Folders</a>
 </dt>
 <dt class="cap-contacts">personal address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.personal.html">Adding personal address books</a>
 </dt>
@@ -1575,14 +1612,16 @@
 <dd><dl>
 <dt class="">Open notification area automatically, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
 </dt>
-<dt class="">Use the notification area, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Use the notification area</a>
-</dt>
-<dt class="">Using Countdowns for Appointments, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a>
+<dt class="">use the notification area, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">use the notification area</a>
 </dt>
 </dl></dd>
 <dt class="">Notifications</dt>
-<dd><dl><dt class="">show desktop notifications, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="">show desktop notifications, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
+</dt>
+<dt class="">use countdowns for appointments, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Using countdowns for appointments</a>
+</dt>
+</dl></dd>
 </dl>
 </div>
 <div class="indexdiv">
@@ -1592,9 +1631,9 @@
 <dd><dl>
 <dt class="">change, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.changepassword.html">Changing the Password</a>
 </dt>
-<dt class="cap-guard">Guard change password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Password Management</a>
+<dt class="cap-guard">Guard change password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Changing the password</a>
 </dt>
-<dt class="cap-guard">Guard reset the password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Password Management</a>
+<dt class="cap-guard">Guard reset the password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">reset the password</a>
 </dt>
 <dt class="">Using Application Passwords, <a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">Using Application Passwords</a>
 </dt>
@@ -1610,24 +1649,27 @@
 </dl></dd>
 <dt class="cap-share_links cap-share_mail_attachments">Permission examples, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">Use cases for permissions</a>
 </dt>
-<dt class="">permissions</dt>
+<dt class="">Permissions</dt>
 <dd><dl>
 <dt class="cap-share_links cap-share_mail_attachments">administrator, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Which permissions can be used?</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">application, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Which permissions can be used?</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">author, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Which permissions can be used?</a>
-</dt>
 <dt class="">definition, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">What is the purpose of permissions?</a>
 </dt>
+<dt class="cap-share_links cap-share_mail_attachments">viewer, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Which permissions can be used?</a>
+</dt>
+</dl></dd>
+<dt class="cap-share_links cap-share_mail_attachments">permissions</dt>
+<dd><dl>
+<dt class="cap-share_links cap-share_mail_attachments">author, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Which permissions can be used?</a>
+</dt>
 <dt class="cap-share_links cap-share_mail_attachments">examples, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">Use cases for permissions</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">reviewer, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Which permissions can be used?</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">viewer, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Which permissions can be used?</a>
-</dt>
 </dl></dd>
-<dt class="">personal contact data, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Changing Personal Contact Data</a>
+<dt class="">Personal contact data, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Changing Personal Contact Data</a>
 </dt>
 <dt class="">Personal contact picture, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Changing Personal Contact Data</a>
 </dt>
@@ -1635,9 +1677,9 @@
 <dd><dl>
 <dt class="cap-calendar cap-switchboard">call appointment participants, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a>
 </dt>
-<dt class="cap-tasks cap-switchboard">call task participants, <a class="indexterm" href="ox.appsuite.user.sect.tasks.call.html">Calling Task Participants</a>
+<dt class="cap-contacts cap-switchboard">call contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Calling Contacts</a>
 </dt>
-<dt class="cap-contacts cap-switchboard">Calling Contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Calling Contacts</a>
+<dt class="cap-tasks cap-switchboard">call task participants, <a class="indexterm" href="ox.appsuite.user.sect.tasks.call.html">Calling Task Participants</a>
 </dt>
 </dl></dd>
 <dt class="">Picture</dt>
@@ -1726,6 +1768,13 @@
 <div class="indexdiv">
 <h3>R</h3>
 <dl>
+<dt class="cap-webmail">Recover</dt>
+<dd><dl>
+<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Recovering email messages</a>
+</dt>
+<dt class="cap-dumpster">permanently deleted email messages, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted email messages</a>
+</dt>
+</dl></dd>
 <dt class="cap-infostore">Rename</dt>
 <dd><dl>
 <dt class="cap-infostore">files, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.rename.html">Editing file names</a>
@@ -1758,9 +1807,9 @@
 </dt>
 <dt class="cap-edit_resource">use, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resources.html">Using Resources</a>
 </dt>
-<dt class="feat-io-ox-core-managedResources">use, managed resources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.managedresources.html">Using Managed Resources</a>
+<dt class="feat-io-ox-core-resourceCalendars">use resource calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Using Resource Calendars</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Using Resource Calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Using Resource Calendars</a>
+<dt class="feat-io-ox-core-managedResources">use, managed resources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.managedresources.html">Using Managed Resources</a>
 </dt>
 </dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Resource calendar</dt>
@@ -1778,7 +1827,7 @@
 </dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Resource calendar group</dt>
 <dd><dl>
-<dt class="feat-io-ox-core-resourceCalendars">Add resource calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creating resource calendars and resource calendar groups</a>
+<dt class="feat-io-ox-core-resourceCalendars">add resource calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creating resource calendars and resource calendar groups</a>
 </dt>
 <dt class="feat-io-ox-core-resourceCalendars">create, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creating resource calendars and resource calendar groups</a>
 </dt>
@@ -1788,10 +1837,10 @@
 <div class="indexdiv">
 <h3>S</h3>
 <dl>
-<dt class="cap-calendar cap-switchboard">Schedule audio/video conferences, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Scheduling audio/video conferences</a>
-</dt>
 <dt class="cap-calendar cap-switchboard">Schedule conference, audio/video, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Scheduling audio/video conferences</a>
 </dt>
+<dt class="cap-calendar cap-switchboard">Scheduling audio/video conferences, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Scheduling audio/video conferences</a>
+</dt>
 <dt class="">Search</dt>
 <dd><dl>
 <dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a>
@@ -1815,13 +1864,13 @@
 </dt>
 <dt class="cap-guard">encrypt E-Mail messages, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.html">Encrypting E-Mail Conversations</a>
 </dt>
-<dt class="cap-guard">encrypt Office documents, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office documents</a>
+<dt class="cap-guard">encrypt Office documents, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office Documents</a>
 </dt>
 <dt class="cap-guard">encrypt or decrypt files, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.html">Encrypting or Decrypting Files</a>
 </dt>
 <dt class="">externally linked images in E-Mail messages, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in E-Mail Messages</a>
 </dt>
-<dt class="cap-guard">Guard settings, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">Guardsettings, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
 <dt class="cap-multifactor">multi-factor authentication, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a>
 </dt>
@@ -1834,7 +1883,7 @@
 <dd><dl>
 <dt class="cap-contacts">contacts as vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
+<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a>
 </dt>
 </dl></dd>
 <dt class="cap-switchboard">Set the presence status, <a class="indexterm" href="ox.appsuite.user.sect.settings.presencestatus.html">Setting the Presence Status</a>
@@ -1855,18 +1904,18 @@
 </dt>
 <dt class="cap-dataexport">download personal data, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
-</dt>
-<dt class="">general settings, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
-</dt>
-<dt class="cap-guard">
-        Guard
+<dt class="cap-infostore">
+        Drive
         
         
         
-      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Settings</a>
 </dt>
-<dt class="cap-deputy">manage deputies, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a>
+<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+</dt>
+<dt class="">general settings, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
+</dt>
+<dt class="cap-deputy">manage deputies, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a>
 </dt>
 <dt class="">notifications, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
 </dt>
@@ -1881,13 +1930,13 @@
 <dt class="">set up local apps with a wizard, <a class="indexterm" href="ox.appsuite.user.sect.settings.wizard.html">Using a Wizard to Set Up Local Apps</a>
 </dt>
 </dl></dd>
-<dt class="cap-infostore">settings</dt>
-<dd><dl><dt class="cap-infostore">
-        Drive
+<dt class="cap-guard">settings</dt>
+<dd><dl><dt class="cap-guard">
+        Guard
         
         
         
-      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Settings</a>
+      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt></dl></dd>
 <dt class="cap-share_mail_attachments">Share data, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.share.html">Sharing data</a>
 </dt>
@@ -1931,7 +1980,7 @@
 <dd><dl>
 <dt class="cap-contacts">address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Subscribing to external address books</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">Email folders, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Subscribing to shared or personal E-Mail folders</a>
+<dt class="cap-share_links cap-share_mail_attachments">email folders, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Subscribing to shared or personal E-Mail folders</a>
 </dt>
 <dt class="cap-calendar_google">Google calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a>
 </dt>
@@ -2008,7 +2057,7 @@
 </dt>
 <dt class="cap-tasks">export, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.export.html">Exporting tasks</a>
 </dt>
-<dt class="cap-tasks">folder view, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">The Tasks folder view</a>
+<dt class="cap-tasks">Folder view, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">The Tasks folder view</a>
 </dt>
 <dt class="cap-tasks">import, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a>
 </dt>
@@ -2038,6 +2087,8 @@
 </dt>
 <dt class="cap-tasks">tool bar, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The Tasks tool bar</a>
 </dt>
+<dt class="feat-io-ox-core-categories">use categories, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a>
+</dt>
 <dt class="cap-tasks">view attachment, <a class="indexterm" href="ox.appsuite.user.sect.tasks.attachments.html">Viewing or Saving Task Attachments</a>
 </dt>
 </dl></dd>
@@ -2063,7 +2114,7 @@
 <div class="indexdiv">
 <h3>U</h3>
 <dl>
-<dt class="cap-webmail">unified Mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a>
+<dt class="cap-webmail">Unified Mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a>
 </dt>
 <dt class="cap-infostore">Upload</dt>
 <dd><dl><dt class="cap-infostore">file or folder, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Uploading Files or Folders</a>
@@ -2072,13 +2123,15 @@
 </dt>
 <dt class="feat-io-ox-core-navigation">Use browser buttons, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.browserbuttons.html">Using browser buttons</a>
 </dt>
+<dt class="">Use countdowns for appointments, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Using countdowns for appointments</a>
+</dt>
 <dt class="cap-webmail">Use signatures, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a>
 </dt>
 <dt class="feat-io-ox-core-templates">Use templates, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a>
 </dt>
-<dt class="">Use the notification area, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Use the notification area</a>
+<dt class="">use the notification area, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">use the notification area</a>
 </dt>
-<dt class="cap-calendar">Use the scheduling view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a>
+<dt class="cap-calendar">Use the scheduling view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a>
 </dt>
 <dt class="">User interface</dt>
 <dd><dl>
@@ -2119,8 +2172,6 @@
 <dt class="feat-io-ox-core-navigation">use browser buttons, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.browserbuttons.html">Using browser buttons</a>
 </dt>
 </dl></dd>
-<dt class="">Using Countdowns for Appointments, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a>
-</dt>
 </dl>
 </div>
 <div class="indexdiv">
@@ -2178,12 +2229,12 @@
 <dd><dl>
 <dt class="cap-calendar cap-switchboard">call appointment participants, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a>
 </dt>
+<dt class="cap-contacts cap-switchboard">call contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Calling Contacts</a>
+</dt>
 <dt class="cap-tasks cap-switchboard">call task participants, <a class="indexterm" href="ox.appsuite.user.sect.tasks.call.html">Calling Task Participants</a>
 </dt>
 <dt class="cap-webmail cap-switchboard">call the sender or another recipient, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a>
 </dt>
-<dt class="cap-contacts cap-switchboard">Calling Contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Calling Contacts</a>
-</dt>
 <dt class="cap-calendar cap-switchboard">schedule audio/video conference, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Scheduling audio/video conferences</a>
 </dt>
 </dl></dd>
@@ -2191,9 +2242,9 @@
 <dd><dl>
 <dt class="cap-calendar">always add a random meeting password, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
-<dt class="cap-calendar">Automatically copy link to location, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+<dt class="cap-calendar">automatically copy link to location, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
-<dt class="cap-calendar">Copy dial-in information to description, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+<dt class="cap-calendar">copy dial-in information to description, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
 </dl></dd>
 </dl>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.about.glossary.html b/help/l10n/en_GB/ox.appsuite.user.sect.about.glossary.html
index 6591763f4..6e0391702 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.about.glossary.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.about.glossary.html
@@ -54,8 +54,8 @@
 <dd class="glossdef"><p role="presentation">An application is a groupware component that provides certain functions. Example: With the <span class="phrase">E-Mail</span> application you can send, receive and organise E-Mail messages.</p></dd>
 <dt class="feat-io-ox-core-categories" id="ox.appsuite.user.reference.about.glossary.categories"><span class="glossterm">Categories</span></dt>
 <dd class="glossdef feat-io-ox-core-categories">
-<p role="presentation">Categories can be used to classify appointments, contacts and tasks. That way, semantically related objects can be identified and easily found. Depending on the configuration, specific categories are predefined. You can set your own categories.</p>
-<p role="presentation">Note: Those categories cannot be used for email messages. For email messages, there are inbox tabs.</p>
+<p role="presentation">Categories allow you to organise email messages, appointments, contacts and tasks across apps, independently from the folder structure. This allows logically related objects to be identified and found more easily, for example all email messages, appointments, contacts and tasks that belong to a specific project or customer. Depending on the configuration, specific categories are predefined. You can set your own categories.</p>
+<p role="presentation">Note: For email messages, you can also use inbox tabs.</p>
 <p role="presentation">Related topics: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li></ul></p>
 </dd>
 <dt class="cap-deputy" id="ox.appsuite.user.reference.about.glossary.deputy"><span class="glossterm">Deputy</span></dt>
@@ -65,7 +65,7 @@
 <li class="listitem"><p role="presentation">schedule, edit or organise another user’s appointments</p></li>
 </ul></p>
 <p role="presentation">Related topics: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Email Messages as Deputy</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creating, Editing or Managing Appointments as Deputy</a></p>
 </li></ul></p>
@@ -152,11 +152,11 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.externalparticipant">External participant</a></p>
 </li></ul></p>
 </dd>
-<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Inbox tabs</span></dt>
+<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Inbox categories</span></dt>
 <dd class="glossdef cap-webmail">
 <p role="presentation">Inbox tabs provide an easy and simple way of keeping the <span class="guilabel"><strong>Inbox</strong></span> folder neat. With tabs, incoming email messages are saved separated by sender in the <span class="guilabel"><strong>Inbox</strong></span> folder. Depending on the configuration, specific inbox tabs are predefined. You can set additional inbox tabs according to your needs.</p>
 <p role="presentation">The inbox tabs can only be used in the <span class="guilabel"><strong>Inbox</strong></span> folder. If you need additional storage options, use the folder view to create email folders.</p>
-<p role="presentation" class="feat-io-ox-core-categories">Note: The inbox tabs described here can only be used for email messages. Depending on the configuration, you can use separate categories for appointments, contacts and tasks.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Note: The inbox categories described here can only be used for emails message. Depending on the configuration, you can use separate categories for email messages, appointments, contacts and tasks.</p>
 <p role="presentation">Related topics: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a></p></li></ul></p>
 </dd>
 <dt class="feat-io-ox-core-managedResources" id="ox.appsuite.user.reference.about.glossary.managedresource"><span class="glossterm">Managed resource</span></dt>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.alarms.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.alarms.html
index afde8cf53..3daed3231 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.alarms.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.alarms.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.display.html" title="Setting an appointment's display">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Adding participants or resources">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.alarms">
 <div class="titlepage"><div><div><h3 class="title">Using appointment reminders</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.12.2"></a><p id="ox.appsuite.user.concept.calendar.add.alarms">When creating or editing an appointment, you can set to be reminded of the appointment's due date. To do so, you can use one or several of the following notifications: </p>
@@ -64,7 +64,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.alarms">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.alarms">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.attachments.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.attachments.html
index f36e3cde2..3894cfb20 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.attachments.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.attachments.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Adding participants or resources">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Using the schedule view">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Using the scheduling view">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attachments">
 <div class="titlepage"><div><div><h3 class="title">Adding attachments</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.14.2"></a><a class="indexterm" name="id-1.8.10.14.3"></a><p id="ox.appsuite.user.concept.calendar.add.attachments">Depending on the configuration, you can attach files that are saved on your computer or in the <span class="phrase">Drive</span> app.</p>
@@ -65,7 +65,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.attachments">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attachments">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.attendees.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.attendees.html
index c4481cd84..4599f74fb 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.attendees.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Creating a follow-up appointment">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="Inviting E-Mail recipients to new appointments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attendees">
 <div class="titlepage"><div><div><h3 class="title">Inviting participants to a new appointment</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.17.2"></a><p id="ox.appsuite.user.concept.calendar.add.attendees">If an appointment has several participants, you can invite those participants to a new appointment.</p>
@@ -66,11 +66,11 @@
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviting E-Mail recipients to new appointments</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.attendees">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attendees">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.call.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.call.html
index b4f77f21c..342679845 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.call.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.call.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Using the date picker">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Setting recurring appointments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.call">
 <div class="titlepage"><div><div><h3 class="title">Scheduling audio/video conferences</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.9.2"></a><a class="indexterm" name="id-1.8.10.9.3"></a><a class="indexterm" name="id-1.8.10.9.4"></a><a class="indexterm" name="id-1.8.10.9.5"></a><a class="indexterm" name="id-1.8.10.9.6"></a><p id="ox.appsuite.user.precondition.calendar.add.call">Prerequisite: You have set up an account with an audio or video conference provider.</p>
@@ -71,7 +71,7 @@
 <p role="presentation" class="feat-jitsi"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.jitsi">Jitsi meetings</a></p>
 <p role="presentation" class="feat-zoom"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.zoom">Zoom meetings</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.call">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.call">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.conflicthandling.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.conflicthandling.html
index 52f9e032c..a18b8f4dc 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.conflicthandling.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.conflicthandling.html
@@ -1,11 +1,11 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>resolve conflicts</title>
+<title>Resolving conflicts</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Creating appointments from iCal attachments">
 <link rel="next" href="ox.appsuite.user.sect.calendar.invitation.html" title="Responding to Appointment Invitations">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.conflicthandling">
-<div class="titlepage"><div><div><h3 class="title">resolve conflicts</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Resolving conflicts</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.20.2"></a><p id="ox.appsuite.user.concept.calendar.add.conflicthandling">A conflict occurs when the following circumstances coincide: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
@@ -74,7 +74,7 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a>
@@ -82,7 +82,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.create.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.create.html
index f7eb3df89..462d4699a 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.create.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.create.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Using the date picker">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.create">
 <div class="titlepage"><div><div><h3 class="title">Creating new appointments</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.7.2"></a><a class="indexterm" name="id-1.8.10.7.3"></a><div class="task" id="ox.appsuite.user.task.calendar.add.create">
@@ -105,18 +105,18 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creating appointments by using the resource calendar</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviting E-Mail recipients to new appointments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creating appointments from iCal attachments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Inviting contacts to an appointment</a></p>
 <p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.create">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.create">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.datepicker.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.datepicker.html
index cf42ee1f4..219696b14 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.datepicker.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.datepicker.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.create.html" title="Creating new appointments">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.call.html" title="Scheduling audio/video conferences">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.datepicker">
 <div class="titlepage"><div><div><h3 class="title">Using the date picker</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.8.2"></a><p id="ox.appsuite.user.concept.calendar.add.datepicker">The date picker allows you to select the date to be entered in a date field.</p>
@@ -87,7 +87,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Editing Tasks</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.datepicker">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.datepicker">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.display.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.display.html
index f6e1890c9..fb4797286 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.display.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.display.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Setting recurring appointments">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Using appointment reminders">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.display">
 <div class="titlepage"><div><div><h3 class="title">Setting an appointment's display</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.11.2"></a><p id="ox.appsuite.user.concept.calendar.add.display">The following options are available: </p>
@@ -75,7 +75,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">How are appointments displayed in a calendar view? </a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.display">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.display">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.followup.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.followup.html
index a6cb6b45b..8d257218b 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.followup.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.followup.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Using the schedule view">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Using the scheduling view">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Inviting participants to a new appointment">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.followup">
 <div class="titlepage"><div><div><h3 class="title">Creating a follow-up appointment</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.16.2"></a><a class="indexterm" name="id-1.8.10.16.3"></a><p id="ox.appsuite.user.concept.calendar.add.followup">You can create a follow-up appointment for an existing appointment. The follow-up appointment will be pre-filled with essential data from the existing appointment.</p>
@@ -63,11 +63,11 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.followup">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.followup">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.html
index d1fbc5013..76653ba89 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>create appointments</title>
+<title>Creating Appointments</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -36,7 +36,7 @@
     
   </h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.add">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">create appointments</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Creating Appointments</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.calendar.add">Learn how to create an appointment and about the functions available for defining the appointment data: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></p></li>
@@ -47,12 +47,12 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.alarms.html">Using appointment reminders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Adding participants or resources</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attachments.html">Adding attachments</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviting E-Mail recipients to new appointments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creating appointments from iCal attachments</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p></li>
 </ul>
 <p id="ox.appsuite.user.hint.calendar.add">Notes: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.icalattachment.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.icalattachment.html
index 26a1ece32..74d3292ff 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.icalattachment.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.icalattachment.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="Inviting E-Mail recipients to new appointments">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="resolve conflicts">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Resolving conflicts">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.icalattachment">
 <div class="titlepage"><div><div><h3 class="title">Creating appointments from iCal attachments</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.19.2"></a><a class="indexterm" name="id-1.8.10.19.3"></a><p id="ox.appsuite.user.concept.calendar.add.icalattachment">You can create an appointment from an E-Mail's iCal attachment. An iCal attachment can be identified by the file extension .ics.</p>
@@ -54,12 +54,12 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a>
             </p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a>
             </p></li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.participants.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.participants.html
index da30a29e0..df88170d5 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.participants.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.participants.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Using appointment reminders">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Adding attachments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.participants">
 <div class="titlepage"><div><div><h3 class="title">Adding participants or resources</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.13.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.participants">
@@ -67,6 +67,7 @@
 <li class="listitem"><p role="presentation">If external participants accept the appointment, you will receive an email.</p></li>
 </ul>
           <p role="presentation" class="feat-io-ox-core-managedResources">Note: When adding a managed resource, the booking delegate receives a booking request for this resource. As soon as the booking delegate accepts or declines your booking request for the resource, you will be informed.</p>
+          
         </div>
 </div>
 <p id="ox.appsuite.user.tip.calendar.add.participants">Tip: To find free appointments of all participants and resources you can <a class="link" href="ox.appsuite.user.sect.calendar.add.scheduling.html">use the schedule view</a>.</p>
@@ -82,7 +83,7 @@
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.participants">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.participants">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.recipients.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.recipients.html
index 057ce1548..6549c7bad 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.recipients.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.recipients.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Inviting participants to a new appointment">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Creating appointments from iCal attachments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.recipients">
 <div class="titlepage"><div><div><h3 class="title">Inviting E-Mail recipients to new appointments</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.18.2"></a><p id="ox.appsuite.user.concept.calendar.add.recipients">You can invite the recipients of an email sent or received to a new appointment.</p>
@@ -64,16 +64,16 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a>
             </p>
 </li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.recipients">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.recipients">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.scheduling.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.scheduling.html
index b1d6bacf3..ca0798920 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.scheduling.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.scheduling.html
@@ -1,11 +1,11 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Using the schedule view</title>
+<title>Using the scheduling view</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Adding attachments">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Creating a follow-up appointment">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.scheduling">
-<div class="titlepage"><div><div><h3 class="title">Using the schedule view</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Using the scheduling view</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.15.2"></a><a class="indexterm" name="id-1.8.10.15.3"></a><a class="indexterm" name="id-1.8.10.15.4"></a><a class="indexterm" name="id-1.8.10.15.5"></a><p id="ox.appsuite.user.concept.calendar.add.scheduling">When scheduling an appointment with several participants or resources, the Scheduling view shows free and busy time periods for the users and resources.</p>
 <p id="ox.appsuite.user.hint.calendar.add.scheduling">Tip: In the calendar settings, you can define which users are allowed to view your appointments in the scheduling view.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.add.scheduling">
@@ -92,11 +92,11 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy">Show free/busy information to others</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.scheduling">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.scheduling">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.serial.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.serial.html
index c65bd95df..796d83b76 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.serial.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.add.serial.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.call.html" title="Scheduling audio/video conferences">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.display.html" title="Setting an appointment's display">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">create appointments</h2>
+<h2 class="sr-only">Creating Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.serial">
 <div class="titlepage"><div><div><h3 class="title">Setting recurring appointments</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.10.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.serial">
@@ -108,7 +108,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.serial.html">Creating recurring tasks</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.serial">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.serial">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.attachments.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.attachments.html
index 34ca3a75c..739d9ebdd 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.attachments.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Calendar">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.view.appointments.html" title="How are appointments displayed in a calendar view?">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.deputy.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.deputy.html
index 672a0fcbf..4ce39e703 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.deputy.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.deputy.html
@@ -63,12 +63,12 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Email Messages as Deputy</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.deputy">Parent topic: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.create.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.create.html
index 58c1a7513..5fd68d596 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.create.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.create.html
@@ -110,7 +110,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">The <span class="phrase">Calendar</span> detail view</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 <p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creating, Editing or Managing Appointments as Deputy</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p>
 </li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.detailview.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.detailview.html
index f6a9dc9fe..d4d7d1221 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.detailview.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.detailview.html
@@ -65,7 +65,7 @@
 <li class="listitem">
 <p role="presentation">Additional appointment data, if set: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">attachments</p></li>
+<li class="listitem"><p role="presentation">Attachments</p></li>
 <li class="listitem"><p role="presentation">definition</p></li>
 <li class="listitem">
 <p role="presentation">organiser, additional recipients, resources</p>
@@ -103,10 +103,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Displaying contacts in the halo view</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing appointment status</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.detailview">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">The <span class="phrase">Calendar</span> Components</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.foldertree.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.foldertree.html
index f8711df9e..81e56a35e 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.foldertree.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.foldertree.html
@@ -63,7 +63,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Viewing Appointments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">Adding personal calendars</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Using calendar colours</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creating resource calendars and resource calendar groups</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.edit.html">Editing resource calendars</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creating appointments by using the resource calendar</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.list.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.list.html
index 464917f7c..bd29872e9 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.list.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.list.html
@@ -55,11 +55,11 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">The <span class="phrase">Calendar</span> detail view</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Displaying appointments in different views</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.view.html">Displaying resource calendars</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.list">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">The <span class="phrase">Calendar</span> Components</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.new.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.new.html
index 7f3a01a05..412a81262 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.new.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.new.html
@@ -51,10 +51,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.popup.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.popup.html
index 5002c92fc..2a72e50a9 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.popup.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.popup.html
@@ -69,7 +69,7 @@
 <li class="listitem">
 <p role="presentation">Additional appointment data, if set: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">attachments</p></li>
+<li class="listitem"><p role="presentation">Attachments</p></li>
 <li class="listitem"><p role="presentation">definition</p></li>
 <li class="listitem">
 <p role="presentation">organiser, additional recipients, resources</p>
@@ -117,15 +117,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing appointment status</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organiser</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Moving appointments to another calendar</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporting appointments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Printing appointments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Deleting appointments</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Sending an E-Mail to appointment participants</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.popup">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">The <span class="phrase">Calendar</span> Components</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.scheduling.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.scheduling.html
index 1bc3036a5..1418b3f58 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.scheduling.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.scheduling.html
@@ -75,7 +75,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a>
             </p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.toolbar.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.toolbar.html
index 0af69c411..9d0f71b6a 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.toolbar.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.gui.toolbar.html
@@ -74,14 +74,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organiser</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Moving appointments to another calendar</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporting appointments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Printing appointments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Deleting appointments</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.toolbar">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">The <span class="phrase">Calendar</span> Components</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.invitation.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.invitation.html
index e8f53e032..6208ebd02 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.invitation.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.invitation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Calendar">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="resolve conflicts">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Resolving conflicts">
 <link rel="next" href="ox.appsuite.user.sect.calendar.edit.html" title="Editing Appointments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -87,7 +87,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing appointment status</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing the appointment status</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.invitation">Parent topic: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.categories.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.categories.html
new file mode 100644
index 000000000..2e4b6f033
--- /dev/null
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.categories.html
@@ -0,0 +1,106 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Using categories for appointments</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Managing Appointments">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Managing favourite time zones">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Using calendar colours">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Calendar</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Managing Appointments</h2>
+<div class="sect2" id="ox.appsuite.user.sect.calendar.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Using categories for appointments</h3></div></div></div>
+<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><a class="indexterm" name="id-1.8.15.11.4"></a><p id="ox.appsuite.user.concept.calendar.manage.categories">To organise appointments independently from calendars, you can use categories. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">You can mark appointments with categories.</p></li>
+<li class="listitem"><p role="presentation">You can display all appointments that have been marked with a specific category.</p></li>
+</ul>
+<p> You can create, edit or delete your own categories, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>.</p>
+<div class="task" id="ox.appsuite.user.task.calendar.manage.categories">
+<p class="title">How to mark appointments with a category:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Depending on the view, you have the following options: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. Click the <span class="guibutton"><strong>Edit appointment</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in the pop-up.</p></li>
+<li class="listitem"><p role="presentation">Select an appointment in the list view. Click the <span class="guibutton"><strong>Edit appointment</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in the tool bar.</p></li>
+</ul></p>
+<p role="presentation">The appointment editing window opens.</p>
+</li>
+<li class="step">
+<p role="presentation">To do so, click on <span class="guibutton"><strong>Add category</strong></span> next to <span class="guibutton"><strong>Categories</strong></span>. Select a category.</p>
+<p role="presentation">In order to remove a category from the appointment, click the <span class="guibutton"><strong>Remove category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the category.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.calendar.categories.view">
+<p class="title">How to display appointments that have been marked with a specific category:</p>
+<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Depending on the view, you have the following options: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">In a calendar view, click on an appointment that has been marked with a category. In the pop-up, click on the category.</p></li>
+<li class="listitem"><p role="presentation">In the list view, select an appointment that has been marked with a category. Click on the category in the detail view.</p></li>
+</ul></p></li></ul></div>
+<div class="taskrelated">
+          <p>Result: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">The list view shows all appointments that have been marked with this category.</p></li>
+<li class="listitem"><p role="presentation">To display the previous view, click the <span class="guibutton"><strong>Cancel search</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in the search field.</p></li>
+</ul>
+          <p>Tip: You can also use the search function by searching for a category using the search options.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.calendar.manage.categories">
+        </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new email messages</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.calendar.manage.categories">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.changeorganizer.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
index de166158f..8ca20e930 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
@@ -64,8 +64,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changeorganizer"></p>
 <p class="title">User interface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">The <span class="phrase">Calendar</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">The <span class="phrase">Calendar</span> list view</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.changereminder.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.changereminder.html
index 948f23d1d..f9f23e45d 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.changereminder.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.changereminder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Managing Appointments">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="Changing appointment status">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="Changing the appointment status">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Changing the organiser">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -60,9 +60,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changereminder"></p>
 <p class="title">User interface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">The <span class="phrase">Calendar</span> tool bar</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">The <span class="phrase">Calendar</span> detail view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">The <span class="phrase">Calendar</span> list view</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.changestatus.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.changestatus.html
index 0abfdfcc6..d43f6d270 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.changestatus.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.changestatus.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Changing appointment status</title>
+<title>Changing the appointment status</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -37,7 +37,7 @@
   </h1>
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.changestatus">
-<div class="titlepage"><div><div><h3 class="title">Changing appointment status</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Changing the appointment status</h3></div></div></div>
 <a class="indexterm" name="id-1.8.15.7.2"></a><a class="indexterm" name="id-1.8.15.7.3"></a><p id="ox.appsuite.user.concept.calendar.manage.changestatus">You can change your appointment status at a later point of time. You can add a comment that is visible to other participants.</p>
 <p id="ox.appsuite.user.hint.calendar.manage.changestatus">Notes: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -64,6 +64,7 @@
 <p class="title">User interface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">The <span class="phrase">Calendar</span> list view</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">The <span class="phrase">Calendar</span> detail view</a></p>
 </li></ul>
 <p> </p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.colors.html
index c8ec61e71..8627a598d 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.colors.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.colors.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Managing Appointments">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Managing favourite time zones">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Using categories for appointments">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.move.html" title="Moving appointments to another calendar">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.move.html">Next</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.colors">
 <div class="titlepage"><div><div><h3 class="title">Using calendar colours</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">You can define a calendar colour. By default, all appointments in this calendar will be displayed in the colour of the calendar. If you assign an individual colour to an appointment when creating or editing it, the appointment will be displayed in the colour assigned, not in the colour of the calendar.</p>
+<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">You can define a calendar colour. By default, all appointments in this calendar will be displayed in the colour of the calendar. If you assign an individual colour to an appointment when creating or editing it, the appointment will be displayed in the colour assigned, not in the colour of the calendar.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.colors">
 <p class="title">How to select a calendar colour:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,19 +46,15 @@
 <li class="step"><p role="presentation">Select a colour from the colour selection drop down.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.colors">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.colors"></p>
+<p class="title">User interface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">The <span class="phrase">Calendar</span> folder view</a></p></li></ul>
+<p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">How are appointments displayed in a calendar view? </a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">The <span class="phrase">Calendar</span> folder view</a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">The <span class="phrase">Calendar</span> folder view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">How are appointments displayed in a calendar view? </a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.colors">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.delete.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.delete.html
index b9eada30a..8624e6e45 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.delete.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Deleting appointments</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Warning:</strong></span> Deleted appointments <span class="phrase"><strong>cannot</strong></span> be restored. Depending on the configuration, you can only delete an appointment in your private calendars if you are the appointment's organiser.</p>
+<a class="indexterm" name="id-1.8.15.17.2"></a><a class="indexterm" name="id-1.8.15.17.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Warning:</strong></span> Deleted appointments <span class="phrase"><strong>cannot</strong></span> be restored. Depending on the configuration, you can only delete an appointment in your private calendars if you are the appointment's organiser.</p>
 <p id="ox.appsuite.user.concept.calendar.manage.delete">You can delete appointments from a calendar if you have the permission to delete items.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.delete">
 <p class="title">How to delete appointments:</p>
@@ -73,11 +73,14 @@
         </p>
 <p class="title">User interface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">The <span class="phrase">Calendar</span> tool bar</a>
+            </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">The <span class="phrase">Calendar</span> tool bar</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">The <span class="phrase">Calendar</span> list view</a>
             </p>
 </li></ul>
 <p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.export.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.export.html
index ab9c6bac0..39aa5dae8 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.export.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exporting appointments</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">You can export appointments in the iCal format. You can e.g. use this format to exchange appointments with other calendar applications. You can export individual appointments or all appointments from a calendar.</p>
+<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">You can export appointments in the iCal format. You can e.g. use this format to exchange appointments with other calendar applications. You can export individual appointments or all appointments from a calendar.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.manage.export.selected">
 <p class="title">How to export individual appointments:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -65,14 +65,16 @@
 <p id="ox.appsuite.user.related.calendar.manage.export"></p>
 <p class="title">User interface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">The <span class="phrase">Calendar</span> folder view</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">The <span class="phrase">Calendar</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">The <span class="phrase">Calendar</span> list view</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.8.15.14.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.8.15.15.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.manage.export">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.html
index bd4dd3bb5..65de8c609 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Calendar">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.folder.import.html" title="Importing calendars from files">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="Changing appointment status">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="Changing the appointment status">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -39,10 +39,11 @@
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Managing Appointments</h2></div></div></div>
 <a class="indexterm" name="id-1.8.15.2"></a><a class="indexterm" name="id-1.8.15.3"></a><p id="ox.appsuite.user.orientation.calendar.manage">Learn how to organise your appointments and about the appointment actions available. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing appointment status</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing the appointment status</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organiser</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Managing favourite time zones</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Using calendar colours</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Moving appointments to another calendar</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a></p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.import.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.import.html
index 25ba5a86c..92413de5a 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.import.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importing appointments</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><a class="indexterm" name="id-1.8.15.13.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">You can import appointments from files in iCal format.</p>
+<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">You can import appointments from files in iCal format.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.import">
 <p class="title">How to import appointments from an iCal file:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -55,22 +55,16 @@
           <p>Note: All participants of the imported appointments will be removed. Instead, you will be added as participant.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.import"></p>
+<p class="title">User interface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">The <span class="phrase">Calendar</span> folder view</a></p></li></ul>
+<p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporting appointments</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporting appointments</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.import">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.move.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.move.html
index 24bcb4f43..c0dd61eb4 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.move.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.move.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Moving appointments to another calendar</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">You can move single appointments to another calendar, but no appointment series.</p>
+<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">You can move single appointments to another calendar, but no appointment series.</p>
 <p>Prerequisite: You need to have the appropriate permissions to create objects in the target calendar.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.move">
 <p class="title">How to move appointments to another calendar:</p>
@@ -57,8 +57,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.move"></p>
 <p class="title">User interface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">The <span class="phrase">Calendar</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">The <span class="phrase">Calendar</span> list view</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.print.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.print.html
index 39a632284..007057ed3 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.print.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Printing appointments</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><a class="indexterm" name="id-1.8.15.15.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">To print calendars and appointments you can: </p>
+<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><a class="indexterm" name="id-1.8.15.16.4"></a><a class="indexterm" name="id-1.8.15.16.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">To print calendars and appointments you can: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">print a calendar sheet with appointments</p></li>
 <li class="listitem"><p role="presentation">print an appointment's data</p></li>
@@ -89,14 +89,20 @@
 <p class="title">User interface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">The <span class="phrase">Calendar</span> settings menu</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">The <span class="phrase">Calendar</span> settings menu</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">The <span class="phrase">Calendar</span> folder view</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">The <span class="phrase">Calendar</span> tool bar</a>
             </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">The <span class="phrase">Calendar</span> list view</a>
+            </p>
 </li></ul>
 <p>
       </p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.timezones.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.timezones.html
index 9703bf402..02c89a7db 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.timezones.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.manage.timezones.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Managing Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Changing the organiser">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Using calendar colours">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Using categories for appointments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.search.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.search.html
index 9e2454ceb..0c7de6bd9 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.search.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.search.html
@@ -89,7 +89,7 @@
             <a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Displaying appointments in different views</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.settings.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.settings.html
index 4ad928945..b057e3386 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.settings.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.settings.html
@@ -103,7 +103,7 @@
 <p id="ox.appsuite.user.reference.calendar.settings.jitsi"></p>
 <h3 class="title">Jitsi meetings</h3>
 <p><a class="indexterm" name="id-1.8.22.9.2"></a>With these options, you can define the behaviour if you select <span class="guibutton"><strong>Jitsi Meeting</strong></span> in the <span class="guibutton"><strong>Conference</strong></span> drop-down when creating appointments. </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>Automatically copy link to location. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Defines whether the link for the Jitsi meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>automatically copy link to location. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Defines whether the link for the Jitsi meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li></ul>
 <p> See <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Scheduling audio/video conferences</a></p>
 </div>
 <div id="ox.appsuite.user.reference.calendar.settings.zoom" class="feat-zoom">
@@ -115,8 +115,8 @@
 <p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments"><b>Appointments. </b></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.password"><b>Always add a random meeting password. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.1.1.2"></a>Defines whether the conference will be secured by an automatically created password.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>Automatically copy link to location. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Defines whether the link for participating in the Zoom meeting will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>Copy dial-in information to description. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Defines whether the link for participating in the Zoom meeting will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>automatically copy link to location. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Defines whether the link for participating in the Zoom meeting will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>copy dial-in information to description. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Defines whether the link for participating in the Zoom meeting will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li>
 </ul>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.dialinnumber"><b>Dial-in numbers. </b>If you at least have a Zoom Pro account, Zoom offers dial-in numbers for different countries. To define the countries to be displayed in appointment invitations, click on <span class="guibutton"><strong>Open Zoom profile</strong></span>.</p></li>
@@ -128,8 +128,8 @@
 <p><a class="indexterm" name="id-1.8.22.11.2"></a>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>show birthday calendar. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Defines whether a birthday calendar is displayed in the folder view.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>show reminders for past appointments. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Defines whether appointment reminders are displayed for past appointments.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>Show birthday calendar. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Defines whether a birthday calendar is displayed in the folder view.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>Show reminders for past appointments. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Defines whether appointment reminders are displayed for past appointments.</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.calendar.settings.advanced.emailchanges"><b>Automatically apply appointment changes received via email to your calendar. </b><a class="indexterm" name="id-1.8.22.11.3.1.3.1.2"></a>Defines in which cases appointment invitations by external contacts will be automatically added to your calendar. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -138,12 +138,12 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Always</strong></span>. The appointment change will always be automatically added to your calendar.</p></li>
 </ul>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy"><b>Show free/busy information to others. </b><a class="indexterm" name="id-1.8.22.11.3.1.4.1.2"></a>Defines which users can view your appointments in the scheduling view. Also see <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy"><b>Show free/busy information to others. </b><a class="indexterm" name="id-1.8.22.11.3.1.4.1.2"></a>Defines which users can view your appointments in the scheduling view. Also see <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.usedforsync"><b>Subscribe to shared calendars. </b><a class="indexterm" name="id-1.8.22.11.3.1.5.1.2"></a>See <a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a></p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.declined"><b>Show declined appointments. </b><a class="indexterm" name="id-1.8.22.11.3.1.6.1.2"></a>Defines whether appointments that you declined are displayed. See <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.participantsedit"><b>Always mark “Participants can edit appointments” when creating or editing appointments. </b><a class="indexterm" name="id-1.8.22.11.3.1.7.1.2"></a>Defines whether participants by default get the permission to edit an appointment.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.wholeday"><b>Automatically mark all day appointments as “free” when creating or editing appointments. </b><a class="indexterm" name="id-1.8.22.11.3.1.8.1.2"></a>Defines whether all day appointments are displayed as free by default.</p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>use first category colour for appointments. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Defines whether appointments to which you have assigned a category are displayed in the colour of that category. When assigning multiple categories to an appointment, the colour of the initially assigned category will be used. See <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>Use first category colour for appointments. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Defines whether appointments to which you have assigned a category are displayed in the colour of that category. When assigning multiple categories to an appointment, the colour of the initially assigned category will be used. See <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
 </ul>
 <p>
       </p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.appointments.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.appointments.html
index bf97b4456..246aaec26 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.appointments.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.appointments.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Viewing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.appointments">
 <div class="titlepage"><div><div><h3 class="title">How are appointments displayed in a calendar view? </h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.9.2"></a><a class="indexterm" name="id-1.8.8.9.3"></a><a class="indexterm" name="id-1.8.8.9.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">The following appointment properties define an appointment’s display in the calendar view: </p>
+<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><a class="indexterm" name="id-1.8.8.8.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">The following appointment properties define an appointment’s display in the calendar view: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">The appointment colour</p>
@@ -67,7 +67,7 @@
 <p role="presentation">An appointment that you have declined will be displayed in grey. The subject will be preceded by the <span class="guibutton"><strong>Declined</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.declined"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span> icon. The subject is crossed out.</p>
 <p role="presentation">In the calendar settings, you can define whether declined appointments will be displayed.</p>
 </li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.6.2.1.6"><p role="presentation">An appointment that has been declined by all other participants will be marked with the <span class="guibutton"><strong>All declined</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span> icon.</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.6.2.1.6"><p role="presentation">An appointment that has been declined by all other participants will be marked with the <span class="guibutton"><strong>All declined</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span> icon.</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.view.appointments.private"></p>
 <h4 class="title">Private appointment display</h4>
@@ -94,7 +94,7 @@
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.secret"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span>secret appointment</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.unconfirmed"><object type="image/svg+xml" data="../../images/question-circle.svg" height="15"></object></span>unconfirmed appointment</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.rejected"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>declined appointment</p></li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>appointment declined by all other participants</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>appointment declined by all other participants</p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.view.appointments">
         </p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.html
index 2499d6c70..31951825a 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.html
@@ -43,14 +43,6 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.timezones.html">Displaying multiple time zones</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">How are appointments displayed in a calendar view? </a></p></li>
 </ul>
-<p id="ox.appsuite.user.related.calendar.view">
-      </p>
-<p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">The <span class="phrase">Calendar</span> folder view</a>
-          </p></li></ul>
-<p>
-    </p>
 <p id="ox.appsuite.user.parent.calendar.view">Parent topic: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
     <span class="phrase">Calendar</span>
     
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.timezones.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.timezones.html
index c4db34939..95a6bcb57 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.timezones.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.timezones.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Viewing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.timezones">
 <div class="titlepage"><div><div><h3 class="title">Displaying multiple time zones</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">In addition to the default time zone, you can display time zones that you have added to favourites. The default time zone can be changed in the basic settings.</p>
+<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">In addition to the default time zone, you can display time zones that you have added to favourites. The default time zone can be changed in the basic settings.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.timezones">
 <p class="title">How to display multiple time zones in a calendar view:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.views.html b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.views.html
index 10ca6a14c..7a1f625c2 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.views.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.calendar.view.views.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Viewing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.views">
 <div class="titlepage"><div><div><h3 class="title">Displaying appointments in different views</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><a class="indexterm" name="id-1.8.8.7.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Learn how to display the appointments of a calendar or several calendars in different views:</p>
+<a class="indexterm" name="id-1.8.8.6.2"></a><a class="indexterm" name="id-1.8.8.6.3"></a><a class="indexterm" name="id-1.8.8.6.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Learn how to display the appointments of a calendar or several calendars in different views:</p>
 <div class="task" id="ox.appsuite.user.task.calendar.view.views">
 <p class="title">How to view an appointment:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.create.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.create.html
index d5713b4f5..ae7a68dd9 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.create.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.create.html
@@ -49,8 +49,8 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">A contact picture, if uploaded. Click on the contact picture to edit it or to upload a new contact picture.</p>
-<p role="presentation">Last name, first name</p>
-<p role="presentation">If entered: title, business information, residence</p>
+<p role="presentation">last name, first name</p>
+<p role="presentation">if entered: title, business information, residence</p>
 </li>
 <li class="listitem">
 <p role="presentation">Personal info </p>
@@ -87,13 +87,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">The editing window</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">The <span class="phrase">Address Book</span> detail view</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creating a new contact</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Adding Contacts</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Editing Contacts or Distribution Lists</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.create">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">The <span class="phrase">Address Book</span> Components</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.detailview.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.detailview.html
index 3f6f2d230..8a27436ce 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.detailview.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.detailview.html
@@ -44,17 +44,17 @@
 <p class="title">Content</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">A contact picture, if uploaded</p>
-<p role="presentation">Last name, first name</p>
-<p role="presentation">If entered: title, business information, residence</p>
+<p role="presentation">a contact picture, if uploaded</p>
+<p role="presentation">last name, first name</p>
+<p role="presentation">if entered: title, business information, residence</p>
 </li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.7.11.4.1.3">
-<p role="presentation">The categories assigned</p>
+<p role="presentation">the categories assigned</p>
 <p role="presentation">Clicking a category searches for contacts assigned to that category.</p>
 </li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.4"><p role="presentation">Depending on the configuration: the contact's current availability for calls</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.5">
-<p role="presentation">Depending on the configuration: Icons for communicating with the contact: </p>
+<p role="presentation">Depending on the configuration: icons for communicating with the contact: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Email</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.detailview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>. Opens the window for composing an email.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Call</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.detailview.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>. Opens a menu with functions for calling.</p></li>
@@ -82,7 +82,7 @@
 </li>
 <li class="listitem"><p role="presentation">A note</p></li>
 <li class="listitem"><p role="presentation">Maximum 18 optional user fields</p></li>
-<li class="listitem"><p role="presentation">attachments</p></li>
+<li class="listitem"><p role="presentation">Attachments</p></li>
 </ul>
 </li>
 </ul>
@@ -95,15 +95,11 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">The <span class="phrase">Address Book</span> list view</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.create.html">The contact editing window</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Displaying an address book’s contacts</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.attachments.html">Viewing or Saving Contact Attachments</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Calling Contacts</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.detailview">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">The <span class="phrase">Address Book</span> Components</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.foldertree.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.foldertree.html
index 5d050d916..944068dcb 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.foldertree.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.foldertree.html
@@ -60,6 +60,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Displaying an address book’s contacts</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Books</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Managing Data with Folders</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.list.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.list.html
index 16f48f5e2..d39ceb2bb 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.list.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.list.html
@@ -51,8 +51,8 @@
 <p role="presentation">The following details are displayed for each contact: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">a picture if uploaded</p></li>
-<li class="listitem"><p role="presentation">Last name, first name</p></li>
-<li class="listitem"><p role="presentation">Business data, if entered</p></li>
+<li class="listitem"><p role="presentation">last name, first name</p></li>
+<li class="listitem"><p role="presentation">business data, if entered</p></li>
 </ul>
 <p role="presentation">Names that start with a figure or a special character are displayed below <span class="guibutton"><strong>#</strong></span> at the top of the list view. Names that start with a special sign are displayed below <span class="guibutton"><strong>Ω</strong></span> at the bottom of the list view.</p>
 </li>
@@ -64,11 +64,8 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.settingsmenu.html">The <span class="phrase">Address Book</span> settings menu</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">The <span class="phrase">Address Book</span> detail view</a></p>
-</li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Displaying an address book’s contacts</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.list">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">The <span class="phrase">Address Book</span> Components</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.new.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.new.html
index 9b6947558..7949b4d99 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.new.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.new.html
@@ -41,7 +41,7 @@
 <a class="indexterm" name="id-1.9.7.6.2"></a><p id="ox.appsuite.user.concept.contacts.gui.new">Creates a new contact. If clicking the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>, a menu with additional functions opens: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">new distribution list</p></li>
-<li class="listitem"><p role="presentation">Subscribe to shared or other address books</p></li>
+<li class="listitem"><p role="presentation">subscribe to shared or other address books</p></li>
 <li class="listitem"><p role="presentation">new email, new appointment, new contact</p></li>
 </ul>
 <p id="ox.appsuite.user.hint.contacts.gui.new">Note: If the folder is closed, the button will be displayed as an icon. In this case, the <span class="guibutton"><strong>More actions</strong></span> icon will not be available. To show the folder view, click the <span class="guibutton"><strong>Open folder view</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.open"><object type="image/svg+xml" data="../../images/layout-split.svg" height="15"></object></span> on the bottom left side.</p>
@@ -51,7 +51,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creating a new contact</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Adding Contacts</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">Creating new distribution lists</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Subscribing to external address books</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Subscribing to public and shared address books</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.settingsmenu.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
index c60fe5730..a07ddbd5f 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
@@ -43,7 +43,7 @@
 <li class="listitem"><p role="presentation">Adjust all settings</p></li>
 <li class="listitem"><p role="presentation">Select a theme for the user interface</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>List options</strong></span>. Defines whether contact images, checkboxes or none of these elements will be displayed in the list view.</p></li>
-<li class="listitem"><p role="presentation">Subscribe to shared or other address books</p></li>
+<li class="listitem"><p role="presentation">subscribe to shared or other address books</p></li>
 <li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Connect your Device</strong></span>. Launches a wizard for setting up local apps with which you can access your groupware data.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.contacts.gui.settingsmenu"></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.toolbar.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.toolbar.html
index 30e43c8b3..e177eac9e 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.toolbar.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.gui.toolbar.html
@@ -62,13 +62,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Editing Contacts or Distribution Lists</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Sending Email Messages from within an address book</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Inviting contacts to an appointment</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Moving or copying contacts</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exporting contacts</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.print.html">Printing contacts</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.delete.html">Deleting contacts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.toolbar">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">The <span class="phrase">Address Book</span> Components</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.categories.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.categories.html
new file mode 100644
index 000000000..4a1069147
--- /dev/null
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Using categories for contacts</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Managing Contacts">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Inviting contacts to an appointment">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Moving or copying contacts">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Address Book</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Managing Contacts</h2>
+<div class="sect2" id="ox.appsuite.user.sect.contacts.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Using categories for contacts</h3></div></div></div>
+<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><p id="ox.appsuite.user.concept.contacts.manage.categories">To organise contacts independently from folders, you can use categories. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">You can mark contacts with categories.</p></li>
+<li class="listitem"><p role="presentation">You can display all contacts that have been marked with a specific category.</p></li>
+</ul>
+<p> You can create, edit or delete your own categories, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>.</p>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories">
+<p class="title">How to mark contacts with a category:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Select a contact. Click the <span class="guibutton"><strong>Edit contact</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in the tool bar.</p>
+<p role="presentation">The contact editing window opens.</p>
+</li>
+<li class="step">
+<p role="presentation">To do so, click on <span class="guibutton"><strong>Add category</strong></span> next to <span class="guibutton"><strong>Categories</strong></span>. Select a category.</p>
+<p role="presentation">In order to remove a category from the contact, click the <span class="guibutton"><strong>Remove category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the category.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories.view">
+<p class="title">How to display contacts that have been marked with a specific category:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Select a contact that has been marked with a category.</p></li>
+<li class="step"><p role="presentation">Click on the category in the detail view.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Result: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">The list view shows all contacts that have been marked with this category. </p></li>
+<li class="listitem"><p role="presentation">To display the previous list, click the <span class="guibutton"><strong>Cancel search</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in the search field.</p></li>
+</ul>
+          <p>Tip: You can also use the search function by searching for a category using the search options.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.contacts.manage.categories">
+        </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Searching for Contacts</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new email messages</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.contacts.manage.categories">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.delete.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.delete.html
index 9c238661f..f1df3f8a5 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.delete.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Deleting contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Warning:</strong></span> Deleted contacts and distribution lists <span class="phrase"><strong>cannot</strong></span> be restored.</p>
+<a class="indexterm" name="id-1.9.17.15.2"></a><a class="indexterm" name="id-1.9.17.15.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Warning:</strong></span> Deleted contacts and distribution lists <span class="phrase"><strong>cannot</strong></span> be restored.</p>
 <p id="ox.appsuite.user.concept.contacts.manage.delete">You can delete contacts or distribution lists from an address book if you have the permission to delete items from this address book. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">You cannot delete contacts from the <span class="guibutton"><strong>All users</strong></span> address book.</p></li>
@@ -55,9 +55,14 @@
 <p id="ox.appsuite.user.related.contacts.manage.delete">
         </p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">The <span class="phrase">Address Book</span> tool bar</a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">The <span class="phrase">Address Book</span> list view</a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.delete">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.export.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.export.html
index b52cabb51..116ffd144 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.export.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exporting contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">You can export contacts or distribution lists to these formats: </p>
+<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><a class="indexterm" name="id-1.9.17.13.4"></a><a class="indexterm" name="id-1.9.17.13.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">You can export contacts or distribution lists to these formats: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">vCard. You can e.g. use this format to exchange contacts with other email applications.</p></li>
 <li class="listitem"><p role="presentation">CSV You can use this format to export contacts to spreadsheet formats.</p></li>
@@ -76,7 +76,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.export"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">The <span class="phrase">Address Book</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">The <span class="phrase">Address Book</span> folder view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">The <span class="phrase">Address Book</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">The <span class="phrase">Address Book</span> list view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -84,7 +88,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.9.17.12.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.9.17.13.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.export">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.html
index 125fff02b..83f9b9465 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem cap-webmail" id="id-1.9.17.4.1.1"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Sending Email Messages from within an address book</a></p></li>
 <li class="listitem cap-calendar" id="id-1.9.17.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Inviting contacts to an appointment</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Moving or copying contacts</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a></p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.import.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.import.html
index 7b03352eb..3df51bd55 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.import.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importing contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><a class="indexterm" name="id-1.9.17.11.5"></a><a class="indexterm" name="id-1.9.17.11.6"></a><a class="indexterm" name="id-1.9.17.11.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">You can import contacts from files that have the following formats: </p>
+<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><a class="indexterm" name="id-1.9.17.12.6"></a><a class="indexterm" name="id-1.9.17.12.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">You can import contacts from files that have the following formats: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">vCard. Notes: </p>
@@ -71,19 +71,15 @@
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Import</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.contacts.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.contacts.manage.import"></p>
+<p class="title">User interface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">The <span class="phrase">Address Book</span> folder view</a></p></li></ul>
+<p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exporting contacts</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Adding Contacts</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exporting contacts</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Adding Contacts</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.contacts.manage.import">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.inviteappointment.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
index 1ee1925e9..57f0ac9cb 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Managing Contacts">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.manage.sendmail.html" title="Sending Email Messages from within an address book">
-<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Moving or copying contacts">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Using categories for contacts">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -53,7 +53,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.inviteappointment"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">The <span class="phrase">Address Book</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">The <span class="phrase">Address Book</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">The <span class="phrase">Address Book</span> list view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">The <span class="phrase">Address Book</span> detail view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></p></li></ul>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.movecopy.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.movecopy.html
index 858a646e3..936c8b0c8 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.movecopy.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.movecopy.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Managing Contacts">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Inviting contacts to an appointment">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Using categories for contacts">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html" title="Sending contacts as vCard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Next</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.movecopy">
 <div class="titlepage"><div><div><h3 class="title">Moving or copying contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><a class="indexterm" name="id-1.9.17.9.4"></a><a class="indexterm" name="id-1.9.17.9.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">You can move or copy contacts or distribution lists to another address book.</p>
+<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><a class="indexterm" name="id-1.9.17.10.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">You can move or copy contacts or distribution lists to another address book.</p>
 <p id="ox.appsuite.user.hints.contacts.manage.movecopy">Notes: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">You cannot move or copy contacts or distribution lists to the <span class="guibutton"><strong>All users</strong></span> address book.</p></li>
@@ -61,7 +61,10 @@
 <p id="ox.appsuite.user.tip.contacts.manage.movecopy">Tip: You can also move the selected objects by dragging the objects from the folder view to an address book.</p>
 <p id="ox.appsuite.user.related.contacts.manage.movecopy"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">The <span class="phrase">Address Book</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">The <span class="phrase">Address Book</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">The <span class="phrase">Address Book</span> list view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.personal.html">Adding personal address books</a></p></li></ul>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.print.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.print.html
index 568b05966..34a5ce338 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.print.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Printing contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">You can print the data of a single contact or of multiple contacts. You can select between different print layouts.</p>
+<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">You can print the data of a single contact or of multiple contacts. You can select between different print layouts.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.print.list">
 <p class="title">How to print a contact's data:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,9 +54,17 @@
 <p id="ox.appsuite.user.related.contacts.manage.print">
         </p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">The <span class="phrase">Address Book</span> folder view</a>
+            </p>
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">The <span class="phrase">Address Book</span> tool bar</a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">The <span class="phrase">Address Book</span> list view</a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.print">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.sendmail.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.sendmail.html
index 532367115..10775659f 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.sendmail.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.sendmail.html
@@ -53,10 +53,14 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendmail"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">The <span class="phrase">Address Book</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">The <span class="phrase">Address Book</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">The <span class="phrase">Address Book</span> list view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">The <span class="phrase">Address Book</span> detail view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p></li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendmail">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.sendvcard.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.sendvcard.html
index 8a277a070..4e7bdac86 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.sendvcard.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.manage.sendvcard.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.sendvcard">
 <div class="titlepage"><div><div><h3 class="title">Sending contacts as vCard</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">You can send contacts or distribution lists as vCard attachment to an E-Mail.</p>
+<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">You can send contacts or distribution lists as vCard attachment to an E-Mail.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.sendvcard">
 <p class="title">How to send a contact as a vCard attachment:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,12 +49,15 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendvcard"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">The <span class="phrase">Address Book</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">The <span class="phrase">Address Book</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">The <span class="phrase">Address Book</span> list view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exporting contacts</a></p></li>
-<li class="listitem cap-webmail" id="id-1.9.17.10.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li>
+<li class="listitem cap-webmail" id="id-1.9.17.11.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendvcard">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.search.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.search.html
index 06c84f6b9..8396b4912 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.search.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Displaying an address book’s contacts</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.settings.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.settings.html
index 949af9944..73f969c1c 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.settings.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.settings.html
@@ -60,7 +60,7 @@
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>names. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a>
+<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>Names. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Specifies the order in which a contact's first name and surname are displayed in the address book.</p></li></ul>
 <p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.useaddressbook.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.useaddressbook.html
index c1eda7ba9..7f81c975d 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.useaddressbook.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.useaddressbook.html
@@ -70,9 +70,9 @@
 <p> </p>
 <p class="title">Superordinate actions:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Adding participants or resources</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Creating managed resources</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">Creating new distribution lists</a></p>
 <p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.add.participants.html">Adding participants to a task</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.useaddressdirectory.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.useaddressdirectory.html
index 21b6d6a2b..1cd5c6bbb 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.useaddressdirectory.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.useaddressdirectory.html
@@ -77,9 +77,9 @@
 <p id="ox.appsuite.user.related.contacts.useaddressdirectory"></p>
 <p class="title">Superordinate actions:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Adding participants or resources</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Creating managed resources</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">Creating new distribution lists</a></p>
 <p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.add.participants.html">Adding participants to a task</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.view.haloview.html b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.view.haloview.html
index d51b80440..df2d6914f 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.contacts.view.haloview.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.contacts.view.haloview.html
@@ -48,11 +48,11 @@
 <li class="listitem"><p role="presentation">Select an appointment or a task in the <span class="phrase">Calendar</span> or <span class="phrase">Tasks</span> app. Click on a participant in the detail view or in the pop-up.</p></li>
 </ul></p>
 <p role="presentation">Depending on the contact's entries in the address book, this data will be displayed in a pop-up: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">A picture if uploaded</p></li>
-<li class="listitem"><p role="presentation">Last name, first name</p></li>
-<li class="listitem"><p role="presentation">Business data, if entered</p></li>
+<li class="listitem"><p role="presentation">a picture if uploaded</p></li>
+<li class="listitem"><p role="presentation">last name, first name</p></li>
+<li class="listitem"><p role="presentation">business data, if entered</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.4"><p role="presentation">Depending on the configuration: the contact's current availability for calls</p></li>
-<li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">Depending on the configuration: Icons for communicating with the contact: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">Depending on the configuration: icons for communicating with the contact: <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Email</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>. Opens the window for composing an email.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Call</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>. Opens a menu with functions for calling.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Invite</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.invite"><object type="image/svg+xml" data="../../images/calendar-plus.svg" height="15"></object></span>. Opens the window for creating an appointment.</p></li>
@@ -62,7 +62,7 @@
 <li class="listitem"><p role="presentation">E-Mail addresses. If clicking on an E-Mail address, the page for sending a new E-Mail is displayed.</p></li>
 <li class="listitem"><p role="presentation">Business and private phone numbers. If clicking on a number, a function for making a call opens, if available.</p></li>
 <li class="listitem"><p role="presentation">Business and private addresses. In the address book settings, you can define whether a map service for displaying the address should be used when clicking on an address.</p></li>
-<li class="listitem"><p role="presentation">attachments</p></li>
+<li class="listitem"><p role="presentation">Attachments</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">The address book in which the contact is saved</p></li>
 <li class="listitem"><p role="presentation">Your recent conversations with this contact If clicking on an E-Mail, its content will be displayed in a pop-up.</p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.accounts.edit.html b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
index 6a957087f..9d198d512 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
@@ -94,7 +94,7 @@
               <a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a>
             </p>
 <p role="presentation" class="cap-webmail">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a>
+              <a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">select a sender address</a>
             </p>
 <p role="presentation" class="cap-infostore">
               <a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Adding Storage Accounts</a>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
index 6eeac8478..3ef6d03a7 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
@@ -64,7 +64,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">select a sender address</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.accounts.functionalmail">Parent topic: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Managing Accounts</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.categories.html b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.categories.html
index 4128d8bcd..711ef1b43 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.categories.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.categories.html
@@ -32,15 +32,15 @@
   <h1 class="sr-only">Data Organisation and Shares</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.categories">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Managing Categories</h2></div></div></div>
-<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Learn how to manage <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categories</a> that allow you to classify appointments, contacts and tasks. Categories have the following properties: </p>
+<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Learn how to manage <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categories</a> that allow you to organise email messages, appointments, contacts and tasks across apps, independently from the folder structure. You e.g. can use your own category for a specific project or customer. Categories have the following properties: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">A category consists of a name and a colour.</p></li>
 <li class="listitem"><p role="presentation">When searching for objects, you can use categories as search terms.</p></li>
 <li class="listitem"><p role="presentation">Depending on the configuration, specific categories are predefined. Such categories can neither be edited nor deleted.</p></li>
 <li class="listitem"><p role="presentation">You can create, edit and delete your own categories.</p></li>
-<li class="listitem"><p role="presentation">You can assign a category or several categories to appointments, contacts and tasks and delete them later.</p></li>
+<li class="listitem"><p role="presentation">You can assign a category or several categories to email messages, appointments, contacts and tasks and delete them later.</p></li>
 </ul>
-<p> Note: Those categories cannot be used for email messages. For email messages, there are the inbox categories, see <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a>.</p>
+<p> Note: For email messages, you can also use inbox tabs. A specific inbox category can be assigned to an email. The category depends on the sender, see <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a>.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.categories">The following options are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">create your own category</p></li>
@@ -51,9 +51,15 @@
 <p class="title">How to manage your categories:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step help-hide-inline">
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> on the right side of the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>. The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Basic</strong></span> in the left pane. Click on <span class="guibutton"><strong>Manage categories</strong></span> below <span class="guibutton"><strong>Advanced settings</strong></span>.</p>
+<p role="presentation">You can also use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Select an email. Click the <span class="guibutton"><strong>Add category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> in the tool bar. Select <span class="guibutton"><strong>Manage categories</strong></span>.</p></li>
+<li class="listitem">
 <p role="presentation">Open the editing window for appointments, contacts or tasks by creating or editing an appointment, a contact or a task.</p>
 <p role="presentation">To do so, click on <span class="guibutton"><strong>Add category</strong></span> next to <span class="guibutton"><strong>Categories</strong></span>. Select <span class="guibutton"><strong>Manage categories</strong></span>.</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">You can also use the <span class="guibutton"><strong>Manage categories</strong></span> button in the general settings below <span class="guibutton"><strong>Advanced settings</strong></span>.</p></li></ul>
+</li>
+</ul></p>
 <p role="presentation">The <span class="guilabel"><strong>Manage categories</strong></span> window opens.</p>
 </li>
 <li class="step">
@@ -69,41 +75,22 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creating a new contact</a>
+<p role="presentation" class="cap-webmail">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new email messages</a>
           </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Creating new tasks</a>
-          </p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a>
           </p>
 <p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Editing Contacts or Distribution Lists</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a>
           </p>
 <p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Editing Tasks</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
           </p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Searching for Contacts</a>
-          </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Searching for Tasks</a>
-          </p>
-</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.deputy.add.html b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.deputy.add.html
index f52c211b7..75d11d335 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.deputy.add.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.deputy.add.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Managing Deputies">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Managing Deputies">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="manage deputies">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="manage deputies">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html" title="Viewing, editing, deleting deputies">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Data Organisation and Shares</h1>
-<h2 class="sr-only">Managing Deputies</h2>
+<h2 class="sr-only">manage deputies</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.add">
 <div class="titlepage"><div><div><h3 class="title">Adding deputies</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.8.2"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.add">The following options are available: </p>
@@ -86,7 +86,7 @@
             </p></li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Parent topic: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Parent topic: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.deputy.edit.html b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
index 8dfb0cf8b..877395366 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Managing Deputies">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="manage deputies">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.add.html" title="Adding deputies">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.accounts.html" title="Managing Accounts">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Data Organisation and Shares</h1>
-<h2 class="sr-only">Managing Deputies</h2>
+<h2 class="sr-only">manage deputies</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.edit">
 <div class="titlepage"><div><div><h3 class="title">Viewing, editing, deleting deputies</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.9.2"></a><a class="indexterm" name="id-1.12.6.9.3"></a><a class="indexterm" name="id-1.12.6.9.4"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.edit">The following options are available: </p>
@@ -81,7 +81,7 @@
             </p></li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Parent topic: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Parent topic: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.deputy.html b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.deputy.html
index 542e4dedc..46b324767 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.deputy.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.deputy.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Managing Deputies</title>
+<title>manage deputies</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Data Organisation and Shares</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.deputy">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Managing Deputies</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">manage deputies</h2></div></div></div>
 <a class="indexterm" name="id-1.12.6.2"></a><a class="indexterm" name="id-1.12.6.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.deputy">You can appoint other users to act as your <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">deputy</a>. You can grant one or multiple deputies different permission levels to handle the email communication and appointment scheduling in your name.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.deputy">The following options are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.sharing.examples.html b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
index 5ce5bfae0..5a18034af 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.dataorganisation.sharing.html" title="Sharing Data">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html" title="Which permissions can be used?">
-<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Managing Deputies">
+<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="manage deputies">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.sharing.share.html b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.sharing.share.html
index 8af51fdc4..83c8193a3 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.sharing.share.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.dataorganisation.sharing.share.html
@@ -37,7 +37,7 @@
 <p class="title">The following options are available:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Email folders </p>
+<p role="presentation">email folders </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">The <span class="guibutton"><strong>Inbox</strong></span> folder as well as all folders and subfolders in <span class="guibutton"><strong>My folders</strong></span> can be shared with internal users with read permissions.</p>
@@ -48,7 +48,7 @@
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">calendar </p>
+<p role="presentation">Calendar </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">The folders in <span class="guibutton"><strong>My calendars</strong></span> can be shared with internal users with read or edit permissions.</p></li>
 <li class="listitem"><p role="presentation">The <span class="guibutton"><strong>My calendars</strong></span> folder cannot be shared.</p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.content.html b/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.content.html
index 5147b8f7b..4bba6cd75 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.content.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.content.html
@@ -74,6 +74,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Viewing <span class="phrase">Drive</span> folder contents</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Displaying a file's content</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organising Files and <span class="phrase">Drive</span> Folders</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Managing Data with Folders</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.foldertree.html b/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.foldertree.html
index 5fe521498..8cabf90c3 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.foldertree.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.foldertree.html
@@ -71,6 +71,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">Drive</span>: creating folders</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">Subscribing to public and shared <span class="phrase">Drive</span> folders</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organising Files and <span class="phrase">Drive</span> Folders</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Managing Data with Folders</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.toolbar.html b/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.toolbar.html
index 85907840f..b7bf86d01 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.toolbar.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.toolbar.html
@@ -74,20 +74,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Viewing <span class="phrase">Drive</span> folder contents</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Displaying a file's content</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.send.html">Sending files as email attachments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Editing file names</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creating or editing descriptions</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.move.html">Moving files or <span class="phrase">Drive</span> folders</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.copy.html">Copying files</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Saving files as PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Printing files as PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.addportal.html">Adding files to the portal</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.favorite.html">Adding files or <span class="phrase">Drive</span> folders to Favourites</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.delete.html">Deleting files or <span class="phrase">Drive</span> folders</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.lock.html">Locking or unlocking files</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Working with versions</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organising Files and <span class="phrase">Drive</span> Folders</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Encrypting or Decrypting Files</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.toolbar">Parent topic: <a class="xref" href="ox.appsuite.user.sect.drive.gui.html">The <span class="phrase">Drive</span> Components</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.viewer.html b/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.viewer.html
index 6e5ea40d6..9e7a5be92 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.viewer.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.drive.gui.viewer.html
@@ -105,23 +105,9 @@
               <a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">Holding a presentation</a>
             </p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Editing file names</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creating or editing descriptions</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Saving files as PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Printing files as PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Working with versions</a>
-            </p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organising Files and <span class="phrase">Drive</span> Folders</a>
+            </p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-share_links cap-share_mail_attachments">
               <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a>
             </p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.drive.settings.html b/help/l10n/en_GB/ox.appsuite.user.sect.drive.settings.html
index 817123e99..98f9f4d83 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.drive.settings.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.drive.settings.html
@@ -51,13 +51,13 @@
 </div>
 <p id="ox.appsuite.user.reference.drive.settings">Depending on the configuration, the following settings are available:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">add files</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">Add files</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.versionhistory">Version history</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.advanced">Advanced settings</a></p></li>
 </ul>
 <p>Also see: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p>
 <p id="ox.appsuite.user.reference.drive.settings.adddrive"></p>
-<h3 class="title">add files</h3>
+<h3 class="title">Add files</h3>
 <p><a class="indexterm" name="id-1.11.17.6.2"></a>Defines whether a new file or a new version of a possibly existing file with the same name should be created. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><b>Add new version. </b>A new version of the file will be created.</p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.accounts.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.accounts.html
index 86ef24e9b..317d15f5d 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.accounts.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.accounts.html
@@ -76,7 +76,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">select a sender address</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Setting reply-to address</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.attachments.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.attachments.html
index b56480d0a..d61e2de89 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.attachments.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="E-Mail">
 <link rel="prev" href="ox.appsuite.user.sect.email.view.html" title="Viewing Email Messages">
-<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
+<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.deputy.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.deputy.html
index fdf26c905..99a8bce5c 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.deputy.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.deputy.html
@@ -91,12 +91,12 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creating, Editing or Managing Appointments as Deputy</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.email.deputy">Parent topic: <a class="xref" href="ox.appsuite.user.chap.email.html"><i>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.create.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.create.html
index 4c1a66350..a23665055 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.create.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.create.html
@@ -61,7 +61,7 @@
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>CC</strong></span>, <span class="guibutton"><strong>BCC</strong></span> button. Opens the <span class="guibutton"><strong>CC</strong></span> or <span class="guibutton"><strong>BCC</strong></span> input field.</p></li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>RE</strong></span> button. Opens the <span class="guibutton"><strong>Reply to</strong></span> input field.</p>
+<p role="presentation"><span class="guibutton"><strong>AW</strong></span> button. Opens the <span class="guibutton"><strong>Reply to</strong></span> input field.</p>
 <p role="presentation">Your email reply will be sent to the email addresses entered in this input field.</p>
 </li>
 <li class="listitem">
@@ -82,6 +82,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Send</strong></span>. Sends the E-Mail to the entered recipients.</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.13.5.1.5"><p role="presentation"><span class="guibutton"><strong>Send later</strong></span>. Opens a menu that allows you to select when the email should be sent.</p></li>
 <li class="listitem">
 <p role="presentation">Button bar </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -115,17 +116,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">The editing window</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to email messages</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding email messages</a></p>
-<p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Using AI functions when composing email messages</a></p>
-<p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Email Messages as Deputy</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 <p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Sending encrypted E-Mail messages</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.email.gui.create">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">The <span class="phrase">E-Mail</span> Components</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.detailview.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.detailview.html
index 8f04d88bb..af25fbca6 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.detailview.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.detailview.html
@@ -61,6 +61,7 @@
 <li class="listitem">
 <p role="presentation">Depending on the configuration, one of the following functions will be available: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Set category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Opens a menu with functions for assigning a category or for managing categories.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Set colour</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Opens a menu, allowing you to assign a coloured label to the email.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Flag</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Flags the email.</p></li>
 </ul>
@@ -78,6 +79,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation">If selecting an email with an attachment as link in the <span class="guibutton"><strong>Sent</strong></span> folder, information about the attachment will be displayed at the top of the email text.</p></li>
+<li class="listitem"><p role="presentation">Depending on the configuration: If available, the assigned categories will be displayed.</p></li>
 <li class="listitem">
 <p role="presentation">Email text</p>
 <p role="presentation">Quotes from previous email messages are marked at the beginning of the line.</p>
@@ -93,15 +95,11 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">The <span class="phrase">E-Mail</span> pop-up</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">The email editing window</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Email Messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to email messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving email Attachments</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.detailview">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">The <span class="phrase">E-Mail</span> Components</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.foldertree.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.foldertree.html
index 36e23ba18..982bd7484 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.foldertree.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.foldertree.html
@@ -45,14 +45,16 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Inbox</strong></span>. By default, all incoming E-Mail messages go to this folder.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Drafts</strong></span>. Contains the E-Mail messages saved as drafts.</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Sent</strong></span>. Contains the email sent by you.</p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Sent</strong></span>. Contains the email messages sent by you.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Trash</strong></span>. Contains the E-Mail messages deleted by you.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Archive</strong></span>. Contains the email messages archived by you. This folder will be created automatically when initially archiving an email.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>My folders</strong></span>. Contains the email folders created by you. This folder will be created automatically when initially creating an email folder.</p></li>
 </ul>
 <p>Depending on the configuration and email settings, additional folders might be available. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Folders for unread email messages, folders for flagged messages</p></li>
+<li class="listitem"><p role="presentation">Folder for flagged messages</p></li>
+<li class="listitem"><p role="presentation">Folder for unread messages</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.7.5.2.3"><p role="presentation">Folder for messages that will be sent later</p></li>
 <li class="listitem"><p role="presentation">Shared and public email folders you subscribed to.</p></li>
 <li class="listitem"><p role="presentation">Folders from functional email accounts that have been assigned to you by the administrator.</p></li>
 </ul>
@@ -65,10 +67,10 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Email Messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Adding E-Mail Folders</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Disabling or enabling functional email accounts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Disabling or enabling functional email accounts</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Managing Data with Folders</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a></p>
 </li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.html
index f780b59ba..b4970d28b 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.html
@@ -43,7 +43,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">The New email button</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">E-Mail</span> folder view</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">The <span class="phrase">E-Mail</span> tabs bar</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">The inbox categories bar</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">The <span class="phrase">E-Mail</span> pop-up</a></p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.list.html
index 1c193919b..e4af1d176 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.list.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.list.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="The E-Mail Components">
-<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="The E-Mail tabs bar">
+<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="The inbox categories bar">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.detailview.html" title="The E-Mail detail view">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -50,6 +50,7 @@
 <li class="listitem"><p role="presentation">The following details are displayed for each email: Sender, subject, date of receipt. Unread E-Mail messages are marked with the <span class="guibutton"><strong>Unread</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span>.</p></li>
 <li class="listitem"><p role="presentation">A tooltip on a sender's name shows the sender's email address.</p></li>
 <li class="listitem"><p role="presentation">If available, additional information is shown: attachment icons, coloured label or flag, number of email messages in a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">conversation</a>, priority.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.10.5.1.7"><p role="presentation">If available, the assigned categories will be displayed. In the E-Mail settings, you can specify whether assigned categories are displayed in the list view.</p></li>
 <li class="listitem"><p role="presentation">Encrypted email messages are marked with the Encrypted icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.encrypted"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span>.</p></li>
 <li class="listitem">
 <p role="presentation">If a vacation notice is enabled, a notification will be displayed above the list view.</p>
@@ -67,12 +68,9 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">The <span class="phrase">E-Mail</span> settings menu</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Email Messages</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.list">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">The <span class="phrase">E-Mail</span> Components</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.new.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.new.html
index fd9bff244..d99da5107 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.new.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.new.html
@@ -51,7 +51,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Adding E-Mail Accounts</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving email Attachments</a></p>
 </li></ul>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.popup.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.popup.html
index 6cb77458f..742685cc7 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.popup.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.popup.html
@@ -69,8 +69,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Displaying contacts in the halo view</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.popup">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">The <span class="phrase">E-Mail</span> Components</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.settingsmenu.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.settingsmenu.html
index 9699dcbe1..2b070abc7 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.settingsmenu.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.settingsmenu.html
@@ -57,7 +57,6 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Adding E-Mail Accounts</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving email Attachments</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.tabs.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.tabs.html
index d59cb33d6..a6c519e1e 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.tabs.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.tabs.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>The E-Mail tabs bar</title>
+<title>The inbox categories bar</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -37,14 +37,14 @@
   </h1>
 <h2 class="sr-only">The <span class="phrase">E-Mail</span> Components</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.tabs">
-<div class="titlepage"><div><div><h3 class="title">The <span class="phrase">E-Mail</span> tabs bar</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">The inbox categories bar</h3></div></div></div>
 <a class="indexterm" name="id-1.7.8.9.2"></a><p id="ox.appsuite.user.concept.email.gui.tabs">Shows predefined inbox tabs for the email messages in the <span class="guibutton"><strong>Inbox</strong></span> folder. This allows you to assign incoming email messages to certain tabs sorted by senders.</p>
 <p id="ox.appsuite.user.reference.email.gui.tabs">
         </p>
 <p class="title">Notes:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Depending on the configuration, inbox tabs might not be available.</p></li>
-<li class="listitem"><p role="presentation">If inbox tabs are available, you can show or hide the inbox tab bar. To do so, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Inbox categories</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">If inbox categories are available, you can show or hide the inbox categories bar. To do so, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Inbox categories</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">The number of inbox tabs and their names and order are preset. Depending on the configuration, some inbox tabs can be renamed or disabled.</p></li>
 </ul>
 <p>
@@ -52,14 +52,9 @@
 <p id="ox.appsuite.user.related.email.gui.tabs">
         </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a>
-            </p></li>
-</ul>
+            </p></li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.reference.email.gui.tabs.parent">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">The <span class="phrase">E-Mail</span> Components</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.toolbar.html
index be45dae31..c363a8946 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.toolbar.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.gui.toolbar.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="The E-Mail Components">
 <link rel="prev" href="ox.appsuite.user.sect.email.gui.foldertree.html" title="The E-Mail folder view">
-<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="The E-Mail tabs bar">
+<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="The inbox categories bar">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -47,7 +47,8 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Archive</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.archive"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span>. Archives the email messages selected by you.</p></li>
 <li class="listitem"><p role="presentation">Icons for <span class="guibutton"><strong>replying to</strong></span> and <span class="guibutton"><strong>forwarding</strong></span> the selected email messages: <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>AI integration</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>. Opens a menu with AI functions for editing the email content.</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Set category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Opens a menu allowing you to move an email to a category. This icon is only available if the inbox tabs bar is displayed.</p></li>
+<li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Set inbox category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.inboxcategories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Opens a menu that allows you to move an email to an inbox category. This icon is only available if the inbox tabs bar is displayed.</p></li>
+<li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Set category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>.. Opens a menu with functions for assigning a category or for managing categories.</p></li>
 <li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Set colour</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Opens a menu allowing you to assign a coloured label to the selected email messages.</p></li>
 <li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Flag</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Flags the email.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Move</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.moveto"><object type="image/svg+xml" data="../../images/folder-symlink.svg" height="15"></object></span>. Moves the selected email messages to another folder.</p></li>
@@ -61,25 +62,12 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">The <span class="phrase">E-Mail</span> tabs bar</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to email messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding email messages</a></p>
 </li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Using AI functions when replying to email messages</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying E-Mail messages</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marking email messages as read or unread</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Categorising E-Mail messages</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Using E-Mail drafts</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creating E-Mail reminders</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Adding an E-Mail to the Portal</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Saving email messages</a></p>
-<p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting email messages as PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Printing email messages</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting E-Mail messages</a></p>
-</li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Using AI functions when replying to email messages</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.toolbar">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">The <span class="phrase">E-Mail</span> Components</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.addportal.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.addportal.html
index 5953bb211..a46142577 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.addportal.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.addportal.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing E-Mail messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.addportal">
 <div class="titlepage"><div><div><h3 class="title">Adding an E-Mail to the Portal</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.15.2"></a><a class="indexterm" name="id-1.7.15.15.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">You can add an E-Mail as widget to the Portal.</p>
+<a class="indexterm" name="id-1.7.15.16.2"></a><a class="indexterm" name="id-1.7.15.16.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">You can add an E-Mail as widget to the Portal.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.addportal">
 <p class="title">How to add an email to the portal:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.addportal"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.add.html">Adding Portal widgets</a></p></li></ul>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.archive.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.archive.html
index 0c8a8292f..221748d9e 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.archive.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.archive.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing E-Mail messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.archive">
 <div class="titlepage"><div><div><h3 class="title">Archiving E-Mail messages</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.20.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">When archiving E-Mail messages, those E-Mail messages are moved to the <span class="guibutton"><strong>Archive</strong></span> folder. The <span class="guibutton"><strong>Archive</strong></span> folder contains a separate subfolder for each calendar year. The archived E-Mail messages are saved to those subfolders sorted by the year of receipt. The <span class="guibutton"><strong>Archive</strong></span> folder is created as soon as you initially use this function. The following options are available: </p>
+<a class="indexterm" name="id-1.7.15.21.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">When archiving E-Mail messages, those E-Mail messages are moved to the <span class="guibutton"><strong>Archive</strong></span> folder. The <span class="guibutton"><strong>Archive</strong></span> folder contains a separate subfolder for each calendar year. The archived E-Mail messages are saved to those subfolders sorted by the year of receipt. The <span class="guibutton"><strong>Archive</strong></span> folder is created as soon as you initially use this function. The following options are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">archive a folder's E-Mail messages that are older than 90 days</p></li>
 <li class="listitem"><p role="presentation">archive single E-Mail messages</p></li>
@@ -61,14 +61,16 @@
 </li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.archive">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.archive"></p>
+<p class="title">User interface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">E-Mail</span> folder view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p>
+</li></ul>
+<p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Printing email messages</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Printing email messages</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.archive">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.categories.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.categories.html
new file mode 100644
index 000000000..4e2573142
--- /dev/null
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.categories.html
@@ -0,0 +1,95 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Default to using PGP inline for new email messages</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing E-Mail messages">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Collecting addresses">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Categorising E-Mail messages">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">E-Mail</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Managing E-Mail messages</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Default to using PGP inline for new email messages</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.categories">To organise email messages independently from folders, you can use categories. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">You can mark email messages with categories.</p></li>
+<li class="listitem"><p role="presentation">You can view all email messages that have been marked with a specific category.</p></li>
+</ul>
+<p> You can create, edit or delete your own categories, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>.</p>
+<p id="ox.appsuite.user.tip.email.manage.categories">Independently from categories, you can use inbox categories. With inbox categories, you can organise email messages related to senders, see <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a>.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.mark">
+<p class="title">How to mark email messages with a category:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Select one or several E-Mail messages.</p></li>
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Set category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.mark.add"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> in the tool bar. Select a category.</p>
+<p role="presentation">To remove a category from the email, click on the category.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.view">
+<p class="title">How to display email messages that have been marked with a specific category:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Select an email that has been marked with a category.</p></li>
+<li class="step"><p role="presentation">Click on the category in the detail view.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Result: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">The list view shows all email messages that have been marked with this category.</p></li>
+<li class="listitem"><p role="presentation">For each email, the folder containing the email will be displayed.</p></li>
+<li class="listitem"><p role="presentation">To display the previous list, click the <span class="guibutton"><strong>Cancel search</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in the search field.</p></li>
+</ul>
+          <p>Tip: You can also use the search function by searching for a category using the search options.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.categories"></p>
+<p class="title">User interface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p>
+</li></ul>
+<p> </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">Searching for E-Mail Messages</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.categories">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.collectaddress.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.collectaddress.html
index d877c1d84..459ab5531 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.collectaddress.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.collectaddress.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing E-Mail messages">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.mark.html" title="Marking email messages as read or unread">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Categorising E-Mail messages">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="Default to using PGP inline for new email messages">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.mark.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.categories.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -40,7 +40,7 @@
 <div class="titlepage"><div><div><h3 class="title">Collecting addresses</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.10.2"></a><a class="indexterm" name="id-1.7.15.10.3"></a><p id="ox.appsuite.user.concept.email.manage.collectaddress">The following options are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Automatically collect new E-Mail addresses when sending or reading E-Mail messages by activating this function in the E-Mail settings.</p></li>
+<li class="listitem"><p role="presentation">Automatically collect new email addresses when sending or reading email messages by activating this function in the advanced email settings.</p></li>
 <li class="listitem"><p role="presentation">Manually adding email addresses to an address book</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.collectaddress">
@@ -56,16 +56,10 @@
           <p>Note: This function is only available for new contacts.</p>
         </div>
 </div>
-<p role="presentation" class="cap-contacts">
-        <p class="title">Related topics:</p><ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creating a new contact</a>
-            </p></li>
-</ul>
-      </p>
+<p role="presentation" class="cap-contacts"><p class="title">User interface:</p><ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p></li></ul> <p class="title">Related topics:</p><ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creating a new contact</a></p></li>
+</ul></p>
 <p id="ox.appsuite.user.parent.email.manage.collectaddress">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.delete.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.delete.html
index 056287297..797d99687 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.delete.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.delete.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing E-Mail messages">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.archive.html" title="Archiving E-Mail messages">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Cleaning up E-Mail folders">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.recover.html" title="Recovering email messages">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.archive.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.recover.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -38,20 +38,20 @@
 <h2 class="sr-only">Managing E-Mail messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Deleting E-Mail messages</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.21.2"></a><a class="indexterm" name="id-1.7.15.21.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">The following options are available: </p>
+<a class="indexterm" name="id-1.7.15.22.2"></a><a class="indexterm" name="id-1.7.15.22.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">The following options are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Define whether email messages are moved to the Trash or permanently removed when deleted.</p>
-<p role="presentation">Email messages that are moved to the trash can be recovered.</p>
+<p role="presentation">You can define whether email messages are moved to the Trash or permanently removed when deleted. </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Email messages that are moved to the trash can be recovered.</p></li>
+<li class="listitem"><p role="presentation"><span class="cap-dumpster">Permanently deleted email messages can be recovered within 14 days. After this period has expired: </span> Permanently deleted email messages <span class="phrase"><strong>cannot</strong></span> be recovered.</p></li>
+</ul>
 </li>
-<li class="listitem"><p role="presentation">Delete individual email messages or entire email conversations.</p></li>
-<li class="listitem"><p role="presentation">Delete all email messages in an email folder.</p></li>
-<li class="listitem"><p role="presentation">Recover email messages from the trash.</p></li>
-<li class="listitem"><p role="presentation">Permanently delete email messages from the trash.</p></li>
-<li class="listitem"><p role="presentation">Permanently delete all email messages from the trash by emptying the trash.</p></li>
+<li class="listitem"><p role="presentation">You can delete individual email messages or an entire conversation.</p></li>
+<li class="listitem"><p role="presentation">You can delete all email messages in an email folder.</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.delete.setting">
-<p class="title">How to define whether email messages are moved to the trash or permanently removed when deleted.</p>
+<p class="title">How to define whether email messages are moved to the trash or permanently removed when deleted:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.setting"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
@@ -65,21 +65,21 @@
 <li class="listitem"><p role="presentation">If email messages are to be moved to the trash, disable <span class="guibutton"><strong>Permanently remove deleted email messages</strong></span>.</p></li>
 <li class="listitem">
 <p role="presentation">If email messages are to be deleted permanently, enable <span class="guibutton"><strong>Permanently remove deleted email messages</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Warning:</strong></span> Permanently deleted email messages <span class="phrase"><strong>cannot</strong></span> be recovered.</p>
+<p role="presentation"><span class="phrase"><strong>Warning:</strong></span> Depending on the configuration, permanently deleted email messages <span class="phrase"><strong>cannot</strong></span> be recovered.</p>
 </li>
 </ul></p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.delete">
-<p class="title">How to delete an E-Mail:</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.single">
+<p class="title">How to delete individual email messages:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select one or several E-Mail messages.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the tool bar.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the tool bar.</p>
 <p role="presentation">Or: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Press the [Del] or [Backspace] key on the keyboard.</p></li>
 <li class="listitem"><p role="presentation">In an email’s context menu, click on <span class="guibutton"><strong>Delete</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">If you have selected a single email, use the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the detail view.</p></li>
+<li class="listitem"><p role="presentation">If you have selected an individual email, use the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the detail view.</p></li>
 </ul></p>
 </li>
 </ol></div>
@@ -87,7 +87,7 @@
           <p>Result: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">If the setting <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Permanently remove deleted email messages</strong></span></a> is disabled:</p>
+<p role="presentation">If the setting <span class="guibutton"><strong>Permanently remove deleted email messages</strong></span> is disabled:</p>
 <p role="presentation">The email messages are moved to the Trash folder.</p>
 </li>
 <li class="listitem">
@@ -97,17 +97,17 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptyfolder">
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.emptyfolder">
 <p class="title">How to delete all email messages in a folder:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">In the folder view, select the folder which E-Mail messages you want to delete.</p></li>
 <li class="step">
 <p role="presentation">Use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the folder name.</p></li>
-<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list.</p></li>
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the folder name.</p></li>
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list.</p></li>
 </ul></p>
 <p role="presentation">Click on the <span class="guibutton"><strong>Delete all messages</strong></span> button.</p>
-<p role="presentation"><span class="phrase"><strong>Warning:</strong></span> If the setting <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Permanently remove deleted email messages</strong></span></a> is enabled, deleted email messages cannot be recovered.</p>
+<p role="presentation"><span class="phrase"><strong>Warning:</strong></span> If the setting <span class="guibutton"><strong>Permanently remove deleted email messages</strong></span> is enabled, deleted email messages <span class="phrase"><strong>cannot</strong></span> be recovered, depending on the configuration.</p>
 </li>
 <li class="step"><p role="presentation">Confirm that you want to delete the content of this folder.</p></li>
 </ol></div>
@@ -115,7 +115,7 @@
           <p>Result: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">If the setting <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Permanently remove deleted email messages</strong></span></a> is disabled:</p>
+<p role="presentation">If the setting <span class="guibutton"><strong>Permanently remove deleted email messages</strong></span> is disabled:</p>
 <p role="presentation">The email messages are moved to the Trash folder.</p>
 </li>
 <li class="listitem">
@@ -125,60 +125,22 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
-<p class="title">How to recover deleted email messages:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Open the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
-<li class="step"><p role="presentation">Select one or several E-Mail messages.</p></li>
-<li class="step"><p role="presentation">In an email’s context menu, click on <span class="guibutton"><strong>Move</strong></span>.</p></li>
-<li class="step"><p role="presentation">Select a folder in the <span class="guilabel"><strong>Move</strong></span> window. Click on the <span class="guibutton"><strong>Move</strong></span> button.</p></li>
-</ol></div>
-<div class="taskrelated">
-          <p>Or: </p>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">To recover all email messages from the trash, click the <span class="guibutton"><strong>More options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list. Click on the <span class="guibutton"><strong>Move all messages</strong></span> button.</p></li>
-<li class="listitem"><p role="presentation">If you have selected a single email, use the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the detail view. Click on <span class="guibutton"><strong>Move</strong></span>.</p></li>
-</ul>
-        </div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever">
-<p class="title">How to permanently delete an E-Mail:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Warning:</strong></span> Permanently deleted email messages <span class="phrase"><strong>cannot</strong></span> be recovered.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Open the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
-<li class="step"><p role="presentation">Select one or several E-Mail messages.</p></li>
-<li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the tool bar.</p>
-<p role="presentation">If you have selected a single email, you can also use the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the detail view.</p>
-</li>
-<li class="step"><p role="presentation">Confirm that you want to permanently delete the selected email messages.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptytrash">
-<p class="title">How to permanently delete the content of the Trash folder:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Warning:</strong></span> Permanently deleted email messages <span class="phrase"><strong>cannot</strong></span> be recovered.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Select the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
-<li class="step">
-<p role="presentation">Use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to <span class="guibutton"><strong>Trash</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list.</p></li>
-</ul></p>
-<p role="presentation">Click on <span class="guibutton"><strong>Empty folder</strong></span>.</p>
-</li>
-<li class="step"><p role="presentation">Confirm that you want to delete the content of the folder.</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.email.manage.delete"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">E-Mail</span> folder view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up E-Mail folders</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recovering email messages</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting E-Mail messages</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.22.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted email messages</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up E-Mail folders</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.email.manage.delete">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.deleteforever.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.deleteforever.html
new file mode 100644
index 000000000..86525797a
--- /dev/null
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.deleteforever.html
@@ -0,0 +1,92 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Deleting E-Mail messages</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing E-Mail messages">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.recover.html" title="Recovering email messages">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Recovering permanently deleted email messages">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.recover.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">E-Mail</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Managing E-Mail messages</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.deleteforever">
+<div class="titlepage"><div><div><h3 class="title">Deleting E-Mail messages</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.24.2"></a><a class="indexterm" name="id-1.7.15.24.3"></a><p id="ox.appsuite.user.concept.email.manage.deleteforever">The following options are available: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Permanently delete individual email messages from the trash.</p></li>
+<li class="listitem"><p role="presentation">Permanently delete all email messages from the trash by emptying the trash.</p></li>
+</ul>
+<p id="ox.appsuite.user.hint.email.manage.deleteforever.html"><span class="cap-dumpster">Permanently deleted email messages can be recovered within 14 days. After this period has expired: </span>Permanently deleted email messages <span class="phrase"><strong>cannot</strong></span> be recovered.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.single">
+<p class="title">How to permanently delete individual email messages:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Open the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
+<li class="step"><p role="presentation">Select one or several E-Mail messages.</p></li>
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the tool bar.</p>
+<p role="presentation">If you have selected an individual email, you can also use the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the detail view.</p>
+</li>
+<li class="step"><p role="presentation">Confirm that you want to permanently delete the selected email messages.</p></li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.emptytrash">
+<p class="title">How to permanently delete all email messages from the trash:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Select the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
+<li class="step">
+<p role="presentation">Use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to <span class="guibutton"><strong>Trash</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list.</p></li>
+</ul></p>
+<p role="presentation">Click on <span class="guibutton"><strong>Empty folder</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Confirm that you want to delete the content of the folder.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.deleteforever"></p>
+<p class="title">User interface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">E-Mail</span> folder view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
+</li></ul>
+<p> </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting E-Mail messages</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recovering email messages</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.24.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted email messages</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up E-Mail folders</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.deleteforever">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.draft.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.draft.html
index d2561dce7..97af994fb 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.draft.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.draft.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing E-Mail messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.draft">
 <div class="titlepage"><div><div><h3 class="title">Using E-Mail drafts</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">While composing an email, the email is automatically saved as an email draft at regular intervals. The following options are available: </p>
+<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">While composing an email, the email is automatically saved as an email draft at regular intervals. The following options are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Edit or send an email draft.</p></li>
 <li class="listitem"><p role="presentation">Edit or send a copy of an email draft.</p></li>
@@ -69,11 +69,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.draft"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">E-Mail</span> folder view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.manage.draft">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.expungefolder.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.expungefolder.html
index b59a35eff..8c1d66f6c 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.expungefolder.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.expungefolder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing E-Mail messages">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Deleting E-Mail messages">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Recovering permanently deleted email messages">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.unifiedmail.html" title="Using Unified Mail">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Next</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing E-Mail messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.expungefolder">
 <div class="titlepage"><div><div><h3 class="title">Cleaning up E-Mail folders</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.22.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Depending on the E-Mail client's settings, E-Mail messages that you deleted from within an E-Mail client like Apple Mail, MS Outlook or Mozilla Thunderbird, might be deleted only after having signed out from the client. In the meantime, those E-Mail messages will be shown as crossed out in the groupware. To delete those E-Mail messages clean up the E-Mail folder.</p>
+<a class="indexterm" name="id-1.7.15.26.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Depending on the E-Mail client's settings, E-Mail messages that you deleted from within an E-Mail client like Apple Mail, MS Outlook or Mozilla Thunderbird, might be deleted only after having signed out from the client. In the meantime, those E-Mail messages will be shown as crossed out in the groupware. To delete those E-Mail messages clean up the E-Mail folder.</p>
 <p id="ox.appsuite.user.hint.email.manage.expungefolder">Note: Depending on the configuration, this function is not available as such E-Mail messages are not displayed.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.expunge">
 <p class="title">How to clean up an E-Mail folder:</p>
@@ -47,14 +47,12 @@
 <li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.expungefolder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the folder name. Click on <span class="guibutton"><strong>Clean up</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.expungefolder">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.expungefolder"></p>
+<p class="title">User interface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">E-Mail</span> folder view</a></p></li></ul>
+<p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting E-Mail messages</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting E-Mail messages</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.expungefolder">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.html
index 0693fd9ca..2f71a69ac 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.html
@@ -43,17 +43,21 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying E-Mail messages</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marking email messages as read or unread</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecting addresses</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new email messages</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Categorising E-Mail messages</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Using E-Mail drafts</a></p></li>
-<li class="listitem cap-tasks" id="id-1.7.15.4.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creating E-Mail reminders</a></p></li>
+<li class="listitem cap-tasks" id="id-1.7.15.4.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creating E-Mail reminders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Adding an E-Mail to the Portal</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Saving email messages</a></p></li>
-<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting email messages as PDF</a></p></li>
+<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting email messages as PDF</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importing email messages</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Printing email messages</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archiving E-Mail messages</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting E-Mail messages</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recovering email messages</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting E-Mail messages</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.4.1.19"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted email messages</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up E-Mail folders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a></p></li>
 </ul>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.import.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.import.html
index 3e04f7539..f4a7a757d 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.import.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing E-Mail messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importing email messages</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><p id="ox.appsuite.user.concept.email.manage.import">You can import an email that is available in the EML format.</p>
+<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.import">You can import an email that is available in the EML format.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.import">
 <p class="title">How to import an email:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,14 +46,15 @@
 <li class="step"><p role="presentation">Drag the EML file from a file browser or the desktop to the email list view.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.import"></p>
+<p class="title">User interface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">E-Mail</span> folder view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p>
+</li></ul>
+<p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Saving email messages</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Saving email messages</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.import">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.inboxcategories.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.inboxcategories.html
index 7a3aa05f3..fde2a138b 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.inboxcategories.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.inboxcategories.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation">assign incoming email messages to an inbox category</p></li>
 <li class="listitem"><p role="presentation">edit the inbox categories view</p></li>
 </ul>
-<p role="presentation" class="feat-io-ox-core-categories">Note: The inbox categories described here can only be used for email messages. Depending on the configuration, you can use separate categories for appointments, contacts and tasks, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Note: The inbox categories described here can only be used for email messages. Depending on the configuration, you can use separate categories for email messages, appointments, contacts and tasks, see <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new email messages</a>.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.inboxcategories.activate">
 <p class="title">How to enable or disable the inbox tabs:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,7 @@
 <p role="presentation">To enable the inbox tabs, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.activate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Inbox categories</strong></span>.</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">You can also use the <span class="guibutton"><strong>Configure inbox categories</strong></span> button below <span class="guibutton"><strong>Reading</strong></span> in the email settings.</p></li></ul>
 <p role="presentation">The <span class="guilabel"><strong>Configure categories</strong></span> window opens. It shows the available inbox categories. Click on <span class="guibutton"><strong>Enable categories</strong></span>.</p>
-<p role="presentation">On the right side below the menu bar the tabs bar will be displayed.</p>
+<p role="presentation">Below the menu bar, the inbox categories bar will be displayed.</p>
 </li>
 <li class="step">
 <p role="presentation">To disable the inbox tabs, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.deactivate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Inbox categories</strong></span>.</p>
@@ -68,7 +68,7 @@
 <p role="presentation">Email messages that have not been assigned to an inbox category yet, are displayed in the <span class="guibutton"><strong>General</strong></span> tab.</p>
 </li>
 <li class="step">
-<p role="presentation">Drag an email from the list view to a tab in the tabs bar and drop it there.</p>
+<p role="presentation">Drag an email from the list view to a category in the inbox categories bar and drop it there.</p>
 <p role="presentation">You can also select an email. Click the <span class="guibutton"><strong>Set category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span> in the tool bar. Select a tab from the menu.</p>
 </li>
 <li class="step"><p role="presentation">In order to finish the process, do one of the following: <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -82,14 +82,14 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Inbox categories</strong></span>.</p>
-<p role="presentation">You can also click the <span class="guibutton"><strong>Configure categories</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the category bar.</p>
+<p role="presentation">You can also click the <span class="guibutton"><strong>Configure categories</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the inbox categories bar.</p>
 <p role="presentation">The <span class="guilabel"><strong>Configure categories</strong></span> window opens.</p>
 </li>
 <li class="step">
 <p role="presentation">To enable or disable an inbox category, enable or disable the respective checkbox.</p>
 <p role="presentation">To rename an inbox category, edit the respective text.</p>
 <p role="presentation">Note: Some categories cannot be edited.</p>
-<p role="presentation">In order to hide the category bar, click on <span class="guibutton"><strong>Disable categories</strong></span>.</p>
+<p role="presentation">In order to hide the inbox categories bar, click on <span class="guibutton"><strong>Disable categories</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Save</strong></span>.</p></li>
 </ol></div>
@@ -98,14 +98,11 @@
 <p class="title">User interface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">The <span class="phrase">E-Mail</span> settings menu</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">The <span class="phrase">E-Mail</span> tabs bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">The inbox categories bar</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Email Messages</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.inboxcategories">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.label.html
index b93d7815b..9f3aa3b1d 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.label.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.label.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing E-Mail messages">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Collecting addresses">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="Default to using PGP inline for new email messages">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.source.html" title="Showing the email source">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.categories.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.source.html">Next</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing E-Mail messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.label">
 <div class="titlepage"><div><div><h3 class="title">Categorising E-Mail messages</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Depending on the configuration, you can use one of the following options to categorise email messages: </p>
+<a class="indexterm" name="id-1.7.15.12.2"></a><a class="indexterm" name="id-1.7.15.12.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Depending on the configuration, you can use one of the following options to categorise email messages: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">a coloured label</p></li>
 <li class="listitem"><p role="presentation">a flag</p></li>
@@ -69,7 +69,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.label"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.mark.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.mark.html
index fcde7da4c..e854f7e5a 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.mark.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.mark.html
@@ -62,7 +62,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.mark"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Email Messages</a></p></li></ul>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.movecopy.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.movecopy.html
index 32914bffb..e42837a57 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.movecopy.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.movecopy.html
@@ -67,7 +67,11 @@
 </ul>
 <p id="ox.appsuite.user.related.email.manage.movecopy"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.pdfexport.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.pdfexport.html
index 253e0f0f3..863d51730 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.pdfexport.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.pdfexport.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing E-Mail messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.pdfexport">
 <div class="titlepage"><div><div><h3 class="title">Exporting email messages as PDF</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.17.2"></a><a class="indexterm" name="id-1.7.15.17.3"></a><a class="indexterm" name="id-1.7.15.17.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Note: Depending on the configuration, this function might not be available.</p>
+<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><a class="indexterm" name="id-1.7.15.18.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Note: Depending on the configuration, this function might not be available.</p>
 <p id="ox.appsuite.user.concept.email.manage.pdfexport">You can export an email and its attachments in docx format as PDF. As soon as the PDF file has been created, it will be saved in a <span class="phrase">Drive</span> folder that can be defined by you. Depending on the data volume, the download can take a while. As soon as the process has been finished, you will receive a notification.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.pdfexport">
 <p class="title">How to export email messages as PDF:</p>
@@ -54,7 +54,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.pdfexport"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Saving email messages</a></p></li></ul>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.print.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.print.html
index 457a237b3..9f125c8ad 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.print.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing E-Mail messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Printing email messages</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.print">You can print the content of an E-Mail or several E-Mail messages.</p>
+<a class="indexterm" name="id-1.7.15.20.2"></a><a class="indexterm" name="id-1.7.15.20.3"></a><p id="ox.appsuite.user.concept.email.manage.print">You can print the content of an E-Mail or several E-Mail messages.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.print">
 <p class="title">How to print an E-Mail's content:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -56,7 +56,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.print"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archiving E-Mail messages</a></p></li></ul>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.recover.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.recover.html
new file mode 100644
index 000000000..b1fb81f91
--- /dev/null
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.recover.html
@@ -0,0 +1,97 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Recovering email messages</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing E-Mail messages">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Deleting E-Mail messages">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Deleting E-Mail messages">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">E-Mail</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Managing E-Mail messages</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.recover">
+<div class="titlepage"><div><div><h3 class="title">Recovering email messages</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.recover">The following options are available: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Recover individual email messages from the trash.</p></li>
+<li class="listitem"><p role="presentation">Recover all email messages from the trash.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.single">
+<p class="title">How to recover individual email messages from the trash:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Open the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
+<li class="step">
+<p role="presentation">Select one or several E-Mail messages.</p>
+<p role="presentation">In an email’s context menu, click on <span class="guibutton"><strong>Move</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Select a folder in the <span class="guilabel"><strong>Move</strong></span> window. Click on <span class="guibutton"><strong>Move</strong></span>.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Or: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Use drag and drop to move the email messages from the trash to a folder in the folder view.</p></li>
+<li class="listitem"><p role="presentation">If you have selected an individual email, use the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.single.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the detail view. Click on <span class="guibutton"><strong>Move</strong></span>.</p></li>
+</ul>
+        </div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.all">
+<p class="title">How to recover all email messages from the trash:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Select the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
+<li class="step">
+<p role="presentation">Use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to <span class="guibutton"><strong>Trash</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list.</p></li>
+</ul></p>
+<p role="presentation">Click on the <span class="guibutton"><strong>Move all messages</strong></span> button.</p>
+</li>
+<li class="step"><p role="presentation">Select a folder in the <span class="guilabel"><strong>Move</strong></span> window. Click on <span class="guibutton"><strong>Move all</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.recover"></p>
+<p class="title">User interface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">E-Mail</span> folder view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
+</li></ul>
+<p> </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting E-Mail messages</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting E-Mail messages</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.23.7.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted email messages</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up E-Mail folders</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.recover">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.reminder.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.reminder.html
index 80606dbd9..02f721797 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.reminder.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.reminder.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing E-Mail messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.reminder">
 <div class="titlepage"><div><div><h3 class="title">Creating E-Mail reminders</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">You can activate a reminder for an E-Mail. This function creates a task and reminds you of the due date.</p>
+<a class="indexterm" name="id-1.7.15.15.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">You can activate a reminder for an E-Mail. This function creates a task and reminds you of the due date.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.email.manage.reminder">
 <p class="title">How to create an E-Mail reminder:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.reminder"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Creating new tasks</a></p></li></ul>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.save.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.save.html
index 226633052..70758ad41 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.save.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.save.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing E-Mail messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.save">
 <div class="titlepage"><div><div><h3 class="title">Saving email messages</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.16.2"></a><p id="ox.appsuite.user.concept.email.manage.save">You can save an E-Mail as a text file. The text file has the file extension EML. If you select multiple E-Mail messages, an EML file will be created for each E-Mail. The EML files will be saved as a zip archive then.</p>
+<a class="indexterm" name="id-1.7.15.17.2"></a><p id="ox.appsuite.user.concept.email.manage.save">You can save an E-Mail as a text file. The text file has the file extension EML. If you select multiple E-Mail messages, an EML file will be created for each E-Mail. The EML files will be saved as a zip archive then.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.save">
 <p class="title">How to save an email:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.save"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -57,7 +60,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importing email messages</a></p>
 <p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting email messages as PDF</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.7.15.16.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.7.15.17.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.save">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.source.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.source.html
index 4b9da8d46..e41677292 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.source.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.source.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing E-Mail messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.source">
 <div class="titlepage"><div><div><h3 class="title">Showing the email source</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.12.2"></a><p id="ox.appsuite.user.concept.email.manage.source">The email source contains the complete content of an email i.e.: the complete email header data.</p>
+<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.source">The email source contains the complete content of an email i.e.: the complete email header data.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.source">
 <p class="title">How to display the email source:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.source"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">E-Mail</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.undelete.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.undelete.html
new file mode 100644
index 000000000..bdfd80ca1
--- /dev/null
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.undelete.html
@@ -0,0 +1,75 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Recovering permanently deleted email messages</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing E-Mail messages">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Deleting E-Mail messages">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Cleaning up E-Mail folders">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">E-Mail</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Managing E-Mail messages</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.undelete">
+<div class="titlepage"><div><div><h3 class="title">Recovering permanently deleted email messages</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.25.2"></a><a class="indexterm" name="id-1.7.15.25.3"></a><p id="ox.appsuite.user.concept.email.manage.undelete.html">You can recover permanently deleted email messages within 14 days. After this period has expired, permanently deleted email messages are irrevocably lost.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
+<p class="title">How to recover permanently deleted email messages:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Select the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to <span class="guibutton"><strong>Trash</strong></span>.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Recover deleted items</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Select the email messages to be recovered in the <span class="guilabel"><strong>Recover deleted items</strong></span> window.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Move selected items</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">In the <span class="guilabel"><strong>Move</strong></span> window, specify the folder that should contain the recovered email messages.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Move</strong></span>.</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.undelete"></p>
+<p class="title">User interface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">E-Mail</span> folder view</a></p></li></ul>
+<p> </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting E-Mail messages</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recovering email messages</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting E-Mail messages</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up E-Mail folders</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.undelete">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing E-Mail messages</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.unifiedmail.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.unifiedmail.html
index 591ef57b6..6a55f7a08 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.unifiedmail.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.manage.unifiedmail.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing E-Mail messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.unifiedmail">
 <div class="titlepage"><div><div><h3 class="title">Using Unified Mail</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">With Unified Mail you can display email messages from multiple email accounts in one central folder. This gives you a quick overview of the multiple email accounts' inboxes. Unified Mail can be described as follows: </p>
+<a class="indexterm" name="id-1.7.15.27.2"></a><a class="indexterm" name="id-1.7.15.27.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">With Unified Mail you can display email messages from multiple email accounts in one central folder. This gives you a quick overview of the multiple email accounts' inboxes. Unified Mail can be described as follows: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">In addition to an email account's inbox, the <span class="guibutton"><strong>Unified Mail</strong></span> folder shows a further view for the account's email messages. The email messages actually exist only once.</p></li>
 <li class="listitem"><p role="presentation">Email messages in the Inbox's subfolders are not displayed in the <span class="guibutton"><strong>Unified Mail</strong></span> folder.</p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.openai.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.openai.html
index f2f64e183..d77f8602a 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.openai.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.openai.html
@@ -42,7 +42,7 @@
 <li class="listitem"><p role="presentation">edit the content of existing email messages or have text suggestions created to reply to them</p></li>
 <li class="listitem"><p role="presentation">have text suggestions created to send new email messages</p></li>
 </ul>
-<p> Note: When using the AI integration, the content of the respective email will be sent to the Microsoft Azure OpenAI Service </p>
+<p> Note: When using the AI integration, the content of the respective email will be sent to an OpenAI service. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">The first time you use an AI function, a dialogue box opens where you can agree to send this data. You can only use AI functions after having agreed to the data being sent.</p></li>
 <li class="listitem"><p role="presentation">You can change your consent to send the data at any time. To do so, click on <span class="guibutton"><strong>Change consent</strong></span> below <span class="guibutton"><strong>AI integration</strong></span> in the email settings.</p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.openai.send.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.openai.send.html
index 0c4cf6f59..d546924f3 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.openai.send.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.openai.send.html
@@ -64,7 +64,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Using AI functions when replying to email messages</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.email.openai.send">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.search.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.search.html
index 2f552a84d..99246608b 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.search.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.search.html
@@ -101,9 +101,14 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Email Messages</a>
           </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Categorising E-Mail messages</a>
-          </p></li>
+          </p>
+<p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new email messages</a>
+          </p>
+</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attachmentexisting.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attachmentexisting.html
index ec9bdda03..a37483405 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attachmentexisting.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attachmentexisting.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="Adding attachments">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Sending attachments as link">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="add attachments">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="send attachments as link">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Sending Email Messages</h2>
+<h2 class="sr-only">send email messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentexisting">
 <div class="titlepage"><div><div><h3 class="title">Adding attachments from existing email messages</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.9.2"></a><a class="indexterm" name="id-1.7.11.9.3"></a><p id="ox.appsuite.user.concept.email.send.attachmentexisting">Depending on the configuration, you can add attachments from existing email messages to a new email.</p>
@@ -59,14 +59,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachmentexisting"></p>
 <p class="title">Superordinated action:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attachmentlink.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attachmentlink.html
index 465299489..a21a166ef 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attachmentlink.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attachmentlink.html
@@ -1,11 +1,11 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Sending attachments as link</title>
+<title>send attachments as link</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Adding attachments from existing email messages">
 <link rel="next" href="ox.appsuite.user.sect.email.send.templates.html" title="Using templates">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Sending Email Messages</h2>
+<h2 class="sr-only">send email messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentlink">
-<div class="titlepage"><div><div><h3 class="title">Sending attachments as link</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">send attachments as link</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.10.2"></a><p id="ox.appsuite.user.concept.email.send.attachmentlink">This function allows sending large attachments by E-Mail. This is how it works: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">The attachments will be uploaded to a new folder below <span class="guibutton"><strong>Drive Mail</strong></span> in the <span class="phrase">Drive</span> app. The name of this folder corresponds to the email subject. The folder is shared with a public link.</p></li>
@@ -89,14 +89,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.attachmentlink"></p>
 <p class="title">Superordinated action:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing email messages</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachmentlink">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachmentlink">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attachments.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attachments.html
index e2d9be403..e08708eb1 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attachments.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attachments.html
@@ -1,11 +1,11 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Adding attachments</title>
+<title>add attachments</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.replyto.html" title="Setting reply-to address">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Adding attachments from existing email messages">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Sending Email Messages</h2>
+<h2 class="sr-only">send email messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachments">
-<div class="titlepage"><div><div><h3 class="title">Adding attachments</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">add attachments</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.8.2"></a><a class="indexterm" name="id-1.7.11.8.3"></a><p id="ox.appsuite.user.concept.emal.add.attachments">Depending on the configuration, you can attach files that are saved on your computer or in the <span class="phrase">Drive</span> app.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.attachments">
 <p class="title">How to add attachments in the email editing window:</p>
@@ -62,14 +62,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachments"></p>
 <p class="title">Superordinated action:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing email messages</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachments">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachments">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attendees.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attendees.html
index 35ec82948..1c33483e1 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attendees.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Automatically forwarding email messages">
 <link rel="next" href="ox.appsuite.user.sect.email.send.vacationnotice.html" title="Sending a vacation notice automatically">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Sending Email Messages</h2>
+<h2 class="sr-only">send email messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attendees">
 <div class="titlepage"><div><div><h3 class="title">Sending an E-Mail to appointment participants</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.16.2"></a><div class="task" id="ox.appsuite.user.task.email.send.attendees">
@@ -51,25 +51,16 @@
 <li class="step"><p role="presentation">Fill in the details for sending the E-Mail.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.send.attendees">
-        </p>
+<p id="ox.appsuite.user.related.email.send.attendees"></p>
+<p class="title">User interface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">The <span class="phrase">Calendar</span> tool bar</a></p>
+</li></ul>
+<p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">The <span class="phrase">Calendar</span> tool bar</a>
-            </p>
-</li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
-            </p></li>
-</ul>
-<p>
-      </p>
-<p id="ox.appsuite.user.parent.email.send.attendees">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p></li></ul>
+<p id="ox.appsuite.user.parent.email.send.attendees">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.autoforward.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.autoforward.html
index 8c8f7fd5f..b69514254 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.autoforward.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.autoforward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.forward.html" title="Forwarding email messages">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attendees.html" title="Sending an E-Mail to appointment participants">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Sending Email Messages</h2>
+<h2 class="sr-only">send email messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.autoforward">
 <div class="titlepage"><div><div><h3 class="title">Automatically forwarding email messages</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.15.2"></a><p id="ox.appsuite.user.concept.email.send.autoforward">You can let email messages be automatically forwarded to another address.</p>
@@ -67,7 +67,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
+              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to email messages</a>
@@ -90,7 +90,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.email.send.autoforward">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p id="ox.appsuite.user.parent.email.send.autoforward">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.forward.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.forward.html
index 4e9c33f82..963a13992 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.forward.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.forward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.reply.html" title="Replying to email messages">
 <link rel="next" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Automatically forwarding email messages">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Sending Email Messages</h2>
+<h2 class="sr-only">send email messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.forward">
 <div class="titlepage"><div><div><h3 class="title">Forwarding email messages</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.14.2"></a><p id="ox.appsuite.user.concept.email.send.forward">If you forward an email, some of the email's input fields are pre-filled: </p>
@@ -74,11 +74,11 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to email messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatically forwarding email messages</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.forward">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p id="ox.appsuite.user.parent.email.send.forward">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.html
index 676832741..947edb951 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.html
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Sending Email Messages</title>
+<title>send email messages</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="E-Mail">
 <link rel="prev" href="ox.appsuite.user.sect.email.attachments.html" title="Viewing or Saving email Attachments">
-<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Sending a new email">
+<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Sending new email messages">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -36,15 +36,15 @@
     
   </h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.send">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Sending Email Messages</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">send email messages</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.email.send">Learn how to send an E-Mail and about the functions available for customising the E-Mail content: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">select a sender address</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Setting reply-to address</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing email messages</a></p></li>
-<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></p></li>
+<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.11.2.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to email messages</a></p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.new.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.new.html
index 82fde92af..45b77d4bb 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.new.html
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Sending a new email</title>
+<title>Sending new email messages</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
-<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="Selecting a sender address">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
+<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="select a sender address">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Sending Email Messages</h2>
+<h2 class="sr-only">send email messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.new">
-<div class="titlepage"><div><div><h3 class="title">Sending a new email</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Sending new email messages</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.5.2"></a><a class="indexterm" name="id-1.7.11.5.3"></a><a class="indexterm" name="id-1.7.11.5.4"></a><div class="task" id="ox.appsuite.user.task.email.send.new">
 <p class="title">How to send a new email:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -93,37 +93,26 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">The New email button</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">The email editing window</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Subordinated actions:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">select a sender address</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Setting reply-to address</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing email messages</a></p>
-<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></p>
+<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to email messages</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding email messages</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatically forwarding email messages</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Sending an E-Mail to appointment participants</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Sending a vacation notice automatically</a></p>
-<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Sending encrypted E-Mail messages</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Sending Email Messages from within an address book</a></p>
-</li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Using AI functions when composing email messages</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Using AI functions when composing email messages</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.new">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p id="ox.appsuite.user.parent.email.send.new">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.reply.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.reply.html
index 976ddcdec..b1769e88b 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.reply.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.reply.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.signatures.html" title="Using signatures">
 <link rel="next" href="ox.appsuite.user.sect.email.send.forward.html" title="Forwarding email messages">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Sending Email Messages</h2>
+<h2 class="sr-only">send email messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.reply">
 <div class="titlepage"><div><div><h3 class="title">Replying to email messages</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.13.2"></a><p id="ox.appsuite.user.concept.email.send.reply">When replying to an E-Mail, some of the E-Mail's input fields are pre-filled: </p>
@@ -70,13 +70,13 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding email messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Sending a vacation notice automatically</a></p>
 </li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.11.13.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Using AI functions when replying to email messages</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.reply">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p id="ox.appsuite.user.parent.email.send.reply">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.replyto.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.replyto.html
index 759d763ce..5f7eca510 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.replyto.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.replyto.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="Selecting a sender address">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="Adding attachments">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="select a sender address">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="add attachments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Sending Email Messages</h2>
+<h2 class="sr-only">send email messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.replyto">
 <div class="titlepage"><div><div><h3 class="title">Setting reply-to address</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.7.2"></a><p id="ox.appsuite.user.concept.email.send.replyto">By default, when a recipient replies to your email, the reply is sent to the email account from which you sent the email. Alternatively, you can use the email editing window to specify the email addresses to which the reply to the sent email will be sent.</p>
@@ -43,11 +43,11 @@
 <p class="title">How to select a reply-to address in the email editing window:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">In the email editing window, click on <span class="guibutton"><strong>RE</strong></span> next to the sender address. The <span class="guibutton"><strong>Reply to</strong></span> input field will be displayed.</p>
-<p role="presentation">If you have specified default reply addresses while editing your primary email account, the <span class="guibutton"><strong>Reply to</strong></span> input field is automatically displayed. The input field includes the preset reply-to addresses.</p>
+<p role="presentation">In the email editing window, click on <span class="guibutton"><strong>Re</strong></span> next to the sender address. The <span class="guibutton"><strong>Reply to</strong></span> input field will be displayed.</p>
+<p role="presentation">If you have specified preset reply addresses while editing your primary email account, the <span class="guibutton"><strong>Reply to</strong></span> input field is automatically displayed. The input field includes the preset reply-to addresses.</p>
 </li>
 <li class="step">
-<p role="presentation">In <span class="guibutton"><strong>Reply to</strong></span>, enter the email addresses to which you want the reply to your email to be sent. <ul class="itemizedlist" style="list-style-type: disc; ">
+<p role="presentation">In <span class="guibutton"><strong>Reply to</strong></span>, enter the email addresses to which the reply to your email should be sent. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">While entering the recipients, matching suggestions will be displayed. To accept a suggestion, click on it.</p></li>
 <li class="listitem"><p role="presentation">To select contacts from an address book, click the <span class="guibutton"><strong>Select contact</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.replyto.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span> on the right side of the input field.</p></li>
 </ul></p>
@@ -57,11 +57,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.replyto"></p>
 <p class="title">Superordinated action:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">Editing the primary E-Mail account</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.replyto">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p id="ox.appsuite.user.parent.email.send.replyto">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.sender.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.sender.html
index 176c728ad..2aca85763 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.sender.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.sender.html
@@ -1,12 +1,12 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Selecting a sender address</title>
+<title>select a sender address</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Sending a new email">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Sending new email messages">
 <link rel="next" href="ox.appsuite.user.sect.email.send.replyto.html" title="Setting reply-to address">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Sending Email Messages</h2>
+<h2 class="sr-only">send email messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.sender">
-<div class="titlepage"><div><div><h3 class="title">Selecting a sender address</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">select a sender address</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.6.2"></a><p id="ox.appsuite.user.concept.email.send.sender">If sending an E-Mail, you can set the sender address to be shown to the recipient, in the E-Mail editing window.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.sender">
 <p class="title">How to select your sender address in the Email editing window:</p>
@@ -59,11 +59,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.sender"></p>
 <p class="title">Superordinated action:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Adding E-Mail Accounts</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.sender">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p id="ox.appsuite.user.parent.email.send.sender">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.signatures.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.signatures.html
index 03d758187..fdab84427 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.signatures.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.signatures.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.templates.html" title="Using templates">
 <link rel="next" href="ox.appsuite.user.sect.email.send.reply.html" title="Replying to email messages">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Sending Email Messages</h2>
+<h2 class="sr-only">send email messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.signatures">
 <div class="titlepage"><div><div><h3 class="title">Using signatures</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.12.2"></a><a class="indexterm" name="id-1.7.11.12.3"></a><p id="ox.appsuite.user.concept.email.send.signatures">An email signature is text that will be entered automatically in the email when being composed or replied to or forwarded. It is typically used for inserting the name, company, and contact address at the bottom of the email text. You can create signatures in plain text or HTML format. The following functions are available: </p>
@@ -91,7 +91,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.signatures"></p>
 <p class="title">Superordinated action:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -99,7 +99,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Adding E-Mail Accounts</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.signatures">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p id="ox.appsuite.user.parent.email.send.signatures">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.templates.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.templates.html
index 2dac5bda6..63b01874d 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.templates.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.templates.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Sending attachments as link">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="send attachments as link">
 <link rel="next" href="ox.appsuite.user.sect.email.send.signatures.html" title="Using signatures">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Sending Email Messages</h2>
+<h2 class="sr-only">send email messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.templates">
 <div class="titlepage"><div><div><h3 class="title">Using templates</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.11.2"></a><a class="indexterm" name="id-1.7.11.11.3"></a><p id="ox.appsuite.user.concept.email.send.templates">Templates are text modules that you can write once and then insert into your email messages as often as you like. As a result, you only have to write frequently used phrases once. Templates, signatures and email drafts differ in the following ways: </p>
@@ -88,7 +88,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.templates"></p>
 <p class="title">Superordinated action:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -96,7 +96,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Using E-Mail drafts</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.templates">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p id="ox.appsuite.user.parent.email.send.templates">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.vacationnotice.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.vacationnotice.html
index a71aa2433..ba0308567 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.send.vacationnotice.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.send.vacationnotice.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Email Messages">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send email messages">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attendees.html" title="Sending an E-Mail to appointment participants">
 <link rel="next" href="ox.appsuite.user.sect.email.openai.html" title="Using the AI Integration">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Sending Email Messages</h2>
+<h2 class="sr-only">send email messages</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.vacationnotice">
 <div class="titlepage"><div><div><h3 class="title">Sending a vacation notice automatically</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.17.2"></a><a class="indexterm" name="id-1.7.11.17.3"></a><p id="ox.appsuite.user.concept.email.send.vacationnotice">A vacation notice informs the sender of an E-Mail that you will not retrieve your E-Mails for a specific period of time. You can set the following: </p>
@@ -81,14 +81,14 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to email messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding email messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatically forwarding email messages</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">Using E-Mail Filters</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.vacationnotice">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Email Messages</a></p>
+<p id="ox.appsuite.user.parent.email.send.vacationnotice">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send email messages</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.settings.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.settings.html
index c53fda580..014dba2f4 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.settings.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.settings.html
@@ -55,8 +55,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.composereply">Compose &amp; Reply</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.20.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">Templates</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.rules">Rules</a></p></li>
-<li class="listitem feat-zoom" id="id-1.7.20.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">AI integration</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.7.20.5.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Advanced settings</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">AI integration</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Advanced settings</a></p></li>
 </ul>
 <p>Also see: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p>
 <p id="ox.appsuite.user.reference.email.settings.reading"></p>
@@ -64,31 +64,32 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>layout. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Defines the layout of the list view and the detail view in the display area.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>Layout. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Defines the layout of the list view and the detail view in the display area.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>message list. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a>
+<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>Message list. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.list"><b>Contact pictures, checkboxes, simple. </b>Defines whether contact images, checkboxes or none of these elements will be displayed in the list view.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.preview"><b>Show text preview. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.2.1.2"></a>Defines whether the first words of the mail content will be displayed in the email list view.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Always show full date and time. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Defines whether not only the date of receipt but also the time of receipt will be displayed in the email list view.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Show message size. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Defines whether an email’s size will be displayed in the email list view.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.20.6.2.1.2.1.3.1.3"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>Show categories. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Defines whether the categories assigned to the email will be displayed in the email list view.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Always show full date and time. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Defines whether not only the date of receipt but also the time of receipt will be displayed in the email list view.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Show message size. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.5.1.2"></a>Defines whether an email’s size will be displayed in the email list view.</p></li>
 </ul>
 <p>
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>reading pane. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a>
+<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>Reading pane. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>show quoted text in different colour. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Specifies whether original messages are highlighted and introduced with a vertical line. This option assumes that the original mail text is not attached but appended to the E-Mail.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>Show quoted text in different colour. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Specifies whether original messages are highlighted and introduced with a vertical line. This option assumes that the original mail text is not attached but appended to the E-Mail.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.fixedfont"><b>Use fixed-width font for plain text email messages. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.2.1.2"></a>Specifies whether a fixed-width font is used when displaying a plain text E-Mail.</p></li>
 </ul>
 <p>
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>mark as read. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Defines the period after which an email will be automatically marked as read when selecting the email. </p>
+<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>Mark as read. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Defines the period after which an email will be automatically marked as read when selecting the email. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.immediately"><b>Immediately. </b>The email will immediately be marked as read.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.seconds"><b>After 5 seconds, after 20 seconds. </b>The email will be marked as read after the period defined.</p></li>
@@ -126,7 +127,7 @@
 <p role="presentation">Note: The sender's name is displayed in front of the sender address. If you enter a name in the <span class="guibutton"><strong>Your name</strong></span> input field in the account settings, this name overwrites the preset sender name.</p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>message format. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Defines the format in which email messages are sent: </p>
+<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>Message format. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Defines the format in which email messages are sent: </p>
 <ul class="itemizedlist" style="list-style-type: square; ">
 <li class="listitem"><p><b>HTML. </b>The email will be sent with HTML markup. You can format the email text.</p></li>
 <li class="listitem"><p><b>Plain text. </b>The email text will be sent as plain text without formatting.</p></li>
@@ -173,10 +174,10 @@
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.html"><b>Allow displaying HTML formatted email messages. </b><a class="indexterm" name="id-1.7.20.12.2.1.1.1.2"></a>Specifies whether or not displaying HTML messages is allowed.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>show requests for read receipts. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Defines whether a return receipt is displayed if a received E-Mail includes a receipt confirmation request.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>Show requests for read receipts. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Defines whether a return receipt is displayed if a received E-Mail includes a receipt confirmation request.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>permanently remove deleted email messages. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Defines whether deleted E-Mail messages will be removed permanently or whether they will go to the trash folder.</p>
-<p role="presentation"><span class="phrase"><strong>Warning:</strong></span> Permanently removed E-Mail messages can not be restored.</p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>Permanently remove deleted email messages. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Defines whether deleted E-Mail messages will be removed permanently or whether they will go to the trash folder.</p>
+<p role="presentation"><span class="phrase"><strong>Warning:</strong></span> Depending on the configuration, permanently deleted email messages <span class="bold">cannot</span> be recovered.</p>
 <p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting E-Mail messages</a></p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.selectrecent"><b>Select newest read message automatically at start. </b><a class="indexterm" name="id-1.7.20.12.2.1.4.1.2"></a>Defines whether the most recent read message will be selected automatically when starting the app.</p></li>
@@ -187,7 +188,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.mailinglist"><b>Ask before replying to a mailing list. </b><a class="indexterm" name="id-1.7.20.12.2.1.9.1.2"></a>Defines whether you have to confirm the recipient when replying to a mailing list.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.appendvcard"><b>Always attach my detailed contact data as vCard. </b><a class="indexterm" name="id-1.7.20.12.2.1.10.1.2"></a>Specifies whether your contact data will be attached to a new email in the vCard format.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>forward email messages as. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Specifies how an E-Mail text is sent when forwarding the E-Mail. </p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>Forward email messages as. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Specifies how an E-Mail text is sent when forwarding the E-Mail. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p><b>Inline. </b>The text is sent within the new E-Mail text.</p></li>
 <li class="listitem"><p><b>Attachment. </b>The text is sent as attachment to the new E-Mail.</p></li>
@@ -204,7 +205,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
@@ -224,7 +225,7 @@
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Email Messages</a>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.email.view.html b/help/l10n/en_GB/ox.appsuite.user.sect.email.view.html
index e9fa3bb58..d76ea1f92 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.email.view.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.email.view.html
@@ -82,11 +82,10 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">E-Mail</span> list view</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">E-Mail</span> detail view</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving email Attachments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marking email messages as read or unread</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.firststeps.gui.notificationarea.html b/help/l10n/en_GB/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
index 2aafe11ba..c76766d64 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
@@ -83,7 +83,7 @@
               <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Use the notification area</a>
+              <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">use the notification area</a>
             </p>
 <p role="presentation" class="cap-calendar">
               <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.autocrypt.manage.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.autocrypt.manage.html
index b99d5dc6c..12459d7f5 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.guard.autocrypt.manage.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.autocrypt.manage.html
@@ -80,7 +80,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Settings</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importing Autocrypt keys</a>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.createencrypted.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.createencrypted.html
index b44f7be1d..95d63c257 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.createencrypted.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.createencrypted.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Encrypting Office documents">
-<link rel="prev" href="ox.appsuite.user.sect.guard.documents.html" title="Encrypting Office documents">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Encrypting Office Documents">
+<link rel="prev" href="ox.appsuite.user.sect.guard.documents.html" title="Encrypting Office Documents">
 <link rel="next" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html" title="Saving selected documents in an encrypted format">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Encrypting Data with <span class="phrase">Guard</span>
 </h1>
-<h2 class="sr-only">Encrypting Office documents</h2>
+<h2 class="sr-only">Encrypting Office Documents</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.createencrypted">
 <div class="titlepage"><div><div><h3 class="title">Creating new encrypted documents</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.8.2"></a><a class="indexterm" name="id-1.14.10.8.3"></a><a class="indexterm" name="id-1.14.10.8.4"></a><p id="ox.appsuite.user.concept.guard.documents.createencrypted">When creating a new document, you can create a document that will be encrypted.. The following options are available: </p>
@@ -84,7 +84,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.guard.documents.createencrypted">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office documents</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.createencrypted">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office Documents</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.html
index a7f0664c2..3bfc6e3f5 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Encrypting Office documents</title>
+<title>Encrypting Office Documents</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -32,7 +32,7 @@
   <h1 class="sr-only">Encrypting Data with <span class="phrase">Guard</span>
 </h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.documents">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Encrypting Office documents</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Encrypting Office Documents</h2></div></div></div>
 <a class="indexterm" name="id-1.14.10.2"></a><a class="indexterm" name="id-1.14.10.3"></a><a class="indexterm" name="id-1.14.10.4"></a><a class="indexterm" name="id-1.14.10.5"></a><p id="ox.appsuite.user.concept.guard.documents">The following options are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.createencrypted.html">Creating new encrypted documents</a></p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.open.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.open.html
index bed1b39c6..6ada74e08 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.open.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.open.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Encrypting Office documents">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Encrypting Office Documents">
 <link rel="prev" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html" title="Saving selected documents in an encrypted format">
 <link rel="next" href="ox.appsuite.user.sect.guard.logout.html" title="Signing Out from Guard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Encrypting Data with <span class="phrase">Guard</span>
 </h1>
-<h2 class="sr-only">Encrypting Office documents</h2>
+<h2 class="sr-only">Encrypting Office Documents</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.open">
 <div class="titlepage"><div><div><h3 class="title">Opening encrypted documents</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.10.2"></a><a class="indexterm" name="id-1.14.10.10.3"></a><p id="ox.appsuite.user.concept.guard.documents.open">You can open an encrypted document to do the following: </p>
@@ -75,7 +75,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.guard.documents.open">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office documents</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.open">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office Documents</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.saveencrypted.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.saveencrypted.html
index 4c4c7d0e1..67de38dba 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.saveencrypted.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.documents.saveencrypted.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Encrypting Office documents">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Encrypting Office Documents">
 <link rel="prev" href="ox.appsuite.user.sect.guard.documents.createencrypted.html" title="Creating new encrypted documents">
 <link rel="next" href="ox.appsuite.user.sect.guard.documents.open.html" title="Opening encrypted documents">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Encrypting Data with <span class="phrase">Guard</span>
 </h1>
-<h2 class="sr-only">Encrypting Office documents</h2>
+<h2 class="sr-only">Encrypting Office Documents</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.saveencrypted">
 <div class="titlepage"><div><div><h3 class="title">Saving selected documents in an encrypted format</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.9.2"></a><a class="indexterm" name="id-1.14.10.9.3"></a><p id="ox.appsuite.user.concept.guard.documents.saveencrypted">When having opened a text document, spreadsheet or a presentation, you can save this document in an encrypted format.</p>
@@ -68,7 +68,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.guard.documents.saveencrypted">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office documents</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.saveencrypted">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office Documents</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.drive.decrypt.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.drive.decrypt.html
index a09fa816a..d4c70cc62 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.guard.drive.decrypt.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.drive.decrypt.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.guard.drive.html" title="Encrypting or Decrypting Files">
 <link rel="prev" href="ox.appsuite.user.sect.guard.drive.download.html" title="Downloading encrypted files">
-<link rel="next" href="ox.appsuite.user.sect.guard.documents.html" title="Encrypting Office documents">
+<link rel="next" href="ox.appsuite.user.sect.guard.documents.html" title="Encrypting Office Documents">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.email.send.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.email.send.html
index c60ef7d80..2ef9d9e53 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.guard.email.send.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.email.send.html
@@ -49,7 +49,7 @@
 <p role="presentation">You can also click on <span class="guibutton"><strong>Settings</strong></span> in the App Launcher.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
-<li class="step"><p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane.</p></li>
+<li class="step"><p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>S/MIME</strong></span> in the right pane.</p></li>
 <li class="step">
 <p role="presentation">Enable <span class="guibutton"><strong>Enable S/MIME</strong></span>.</p>
 <p role="presentation">If S/MIME encryption should be set as default, enable <span class="guibutton"><strong>Default to using S/MIME for signing and encryption</strong></span> below <span class="guibutton"><strong>Defaults</strong></span>.</p>
@@ -75,7 +75,7 @@
 <li class="listitem"><p role="presentation">To enable The E-Mail recipient to send an encrypted reply, the recipient needs to have your public key. You can send your public key as an attachment. To do so, enable <span class="guibutton"><strong>Attach my public key</strong></span>.</p></li>
 <li class="listitem">
 <p role="presentation">When using PGP, the following option applies:</p>
-<p role="presentation">If <span class="guibutton"><strong>Show advanced settings</strong></span> is enabled in the <span class="phrase">Guard</span> settings, you can set the PGP format.</p>
+<p role="presentation">You can set the PGP format if the <span class="guibutton"><strong>Show advanced settings when composing email</strong></span> option has been enabled in the <span class="phrase">Guard</span> settings under <span class="guibutton"><strong>Advanced</strong></span>.</p>
 <p role="presentation">By default, encrypted email messages are sent in <span class="guibutton"><strong>MIME</strong></span> format. Some older email clients only support PGP/Inline. If the recipient uses such a client, enable <span class="guibutton"><strong>Inline</strong></span>.</p>
 <p role="presentation">Note: If you use <span class="guibutton"><strong>Inline</strong></span>, you can not send E-Mail messages in HTML format.</p>
 </li>
@@ -98,8 +98,8 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.read.html">Reading encrypted E-Mail messages</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.external.html">How can external recipients read an encrypted E-Mail?</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Settings</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new email messages</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.email.send">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.email.html">Encrypting E-Mail Conversations</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.html
index 6b5866a52..921f5478d 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Encrypting Data with Guard">
-<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Password Management">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Removing the password reset function">
 <link rel="next" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Managing own PGP keys">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Next</a></li>
@@ -44,9 +44,24 @@
 <p id="ox.appsuite.user.possibilities.guard.keys">The following options are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Managing own PGP keys</a></p></li>
-<li class="listitem cap-smime" id="id-1.14.13.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Managing own S/MIME keys</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing public keys</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing PGP keys of recipients</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Managing own S/MIME keys</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Managing S/MIME keys of recipients</a></p></li>
 </ul>
+<p id="ox.appsuite.user.related.guard.keys">
+      </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Password Management</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a>
+          </p></li>
+</ul>
+<p>
+    </p>
+<p id="ox.appsuite.user.parent.guard.keys">Parent topic: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Encrypting Data with <span class="phrase">Guard</span></i></a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.pgppublickeys.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
index e32c608ee..836a09f1c 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Managing public keys</title>
+<title>Managing PGP keys of recipients</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Key Management">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Managing own S/MIME keys">
-<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Guard Settings">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Managing own PGP keys">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Managing own S/MIME keys">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,55 +33,36 @@
 </h1>
 <h2 class="sr-only">Key Management</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.pgppublickeys">
-<div class="titlepage"><div><div><h3 class="title">Managing public keys</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">On the <span class="phrase"><span class="guilabel"><strong>Guard security settings</strong></span></span> page, you can: </p>
+<div class="titlepage"><div><div><h3 class="title">Managing PGP keys of recipients</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.8.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">The following options are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">display public keys</p></li>
+<li class="listitem"><p role="presentation">view or delete public keys</p></li>
 <li class="listitem"><p role="presentation">upload public keys</p></li>
-<li class="listitem"><p role="presentation">delete your own public key</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.guard.pgppublickeys">
-<p class="title">How to use the key management functions:</p>
+<p class="title">How to display the PGP keys of recipients:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
-<p role="presentation">You can also click on <span class="guibutton"><strong>Settings</strong></span> in the App Launcher.</p>
-<p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>Recipient PGP Keys</strong></span> in the right pane.</p>
+<p role="presentation">The public PGP keys of recipients will be displayed.</p>
 </li>
 <li class="step">
-<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane.</p>
-<p role="presentation">The <span class="phrase"><span class="guilabel"><strong>Guard security settings</strong></span></span> page will be displayed.</p>
-</li>
-<li class="step">
-<p role="presentation">Enable <span class="guibutton"><strong>Show advanced settings</strong></span>.</p>
-<p role="presentation">The key management functions will be displayed.</p>
+<p role="presentation">To show details for a key, click on the key ID.</p>
+<p role="presentation">In order to delete a key, click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> next to the key.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.display">
-<p class="title">How to show public keys:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
+<p class="title">How to upload a recipient's public key:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Public keys of recipients</strong></span>. The <span class="guilabel"><strong>Puplic Keys</strong></span> window opens.</p>
-<p role="presentation">The public keys shared by you or other users are displayed. If a user's public key is displayed in this list, you can send an encrypted E-Mail to this user and verify signed E-Mail messages that have been sent to you by this user.</p>
-</li>
-<li class="step">
-<p role="presentation">To display details for a key, click the <span class="guibutton"><strong>Details</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> next to a key. The <span class="guilabel"><strong>Public Keys Detail</strong></span> window opens.</p>
-<p role="presentation">You can share public keys by enabling <span class="guibutton"><strong>Share key</strong></span>. Other users can view and download your shared keys. Public keys are only available for groupware users.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>Recipient PGP Keys</strong></span> in the right pane.</p>
 </li>
+<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Upload Recipient Key</strong></span>. Select a file containing a public key.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
-<p class="title">How to upload a recipient's public key in the <span class="guilabel"><strong>Public Keys</strong></span> window:</p>
-<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Add</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.upload.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to <span class="guilabel"><strong>PGP Public Key List</strong></span>. Select a file containing a public key.</p></li></ul></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.delete">
-<p class="title">How to delete a public key in the <span class="guilabel"><strong>Public Keys</strong></span> window:</p>
-<div class="procedure"><ul class="procedure"><li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> next to a public key.</p>
-<p role="presentation">Confirm that you want to delete the public key.</p>
-</li></ul></div>
-</div>
 <p id="ox.appsuite.user.related.guard.keys.pgppublickeys">
         </p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.smimepublickeys.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
new file mode 100644
index 000000000..1109f1000
--- /dev/null
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
@@ -0,0 +1,85 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Managing S/MIME keys of recipients</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Key Management">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Managing own S/MIME keys">
+<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="GuardSettings">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Encrypting Data with <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Key Management</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.keys.smimepublickeys">
+<div class="titlepage"><div><div><h3 class="title">Managing S/MIME keys of recipients</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.10.2"></a><p id="ox.appsuite.user.concept.guard.keys.smimepublickeys">The following options are available: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">display public keys</p></li>
+<li class="listitem"><p role="presentation">upload public keys</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.smimepublickeys">
+<p class="title">How to display a recipient’s SMIME key:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>S/MIME Recipients</strong></span> in the right pane.</p>
+</li>
+<li class="step">
+<p role="presentation">Enter an email address in <span class="guibutton"><strong>Search for Certificate</strong></span>. Click on <span class="guibutton"><strong>Search</strong></span>.</p>
+<p role="presentation">If a certificate has been found, the certificate’s data will be displayed.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.guard.keys.smimepublickeys.upload">
+<p class="title">How to upload a recipient's public key:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>S/MIME Recipients</strong></span> in the right pane.</p>
+</li>
+<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Upload Recipient Certificate</strong></span>. Select a file containing a public key.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.keys.smimepublickeys">
+        </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Managing own PGP keys</a>
+            </p>
+<p role="presentation" class="cap-smime">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Managing own S/MIME keys</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Password Management</a>
+            </p>
+</li></ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.keys.smimepublickeys">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
index a06536fbe..30012941e 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Key Management">
 <link rel="prev" href="ox.appsuite.user.sect.guard.keys.html" title="Key Management">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Managing own S/MIME keys">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Managing PGP keys of recipients">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,121 +34,93 @@
 <h2 class="sr-only">Key Management</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yourpgpkeys">
 <div class="titlepage"><div><div><h3 class="title">Managing own PGP keys</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.5.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">On the <span class="phrase"><span class="guilabel"><strong>Guard security settings</strong></span></span>    page, you can: </p>
+<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">The following options are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">add new PGP keys</p></li>
 <li class="listitem"><p role="presentation">display own PGP keys, display details</p></li>
-<li class="listitem">
-<p role="presentation">add new PGP keys</p>
-<p role="presentation">If you own several keys, you can define which key should be the current one. The current key is used for encrypting data.</p>
-</li>
-<li class="listitem">
-<p role="presentation">add user IDs</p>
-<p role="presentation">When adding additional user IDs to a key, you can use the key for multiple E-Mail accounts.</p>
-</li>
-<li class="listitem"><p role="presentation">download keys</p></li>
-<li class="listitem"><p role="presentation">delete keys</p></li>
+<li class="listitem"><p role="presentation">manage own PGP keys: make current, edit IDs, revoke, download, delete </p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys">
-<p class="title">How to use the PGP key management functions:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.add">
+<p class="title">How to add a new PGP key:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
-<p role="presentation">You can also click on <span class="guibutton"><strong>Settings</strong></span> in the App Launcher.</p>
-<p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.addkey"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>Your PGP keys</strong></span> in the right pane.</p>
 </li>
 <li class="step">
-<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane.</p>
-<p role="presentation">The <span class="phrase"><span class="guilabel"><strong>Guard security settings</strong></span></span> page will be displayed.</p>
+<p role="presentation">The following options are available: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">To create a new key pair, click on <span class="guibutton"><strong>Create New</strong></span>. The <span class="phrase"><span class="guilabel"><strong>Create GuardSecurity Keys</strong></span></span> window opens.</p>
+<p role="presentation">Enter a password for the new key. Confirm the password.</p>
+<p role="presentation">The new key consists of a master key and a corresponding sub-key.</p>
 </li>
-<li class="step">
-<p role="presentation">Enable <span class="guibutton"><strong>Show advanced settings</strong></span>.</p>
-<p role="presentation">The key management functions will be displayed.</p>
+<li class="listitem">
+<p role="presentation">To add an existing private key, click on <span class="guibutton"><strong>Upload Private Key</strong></span>. Select a file containing a private key. The <span class="guilabel"><strong>Upload Private Keys</strong></span> window opens.</p>
+<p role="presentation">To upload the new key, enter your <span class="phrase">Guard</span> security password. Enter a new password for the new key.</p>
+</li>
+<li class="listitem"><p role="presentation">To add an existing public key, click on <span class="guibutton"><strong>Upload Public Key</strong></span>. Select a file containing a public key.</p></li>
+</ul></p>
+<p role="presentation">The new key will be entered on top of your key list. The new key becomes the current key.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.display">
-<p class="title">How to display your own PGP keys or make a PGP key the current one:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.display">
+<p class="title">How to view your existing PGP keys:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Your keys</strong></span> below <span class="guilabel"><strong>Keys</strong></span>.</p>
-<p role="presentation" class="cap-smime">Depending on the configuration, the <span class="guilabel"><strong>Select type of keys to change</strong></span> opens. Select <span class="guibutton"><strong>PGP</strong></span>.</p>
-<p role="presentation">The <span class="guilabel"><strong>Your Keys</strong></span> window opens.</p>
-<p role="presentation">
-              <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Your PGP keys will be displayed. Each PGP key consists of a master key and a subkey. <ul class="itemizedlist" style="list-style-type: circle; ">
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>Your PGP keys</strong></span> in the right pane.</p>
+<p role="presentation">Your PGP keys will be displayed. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Each PGP key consists of a master key and a subkey. <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Among other things, the master key is used for signing your E-Mail messages.</p></li>
 <li class="listitem"><p role="presentation">The subkey will be used for encrypting and decrypting.</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">Depending on the requirement, <span class="phrase">Guard</span> automatically uses the master key or the subkey.</p></li>
-</ul>
-            </p>
+</ul></p>
 </li>
-<li class="step"><p role="presentation">If your key list contains more than one key, you can define the current key. To do so, enable the <span class="guibutton"><strong>Current</strong></span> checkbox next to the main key. From now on, the current key will be used for encryption.</p></li>
-<li class="step"><p role="presentation">To display details for a key, click the <span class="guibutton"><strong>Details</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> next to a key. The <span class="guilabel"><strong>Key Details</strong></span> window opens. To view the key's signatures, click on <span class="guibutton"><strong>Signatures</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addkey">
-<p class="title">How to add a new PGP key in the <span class="guilabel"><strong>Your Keys</strong></span> window:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Add user key</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to <span class="guibutton"><strong>Your Key List</strong></span> The <span class="guilabel"><strong>Adding Keys</strong></span> window opens.</p></li>
 <li class="step">
-<p role="presentation">The following options are available: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-<p role="presentation">To add a private key, click on <span class="guibutton"><strong>Upload Private Key</strong></span>. Select a file containing a private key. The <span class="guilabel"><strong>Upload Private Keys</strong></span> window opens.</p>
-<p role="presentation">To upload the new key, enter your <span class="phrase">Guard</span> security password. Enter a new password for the new key.</p>
-</li>
-<li class="listitem"><p role="presentation">To add a public key, click on <span class="guibutton"><strong>Upload Public Key Only</strong></span>. Select a file containing a public key.</p></li>
-<li class="listitem">
-<p role="presentation">To create a new key pair, click on <span class="guibutton"><strong>Create New Keys</strong></span>. The <span class="phrase"><span class="guilabel"><strong>Create GuardSecurity Keys</strong></span></span> window opens.</p>
-<p role="presentation">Enter a password for the new key. Confirm the password.</p>
-<p role="presentation">The new key consists of a master key and a corresponding sub-key.</p>
-</li>
-</ul></p>
-<p role="presentation">The new key will be entered on top of your key list. The new key becomes the current key.</p>
+<p role="presentation">To display details for a key, click the <span class="guibutton"><strong>Manage keys</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> next to a master key. The <span class="guilabel"><strong>Key Details</strong></span> window opens.</p>
+<p role="presentation">To view the key's signatures, click on <span class="guibutton"><strong>Signatures</strong></span>.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addaccount">
-<p class="title">How to add an additional user ID in the <span class="guilabel"><strong>Your Keys</strong></span> window:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.manage">
+<p class="title">How to manage your existing PGP keys:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Edit IDs</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addaccount.edit"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> next to a key. The <span class="guilabel"><strong>Add User ID</strong></span> window opens.</p></li>
 <li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>Your PGP keys</strong></span> in the right pane.</p>
+<p role="presentation">Your PGP keys will be displayed.</p>
+</li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Manage keys</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> next to a master key. Use the following functions. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">If your key list contains more than one key, you can define the current key. To do so, click on <span class="guibutton"><strong>Mark current</strong></span>. From now on, the current key will be used for encryption.</p></li>
+<li class="listitem">
+<p role="presentation">If you want to use the key for another email account, click on <span class="guibutton"><strong>Edit IDs</strong></span>. The <span class="guilabel"><strong>Add User ID</strong></span> window opens.</p>
 <p role="presentation">Enter a name for the user ID. Enter the E-Mail address that you want to use for this key.</p>
 <p role="presentation">Enter your password for this key.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.download">
-<p class="title">How to download a key in the <span class="guilabel"><strong>Your Keys</strong></span> window:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Download</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> next to a key.</p></li>
-<li class="step">
+<li class="listitem">
+<p role="presentation">To download a private key, click on <span class="guibutton"><strong>Download</strong></span>.</p>
 <p role="presentation">Define whether to download your private key only, your public key only or both keys.</p>
 <p role="presentation"><span class="phrase"><strong>Caution:</strong></span> Your private key will be downloaded in encrypted form. You should not download your private key to a publicly accessible system, though.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.delete">
-<p class="title">How to delete a key in the <span class="guilabel"><strong>Your Keys</strong></span> window:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Warning:</strong></span> If you delete a private key, you can no longer decrypt objects that have been encrypted with this key. If you are unsure, you should not delete the key but revoke it. A revoked key can no longer be used for encryption. But you can still decrypt objects that have been encrypted with this key.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> next to a key. The <span class="guilabel"><strong>Delete Private Key</strong></span> window opens.</p></li>
-<li class="step"><p role="presentation">The following options are available: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">In order to revoke or delete a private key, click on <span class="guibutton"><strong>Delete</strong></span>. The <span class="guilabel"><strong>Delete Private Key</strong></span> window opens. Notes: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">if you revoke a key, it will no longer be used. But you can still decrypt objects that have been encrypted with this key. For this reason, revoking a key is better than deleting it.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Warning:</strong></span> If you delete a private key, you can no longer decrypt objects that have been encrypted with this key.</p></li>
+</ul> <p role="presentation">The following options are available:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">To revoke a private key, click on <span class="guibutton"><strong>Revoke</strong></span>.</p>
-<p role="presentation">if you revoke a key, it will no longer be used. But you can still decrypt objects that have been encrypted with this key. For this reason, revoking a key is better than deleting it.</p>
 <p role="presentation">Enter the password for the private key. If required, select a reason for revoking the key.</p>
 <p role="presentation">Click on <span class="guibutton"><strong>Revoke</strong></span>.</p>
+<p role="presentation">You can also click on <span class="guibutton"><strong>Revoke</strong></span> in the menu.</p>
 </li>
 <li class="listitem">
 <p role="presentation">In order to delete a private key, click on <span class="guibutton"><strong>Delete</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Warning:</strong></span> If you delete a private key, you can no longer decrypt objects that have been encrypted with this key.</p>
 <p role="presentation">Enter the password for the private key.</p>
 <p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> button.</p>
 </li>
 </ul> When deleting a master key, the corresponding subkey will be deleted too.</p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yourpgpkeys">
@@ -156,7 +128,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing public keys</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing PGP keys of recipients</a>
             </p>
 <p role="presentation" class="cap-smime">
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Managing own S/MIME keys</a>
@@ -167,7 +139,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yourpgpkeys">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yourpgpkeys">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
index 6fae2dbf3..528e56d70 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Key Management">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Managing own PGP keys">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Managing public keys">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Managing PGP keys of recipients">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Managing S/MIME keys of recipients">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,46 +34,27 @@
 <h2 class="sr-only">Key Management</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yoursmimekeys">
 <div class="titlepage"><div><div><h3 class="title">Managing own S/MIME keys</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.6.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">On the <span class="phrase"><span class="guilabel"><strong>Guard security settings</strong></span></span>    page, you can: </p>
+<a class="indexterm" name="id-1.14.13.9.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">The following options are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">add new S/MIME keys</p>
 <p role="presentation">If you own several keys, you can define which key should be the current one. The current key is used for encrypting data.</p>
 </li>
 <li class="listitem"><p role="presentation">display own S/MIME keys, display details</p></li>
-<li class="listitem"><p role="presentation">download keys</p></li>
-<li class="listitem"><p role="presentation">delete keys</p></li>
+<li class="listitem"><p role="presentation">manage your S/MIME keys: make current, edit IDs, revoke, download, delete</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys">
-<p class="title">How to use the S/MIME key management functions:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
-<p role="presentation">You can also click on <span class="guibutton"><strong>Settings</strong></span> in the App Launcher.</p>
-<p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
-</li>
-<li class="step">
-<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane.</p>
-<p role="presentation">The <span class="phrase"><span class="guilabel"><strong>Guard security settings</strong></span></span> page will be displayed.</p>
-</li>
-<li class="step">
-<p role="presentation">Activate <span class="guibutton"><strong>Enable S/MIME</strong></span>.</p>
-<p role="presentation">Enable <span class="guibutton"><strong>Show advanced settings</strong></span>.</p>
-<p role="presentation">The key management functions will be displayed.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.addkey">
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.add">
 <p class="title">How to add a new S/MIME key:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Your keys</strong></span> below <span class="guibutton"><strong>Keys</strong></span>. The <span class="guilabel"><strong>Select type of keys to change</strong></span> window opens.</p>
-<p role="presentation">Select <span class="guibutton"><strong>S/MIME</strong></span>. The <span class="guilabel"><strong>Your Certificates</strong></span> window opens.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>S/MIME</strong></span> in the right pane.</p>
+<p role="presentation">Enable <span class="guibutton"><strong>Enable S/MIME</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Add</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to <span class="guilabel"><strong>Your Key List</strong></span>. The <span class="guilabel"><strong>Upload S/MIME Keys</strong></span> window opens.</p></li>
 <li class="step">
+<p role="presentation">Click on <span class="guibutton"><strong>Upload private certificate</strong></span>. The <span class="guilabel"><strong>Upload S/MIME Keys</strong></span> window opens.</p>
 <p role="presentation">Enter the following passwords: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">To upload the new key, enter your <span class="phrase">Guard</span> security password. Enter a new password for the new key.</p></li>
+<li class="listitem"><p role="presentation">Your <span class="phrase">Guard</span> security password for uploading the new key.</p></li>
 <li class="listitem">
 <p role="presentation">A new password for encrypting email messages.</p>
 <p role="presentation">Confirm the new password.</p>
@@ -85,48 +66,51 @@
 </ol></div>
 </div>
 <div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.display">
-<p class="title">How to display your own S/MIME keys or make a S/MIME key the current one:</p>
+<p class="title">How to view your own S/MIME keys:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Your keys</strong></span> below <span class="guilabel"><strong>Keys</strong></span>. The <span class="guilabel"><strong>Select type of keys to change</strong></span> window opens.</p>
-<p role="presentation">Select <span class="guibutton"><strong>S/MIME</strong></span>.</p>
-<p role="presentation">The <span class="guilabel"><strong>Your Certificates</strong></span> window opens. Your S/MIME keys will be displayed.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>S/MIME</strong></span> in the right pane.</p>
+<p role="presentation">Enable <span class="guibutton"><strong>Enable S/MIME</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">To display details for a key, click the <span class="guibutton"><strong>Manage keys</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> next to a key. The <span class="guilabel"><strong>Key Details</strong></span> window opens.</p>
+<p role="presentation">To view the key's signatures, click on <span class="guibutton"><strong>Signatures</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">If your key list contains more than one key, you can define the current key. To do so, enable the <span class="guibutton"><strong>Current</strong></span> checkbox next to the main key. From now on, the current key will be used for encryption.</p></li>
-<li class="step"><p role="presentation">To display details for a key, click the <span class="guibutton"><strong>Details</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> next to a key. The <span class="guilabel"><strong>Key Details</strong></span> window opens. To view the key's signatures, click on <span class="guibutton"><strong>Signatures</strong></span>.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.download">
-<p class="title">How to download a key in the <span class="guilabel"><strong>Your Keys</strong></span> window:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.manage">
+<p class="title">How to manage your existing S/MIME keys:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Download</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> next to a key.</p></li>
 <li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>S/MIME</strong></span> in the right pane.</p>
+<p role="presentation">Enable <span class="guibutton"><strong>Enable S/MIME</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Manage keys</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> next to a key. Use the following functions. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">If your key list contains more than one key, you can define the current key. To do so, click on <span class="guibutton"><strong>Mark current</strong></span>. From now on, the current key will be used for encryption.</p></li>
+<li class="listitem">
+<p role="presentation">To download a private key, click on <span class="guibutton"><strong>Download</strong></span>.</p>
 <p role="presentation">Define whether to download your private key only, your public key only or both keys.</p>
 <p role="presentation"><span class="phrase"><strong>Caution:</strong></span> Your private key will be downloaded in encrypted form. You should not download your private key to a publicly accessible system, though.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.delete">
-<p class="title">How to delete a key in the <span class="guilabel"><strong>Your Keys</strong></span> window:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Warning:</strong></span> If you delete a private key, you can no longer decrypt objects that have been encrypted with this key. If you are unsure, you should not delete the key but revoke it. A revoked key can no longer be used for encryption. But you can still decrypt objects that have been encrypted with this key.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> next to a key. The <span class="guilabel"><strong>Delete Private Key</strong></span> window opens.</p></li>
-<li class="step"><p role="presentation">The following options are available: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">In order to revoke or delete a private key, click on <span class="guibutton"><strong>Delete</strong></span>. The <span class="guilabel"><strong>Delete Private Key</strong></span> window opens. Notes: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">if you revoke a key, it will no longer be used. But you can still decrypt objects that have been encrypted with this key. For this reason, revoking a key is better than deleting it.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Warning:</strong></span> If you delete a private key, you can no longer decrypt objects that have been encrypted with this key.</p></li>
+</ul> <p role="presentation">The following options are available:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">To revoke a private key, click on <span class="guibutton"><strong>Revoke</strong></span>.</p>
-<p role="presentation">if you revoke a key, it will no longer be used. But you can still decrypt objects that have been encrypted with this key. For this reason, revoking a key is better than deleting it.</p>
 <p role="presentation">Enter the password for the private key. If required, select a reason for revoking the key.</p>
 <p role="presentation">Click on <span class="guibutton"><strong>Revoke</strong></span>.</p>
+<p role="presentation">You can also click on <span class="guibutton"><strong>Revoke</strong></span> in the menu.</p>
 </li>
 <li class="listitem">
 <p role="presentation">In order to delete a private key, click on <span class="guibutton"><strong>Delete</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Warning:</strong></span> If you delete a private key, you can no longer decrypt objects that have been encrypted with this key.</p>
 <p role="presentation">Enter the password for the private key.</p>
 <p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> button.</p>
 </li>
 </ul></p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yoursmimekeys">
@@ -137,7 +121,7 @@
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Managing own PGP keys</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing public keys</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing PGP keys of recipients</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Password Management</a>
@@ -145,7 +129,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yoursmimekeys">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yoursmimekeys">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.password.change.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.password.change.html
new file mode 100644
index 000000000..dc89122b3
--- /dev/null
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.password.change.html
@@ -0,0 +1,75 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Changing the password</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Password Management">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Password Management">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.reset.html" title="reset the password">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.reset.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Encrypting Data with <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Password Management</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.change">
+<div class="titlepage"><div><div><h3 class="title">Changing the password</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.6.2"></a><a class="indexterm" name="id-1.14.12.6.3"></a><p role="presentation" class="cap-smime">Depending on the configuration, you can also use S/MIME for the encryption instead of PGP. For PGP and S/MIME, separate passwords will be used.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.change">
+<p class="title">How to change the <span class="phrase">Guard</span> password:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.change"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>Password Management (PGP)</strong></span><span class="cap-smime"> or on <span class="guibutton"><strong>Password Management (S/MIME)</strong></span></span> in the right pane.</p>
+</li>
+<li class="step">
+<p role="presentation">In the <span class="guibutton"><strong>Old password</strong></span> field, enter the password that you have previously used for encrypting your data.</p>
+<p role="presentation">In the <span class="guibutton"><strong>New password</strong></span> field, enter the password that you want to use for encrypting your data from now on.</p>
+<p role="presentation">Enter the new password again in the <span class="guibutton"><strong>Confirm new password</strong></span> field.</p>
+</li>
+<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Change password</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.change">
+        </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">reset the password</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Removing the password reset function</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.change">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Password Management</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.password.deleterecovery.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.password.deleterecovery.html
new file mode 100644
index 000000000..a7ef263cf
--- /dev/null
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.password.deleterecovery.html
@@ -0,0 +1,74 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Removing the password reset function</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Password Management">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.reset.html" title="reset the password">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Key Management">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.reset.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Encrypting Data with <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Password Management</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.deleterecovery">
+<div class="titlepage"><div><div><h3 class="title">Removing the password reset function</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.8.2"></a><p id="ox.appsuite.user.concept.guard.password.deleterecovery">To be able to reset your password if needed, your password has to be saved on the server in an encrypted version. If you do not want your password to be saved on the server, you can delete the password recovery.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
+<p class="title">How to remove the function for resetting the password:</p>
+<div class="taskprerequisites">
+          <p><span class="phrase"><strong>Warning:</strong></span> If you remove the function for resetting the password, you can no longer reset your password. If you forget your password afterwards, you will not be able to decrypt your encrypted data.</p>
+        </div>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.remove"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>Advanced</strong></span> in the right pane.</p>
+</li>
+<li class="step"><p role="presentation">Below <span class="guibutton"><strong>Reset options</strong></span>, click on <span class="guibutton"><strong>Delete password recovery</strong></span>. The <span class="guilabel"><strong>Delete Recovery</strong></span> window opens.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> button.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.deleterecovery">
+        </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Changing the password</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">reset the password</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.deleterecovery">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Password Management</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.password.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.password.html
index 36c61522c..525f3df11 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.guard.password.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.password.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Encrypting Data with Guard">
 <link rel="prev" href="ox.appsuite.user.sect.guard.logout.html" title="Signing Out from Guard">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Key Management">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.change.html" title="Changing the password">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.logout.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.change.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,102 +33,24 @@
 </h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.password">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Password Management</h2></div></div></div>
-<a class="indexterm" name="id-1.14.12.2"></a><a class="indexterm" name="id-1.14.12.3"></a><a class="indexterm" name="id-1.14.12.4"></a><a class="indexterm" name="id-1.14.12.5"></a><a class="indexterm" name="id-1.14.12.6"></a><p id="ox.appsuite.user.concept.guard.password">The following options are available: </p>
+<a class="indexterm" name="id-1.14.12.2"></a><p id="ox.appsuite.user.concept.guard.password">The following options are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Change the <span class="phrase">Guard</span> security password</p></li>
-<li class="listitem"><p role="presentation">When having lost your <span class="phrase">Guard</span> security password, you can request a temporary<span class="phrase">Guard</span> security password by resetting the <span class="phrase">Guard</span> security password.</p></li>
-<li class="listitem"><p role="presentation">Defining an email address for resetting the password.</p></li>
-<li class="listitem"><p role="presentation">To be able to reset your password if needed, your password has to be saved on the server in an encrypted version. If you do not want your password to be saved on the server, you can delete the password recovery.</p></li>
-<li class="listitem cap-smime" id="id-1.14.12.7.1.5"><p role="presentation">Depending on the configuration, you can also use S/MIME for the encryption instead of PGP. In this case, separate passwords for PGP and S/MIME will be used.</p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Changing the password</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">reset the password</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Removing the password reset function</a></p></li>
 </ul>
 <p> Note: Depending on the configuration, some of those functions might not be available.</p>
-<div class="task help-hide-inline" id="ox.appsuite.user.task.guard.password">
-<p class="title">How to open the password management functions:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
-<p role="presentation">You can also click on <span class="guibutton"><strong>Settings</strong></span> in the App Launcher.</p>
-<p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
-</li>
-<li class="step">
-<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane.</p>
-<p role="presentation">The <span class="phrase"><span class="guilabel"><strong>Guard security settings</strong></span></span> page will be displayed.</p>
-<p role="presentation">The password management functions will be displayed.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.change">
-<p class="title">How to change the <span class="phrase">Guard</span> password:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Change password</strong></span>.</p>
-<p role="presentation" class="cap-smime">Depending on the configuration, the <span class="guilabel"><strong>Select type of keys to change</strong></span> opens. Depending on the encryption type you want to reset the password for, select <span class="guibutton"><strong>PGP</strong></span> or <span class="guibutton"><strong>S/MIME</strong></span>. The <span class="guilabel"><strong>Reset password</strong></span> window opens.</p>
-</li>
-<li class="step">
-<p role="presentation">In the <span class="phrase"><span class="guibutton"><strong>Enter current Guard security password</strong></span></span> field, enter the password that you have used so far for encrypting your data.</p>
-<p role="presentation">In the <span class="phrase"><span class="guibutton"><strong>Enter new Guard security password</strong></span></span> field, enter the password that you want to use for encrypting your data from now on.</p>
-<p role="presentation">Confirm the password in the <span class="phrase"><span class="guibutton"><strong>Verify new Guard security password</strong></span></span> field by entering it again.</p>
-</li>
-<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Change</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.reset">
-<p class="title">How to reset the <span class="phrase">Guard</span> password:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Reset password</strong></span>.</p>
-<p role="presentation" class="cap-smime">Depending on the configuration, the <span class="guilabel"><strong>Select type of keys to change</strong></span> opens. Depending on the encryption type you want to reset the password for, select <span class="guibutton"><strong>PGP</strong></span> or <span class="guibutton"><strong>S/MIME</strong></span>. The <span class="guilabel"><strong>Reset password</strong></span> window opens.</p>
-<p role="presentation">Click on <span class="guibutton"><strong>Reset</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">A new password will be sent to your secondary E-Mail address.</p>
-<p role="presentation">If not having entered a secondary E-Mail address, the new password will be sent to your primary E-Mail address.</p>
-<p role="presentation">This new password is now your current <span class="phrase">Guard</span> security password. You should immediately <a class="link" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.task.guard.settings">change</a> this password.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.secondarymail">
-<p class="title">How to change your secondary E-Mail address for resetting the password:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Set email address for reset</strong></span>.</p>
-<p role="presentation" class="cap-smime">Depending on the configuration, the <span class="guilabel"><strong>Select type of keys to change</strong></span> opens. Depending on the encryption type you want to reset the password for, select <span class="guibutton"><strong>PGP</strong></span> or <span class="guibutton"><strong>S/MIME</strong></span>. The <span class="guilabel"><strong>Secondary Email Address</strong></span> window opens.</p>
-</li>
-<li class="step">
-<p role="presentation">In the <span class="phrase"><span class="guibutton"><strong>Enter current Guard security password</strong></span></span> field, enter the password that you have used so far for encrypting your data.</p>
-<p role="presentation">In the <span class="guibutton"><strong>Enter new secondary email</strong></span> field, enter the email address that is used for receiving a temporary password for resetting your <span class="phrase">Guard</span> security password.</p>
-<p role="presentation">Re-enter the E-Mail address in <span class="guibutton"><strong>Verify e-mail address</strong></span>.</p>
-<p role="presentation">Click on <span class="guibutton"><strong>Change E-mail address</strong></span>.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
-<p class="title">How to remove the function for resetting the password:</p>
-<div class="taskprerequisites">
-        <p><span class="phrase"><strong>Warning:</strong></span> If you remove the function for resetting the password, you can no longer reset your password. If you forget your password afterwards, you will not be able to decrypt your encrypted data.</p>
-      </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Enable <span class="guibutton"><strong>Show advanced settings</strong></span>.</p>
-<p role="presentation">Click on <span class="guibutton"><strong>Delete password recovery</strong></span>. The <span class="guilabel"><strong>Delete Recovery</strong></span> window opens.</p>
-</li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> button.</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.guard.password">
       </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Managing own PGP keys</a>
-          </p>
-<p role="presentation" class="cap-smime">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Managing own S/MIME keys</a>
-          </p>
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing public keys</a>
-          </p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a>
+          </p></li>
+</ul>
 <p>
     </p>
 <p id="ox.appsuite.user.parent.guard.password">Parent topic: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Encrypting Data with <span class="phrase">Guard</span></i></a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.password.reset.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.password.reset.html
new file mode 100644
index 000000000..af46dc80a
--- /dev/null
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.password.reset.html
@@ -0,0 +1,91 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>reset the password</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Password Management">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.change.html" title="Changing the password">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Removing the password reset function">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.change.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Encrypting Data with <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Password Management</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.reset">
+<div class="titlepage"><div><div><h3 class="title">reset the password</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.7.2"></a><a class="indexterm" name="id-1.14.12.7.3"></a><p id="ox.appsuite.user.concept.guard.password.reset">The following options are available: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">When having lost your <span class="phrase">Guard</span> password, you can request a temporary <span class="phrase">Guard</span> password by resetting the <span class="phrase">Guard</span> password.</p></li>
+<li class="listitem"><p role="presentation">You can define an email address for resetting the password.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.password.reset">
+<p class="title">How to reset the <span class="phrase">Guard</span> password:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.reset"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane. Click on <span class="guibutton"><strong>Password Management (PGP)</strong></span><span class="cap-smime"> or on <span class="guibutton"><strong>Password Management (S/MIME)</strong></span></span> in the right pane.</p>
+</li>
+<li class="step">
+<p role="presentation">To set a secondary email address to which a temporary password is sent, click on <span class="guibutton"><strong>Set email address for reset</strong></span>. The <span class="guilabel"><strong>Secondary Email Address</strong></span> window opens.</p>
+<p role="presentation">Enter your current password. Enter the email address that you want to use for resetting the password.</p>
+</li>
+<li class="step">
+<p role="presentation">Click on <span class="guibutton"><strong>Reset password</strong></span>. The <span class="guilabel"><strong>Reset password</strong></span> window opens.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Reset</strong></span>.</p>
+</li>
+</ol></div>
+<div class="taskrelated">
+          <p>Result: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">A new password will be sent to your secondary E-Mail address.</p>
+<p role="presentation">If not having entered a secondary E-Mail address, the new password will be sent to your primary E-Mail address.</p>
+</li>
+<li class="listitem"><p role="presentation">This new password is now your current <span class="phrase">Guard</span> security password. You should immediately change this password.</p></li>
+</ul>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.reset">
+        </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Changing the password</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Removing the password reset function</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.reset">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Password Management</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.guard.settings.html b/help/l10n/en_GB/ox.appsuite.user.sect.guard.settings.html
index ab113ef43..7fb44eb2e 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.guard.settings.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.guard.settings.html
@@ -1,12 +1,12 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Guard Settings</title>
+<title>GuardSettings</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Encrypting Data with Guard">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Managing public keys">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Managing S/MIME keys of recipients">
 <link rel="next" href="ox.appsuite.user.index.html" title="Index">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.index.html">Next</a></li>
@@ -33,7 +33,7 @@
 </h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.settings">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<span class="phrase">Guard</span> Settings</h2></div></div></div>
+<span class="phrase">Guard</span>Settings</h2></div></div></div>
 <a class="indexterm" name="id-1.14.14.2"></a><a class="indexterm" name="id-1.14.14.3"></a><a class="indexterm" name="id-1.14.14.4"></a><div class="task help-hide-inline" id="ox.appsuite.user.task.guard.settings">
 <p class="title">How to open the <span class="phrase">Guard</span> settings:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,84 +44,170 @@
 </li>
 <li class="step"><p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>The <span class="phrase"><span class="guilabel"><strong>Guard security settings</strong></span></span> page will be displayed.</p>
-      </div>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings">The following settings are available:</p>
+<p id="ox.appsuite.user.reference.guard.settings">Depending on the configuration, the following settings are available:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.default"><span class="phrase">Guard</span> default settings</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.pgppasswords">Password Management (PGP)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.smimepasswords">Password Management (S/MIME)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yourpgpkeys">Your PGP Keys</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientpgpkeys">Recipient PGP Keys</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yoursmime">S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientsmime">S/MIME Recipients</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.advanced">Advanced</a></p></li>
+</ul>
+<p>Also see: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p>
 <p id="ox.appsuite.user.reference.guard.settings.default"></p>
-<h3 class="title">Default settings</h3>
+<h3 class="title">
+<span class="phrase">Guard</span> default settings</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.encrypt"><b>Default to send encrypted when composing e-mail. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>Defines whether a new E-Mail is encrypted by default.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.sign"><b>Default adding signature to outgoing email messages. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Defines whether a new E-Mail is encrypted by default.</p></li>
-<li class="listitem cap-smime" id="id-1.14.14.7.2.1.3">
-<p id="ox.appsuite.user.task.guard.settings.default.smime"><b>Default to using S/MIME for signing and encryption. </b><a class="indexterm" name="id-1.14.14.7.2.1.3.1.2"></a>
+<li class="listitem">
+<p id="ox.appsuite.user.reference.guard.settings.default.create"><b>Compose options. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>
                 </p>
-<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p role="presentation">Defines whether S/MIME is used for signing and encryption by default. </p></li></ul>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.encrypt"><b>Default to send encrypted when composing e-mail. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.1.1.2"></a>Defines whether a new E-Mail is encrypted by default.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.sign"><b>Default adding signature to outgoing email messages. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.2.1.2"></a>Defines whether a new E-Mail is encrypted by default.</p></li>
+<li class="listitem cap-smime" id="id-1.14.14.7.2.1.1.1.3.1.3">
+<p id="ox.appsuite.user.task.guard.settings.default.create.smime"><b>Default to using S/MIME for signing and encryption. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.3.1.2"></a>
+                        </p>
+<ul class="itemizedlist" style="list-style-type: square; "><li class="listitem"><p role="presentation">Defines whether S/MIME is used for signing and encryption by default.</p></li></ul>
 <p>
-              </p>
+                      </p>
 </li>
-<li class="listitem">
-<p id="ox.appsuite.user.task.guard.settings.default.inline"><b>Default to using PGP inline for new e-mail messages. </b><a class="indexterm" name="id-1.14.14.7.2.1.4.1.2"></a>Note: This option is only available if the <span class="guibutton"><strong>Advanced settings</strong></span> checkbox is enabled. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">Defines whether PGP/Inline is used for encryption by default.</p></li>
-<li class="listitem"><p role="presentation">Only use those settings if the email client of a recipient does not support PGP. With PGP/Inline, the recipient can decrypt the message nevertheless.</p></li>
-<li class="listitem"><p role="presentation">If you use this setting, you can not send email messages in HTML format.</p></li>
 </ul>
+<p>
+              </p>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Remember password default. </b><a class="indexterm" name="id-1.14.14.7.2.1.5.1.2"></a>Defines the time range default for <span class="phrase">Guard</span> to remember the password. You can change this default when being asked for your <span class="phrase">Guard</span> password.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Remember password default. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Defines the time range default for <span class="phrase">Guard</span> to remember the password. You can change this default when being asked for your <span class="phrase">Guard</span> password.</p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.pgppasswords"></p>
+<h3 class="title">Password Management (PGP)</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contains functions for changing or resetting the PGP password.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Password Management</a></p></li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.reference.guard.settings.password"></p>
-<h3 class="title">Password management</h3>
+<div id="ox.appsuite.user.reference.guard.settings.smimepasswords" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.smimepasswords"></p>
+<h3 class="title">Password Management (S/MIME)</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">Contains functions for changing or resetting the password.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contains functions for changing or resetting the S/MIME password.</p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Password Management</a></p></li>
 </ul>
 <p>
       </p>
-<div id="ox.appsuite.user.reference.guard.settings.smime" class="cap-smime">
-<p id="ox.appsuite.user.reference.guard.settings.smime"></p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.yourpgpkeys"></p>
+<h3 class="title">Your PGP Keys</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contains functions for managing your PGP keys.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Managing own PGP keys</a></p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.recipientpgpkeys"></p>
+<h3 class="title">Recipient PGP Keys</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contains functions for managing PGP keys from recipients.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing PGP keys of recipients</a></p></li>
+</ul>
+<p>
+      </p>
+<div id="ox.appsuite.user.reference.guard.settings.yoursmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.yoursmime"></p>
 <h3 class="title">S/MIME</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.smime.enable"><b>Enable S/MIME. </b><a class="indexterm" name="id-1.14.14.9.2.1.1.1.2"></a>Defines whether you can send and receive email messages with S/MIME encryption.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">Contains functions for managing S/MIME type encryption.</p>
+<p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a></p>
+</li></ul>
 <p>
       </p>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings.extended"></p>
+<div id="ox.appsuite.user.reference.guard.settings.recipientsmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.recipientsmime"></p>
+<h3 class="title">S/MIME Recipients</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contains functions for displaying and adding S/MIME type recipient certificates. </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a></p></li>
+</ul>
+<p>
+      </p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.advanced"></p>
 <h3 class="title">Advanced</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<p id="ox.appsuite.user.reference.guard.settings.extended.advanced"><b>Advanced settings. </b><a class="indexterm" name="id-1.14.14.10.2.1.1.1.2"></a>If <span class="guibutton"><strong>Show advanced settings</strong></span> is enabled, the following settings and functions will be available. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
+<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>E-Mail cache</strong></span></p>
-<p role="presentation">Defines whether a decrypted E-Mail is kept in the browser cache in a readable format when displaying another E-Mail or changing to another groupware app.</p>
-<p role="presentation">To remove the decrypted E-Mail from the browser cache, enable <span class="guibutton"><strong>Do not keep e-mail messages decrypted.</strong></span>.</p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.email"><b>Show advanced settings for composing email. </b>
+                </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<a class="indexterm" name="id-1.14.14.14.2.1.1.1.2.1.1.1"></a><p role="presentation">If this option is enabled, you can use additional options when sending encrypted email messages.</p>
+<p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Sending encrypted E-Mail messages</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Keys</strong></span> section</p>
-<p role="presentation">Managing your own keys, public keys or Autocrypt keys.</p>
-<p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a></p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.inline"><b>Default to using PGP inline for new e-mail messages. </b><a class="indexterm" name="id-1.14.14.14.2.1.2.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Defines whether PGP/Inline is used for encryption by default.</p></li>
+<li class="listitem"><p role="presentation">Only use those settings if the email client of a recipient does not support PGP. With PGP/Inline, the recipient can decrypt the message nevertheless.</p></li>
+<li class="listitem"><p role="presentation">If you use this setting, you can not send email messages in HTML format.</p></li>
+</ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Autocrypt</strong></span> section</p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.autocrypt"><b>Autocrypt Setting. </b><a class="indexterm" name="id-1.14.14.14.2.1.3.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
 <p role="presentation">Configures the usage of Autocrypt for incoming E-Mail Messages. Allows you to transfer Autocrypt keys to other clients.</p>
 <p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">Encrypting E-Mail Conversations with Autocrypt</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">When sending encrypted E-Mail Messages, there are additional options available.</p>
-<p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Sending encrypted E-Mail messages</a></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.cache"><b>E-Mail cache. </b><a class="indexterm" name="id-1.14.14.14.2.1.4.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation">Defines whether a decrypted E-Mail is kept in the browser cache in a readable format when displaying another E-Mail or changing to another groupware app.</p>
+<p role="presentation">To remove the decrypted E-Mail from the browser cache, enable <span class="guibutton"><strong>Do not keep e-mail messages decrypted.</strong></span>.</p>
+</li></ul>
+<p>
+              </p>
 </li>
-</ul>
+<li class="listitem">
+<p id="ox.appsuite.user.task.guard.settings.advanced.reset"><b>Reset Options. </b><a class="indexterm" name="id-1.14.14.14.2.1.5.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation"><span class="guibutton"><strong>Delete password recovery</strong></span>. Deletes the function for recovering a lost password.</p>
+<p role="presentation"><span class="phrase"><strong>Warning:</strong></span> If you remove the function for resetting the password, you can no longer reset your password. If you forget your password afterwards, you will not be able to decrypt your encrypted data.</p>
+<p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Removing the password reset function</a></p>
 </li></ul>
+<p>
+              </p>
+</li>
+</ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.guard.settings">Parent topic: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Encrypting Data with <span class="phrase">Guard</span></i></a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.settings.commonsettings.html b/help/l10n/en_GB/ox.appsuite.user.sect.settings.commonsettings.html
index 7adfb5c3a..41df55e52 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.settings.commonsettings.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.settings.commonsettings.html
@@ -165,9 +165,9 @@
               </p>
 </li>
 <li class="listitem cap-deputy" id="id-1.4.6.11.2.1.3">
-<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Managing Deputies. </b>
+<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Manage deputies. </b>
                 </p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a></p></li></ul>
 <p>
               </p>
 </li>
@@ -193,7 +193,7 @@
             <a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using countdowns for appointments</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.settings.countdown.html b/help/l10n/en_GB/ox.appsuite.user.sect.settings.countdown.html
index b5875f876..662fa28bc 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.settings.countdown.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.settings.countdown.html
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Using Countdowns for Appointments</title>
+<title>Using countdowns for appointments</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Customised Settings">
 <link rel="prev" href="ox.appsuite.user.sect.settings.notifications.html" title="Customising the Notifications">
-<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Use the notification area">
+<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="use the notification area">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Customised Settings</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.countdown">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Using Countdowns for Appointments</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Using countdowns for appointments</h2></div></div></div>
 <a class="indexterm" name="id-1.4.8.2"></a><a class="indexterm" name="id-1.4.8.3"></a><a class="indexterm" name="id-1.4.8.4"></a><p id="ox.appsuite.user.concept.settings.countdown">You can enable a countdown for upcoming appointments Prior to the appointment start, a visually striking countdown window will remind you of the appointment. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.settings.notificationarea.html b/help/l10n/en_GB/ox.appsuite.user.sect.settings.notificationarea.html
index 40ba7b570..e3b47a213 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.settings.notificationarea.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.settings.notificationarea.html
@@ -1,12 +1,12 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Use the notification area</title>
+<title>use the notification area</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Customised Settings">
-<link rel="prev" href="ox.appsuite.user.sect.settings.countdown.html" title="Using Countdowns for Appointments">
+<link rel="prev" href="ox.appsuite.user.sect.settings.countdown.html" title="Using countdowns for appointments">
 <link rel="next" href="ox.appsuite.user.sect.settings.personaldata.html" title="Changing Personal Contact Data">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Customised Settings</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.notificationarea">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Use the notification area</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">use the notification area</h2></div></div></div>
 <a class="indexterm" name="id-1.4.9.2"></a><a class="indexterm" name="id-1.4.9.3"></a><p id="ox.appsuite.user.concept.settings.notificationarea">You will be notified in the notification area for the following events: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Reminders for upcoming appointments or tasks</p></li>
@@ -64,7 +64,7 @@
 <p role="presentation" class="feat-io-ox-core-managedResources">When receiving booking requests for managed resources, you can use the following functions: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">To view the booking request in the resource calendar, click on the date.</p></li>
 <li class="listitem"><p role="presentation">To accept or decline the booking request, click on the respective button.</p></li>
-</ul></p>
+</ul> </p>
 <p role="presentation">If there are overdue tasks, you can use the following functions: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">To show details in a pop-up, click on the reminder.</p></li>
 <li class="listitem"><p role="presentation">To edit the task, use the functions in the pop-up.</p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.settings.notifications.html b/help/l10n/en_GB/ox.appsuite.user.sect.settings.notifications.html
index 19876229e..dc305fe38 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.settings.notifications.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.settings.notifications.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Customised Settings">
 <link rel="prev" href="ox.appsuite.user.sect.settings.commonsettings.html" title="Adjusting the General Settings">
-<link rel="next" href="ox.appsuite.user.sect.settings.countdown.html" title="Using Countdowns for Appointments">
+<link rel="next" href="ox.appsuite.user.sect.settings.countdown.html" title="Using countdowns for appointments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -60,7 +60,7 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>show desktop notifications. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Defines whether you will receive a desktop notification about incoming email messages if the groupware is in the background.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>Show desktop notifications. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Defines whether you will receive a desktop notification about incoming email messages if the groupware is in the background.</p></li>
 <li class="listitem">
 <p role="presentation">Depending on the browser settings, the <span class="guibutton"><strong>Manage browser permissions now</strong></span> button is displayed. Click the button. You are asked by the browser whether the receipt of notifications should be allowed. Grant this permission.</p>
 <p role="presentation">Note: Depending on the browser, you might have to allow the receipt of notifications in the browser settings for the setting above to take effect. Information can be found in the browser help pages.</p>
@@ -74,7 +74,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.show"><b>Automatically open the notification area when there are new reminders. </b><a class="indexterm" name="id-1.4.7.8.2.1.1.1.2"></a>Defines whether the notification area automatically opens when receiving a reminder for an appointment or a task.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.birthdays"><b>Show birthdays in notification area. </b>Defines whether the notification area also includes upcoming birthdays.</p></li>
 </ul>
-<p>See <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Use the notification area</a></p>
+<p>See <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">use the notification area</a></p>
 <p id="ox.appsuite.user.reference.settings.notifications.email"></p>
 <h3 class="title">email</h3>
 <p>
@@ -93,14 +93,14 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem feat-io-ox-core-countdown" id="id-1.4.7.10.2.1.1"><p id="ox.appsuite.user.reference.settings.notifications.calendar.countdown"><b>Countdown. </b><a class="indexterm" name="id-1.4.7.10.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.3"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.4"></a>Defines whether a countdown window will be displayed for upcoming appointments. See <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a></p></li>
+<li class="listitem feat-io-ox-core-countdown" id="id-1.4.7.10.2.1.1"><p id="ox.appsuite.user.reference.settings.notifications.calendar.countdown"><b>Countdown. </b><a class="indexterm" name="id-1.4.7.10.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.3"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.4"></a>Defines whether a countdown window will be displayed for upcoming appointments. See <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using countdowns for appointments</a></p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.settings.notifications.calendar.email"><b>Email notifications. </b>Specifies whether you will receive an email notification, if the following is true: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.changes"><b>Receive notifications when an appointment in which you participate is created, modified or deleted. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.1.1.2"></a>An appointment in which you participate has been re-created, changed or deleted.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>receive notification as appointment creator when participants accept or decline. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>A participant accepted or declined an appointment created by you.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>receive notification as appointment participant when other participants accept or decline. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>a participant accepted or declined an appointment in which you participate.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>automatically delete the invitation email after the appointment has been accepted or declined. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Defines whether the email notification for an appointment invitation will be automatically deleted when accepting or declining the appointment. See <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>Receive notification as appointment creator when participants accept or decline. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>A participant accepted or declined an appointment created by you.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>Receive notification as appointment participant when other participants accept or decline. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>a participant accepted or declined an appointment in which you participate.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>Automatically delete the invitation email after the appointment has been accepted or declined. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Defines whether the email notification for an appointment invitation will be automatically deleted when accepting or declining the appointment. See <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></p></li>
 </ul>
 </li>
 </ul>
@@ -141,14 +141,14 @@
             <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using countdowns for appointments</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Use the notification area</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">use the notification area</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.settings.personaldata.html b/help/l10n/en_GB/ox.appsuite.user.sect.settings.personaldata.html
index 6b3426ba0..06782bb0a 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.settings.personaldata.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.settings.personaldata.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Customised Settings">
-<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Use the notification area">
+<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="use the notification area">
 <link rel="next" href="ox.appsuite.user.sect.settings.wizard.html" title="Using a Wizard to Set Up Local Apps">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.settings.search.html b/help/l10n/en_GB/ox.appsuite.user.sect.settings.search.html
index 5d9c176f3..ce6c7d885 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.settings.search.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.settings.search.html
@@ -64,7 +64,7 @@
             <a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Customising the Notifications</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using countdowns for appointments</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none">
@@ -80,6 +80,9 @@
 <p role="presentation" class="cap-infostore">
             <a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span> Settings</a>
           </p>
+<p role="presentation" class="cap-guard">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a>
+          </p>
 </li>
 </ul>
 <p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.add.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.add.html
index e3fa8aa2e..6b6705f6e 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.add.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.add.html
@@ -52,7 +52,7 @@
             <a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a>
           </p>
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a>
           </p>
 </li></ul>
 <p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.detailview.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.detailview.html
index 67f1c5f5c..325bd0aec 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.detailview.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.detailview.html
@@ -53,7 +53,7 @@
 <li class="listitem"><p role="presentation">The task's subject</p></li>
 <li class="listitem"><p role="presentation">The task's reminder date, if set</p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.7.10.4.1.5">
-<p role="presentation">The categories assigned</p>
+<p role="presentation">the categories assigned</p>
 <p role="presentation">Clicking on a category searches for tasks to which that category has been assigned.</p>
 </li>
 <li class="listitem"><p role="presentation"> If the task is a recurring task, recurrence parameters will be displayed.</p></li>
@@ -68,7 +68,7 @@
 <li class="listitem"><p role="presentation">start date</p></li>
 <li class="listitem"><p role="presentation">definition</p></li>
 <li class="listitem"><p role="presentation">billing information</p></li>
-<li class="listitem"><p role="presentation">attachments</p></li>
+<li class="listitem"><p role="presentation">Attachments</p></li>
 <li class="listitem">
 <p role="presentation">the names of the participants</p>
 <p role="presentation">If clicking on a name, a pop-up opens. It displays the participant's <span class="guibutton"><strong>Halo View</strong></span>.</p>
@@ -85,14 +85,11 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">The <span class="phrase">Tasks</span> list view</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.create.html">The editing window</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Viewing Tasks</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Viewing or Saving Task Attachments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">Calling Task Participants</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Displaying contacts in the halo view</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.gui.detailview">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">The <span class="phrase">Tasks</span> Components</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.foldertree.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.foldertree.html
index 7d3d7907f..c8cbd0e6a 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.foldertree.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.foldertree.html
@@ -57,6 +57,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Viewing Tasks</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Adding Task Lists</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Managing Data with Folders</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.list.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.list.html
index 13f7232d3..89c090241 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.list.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.list.html
@@ -57,17 +57,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.list.html">The list view</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.settingsmenu.html">The <span class="phrase">Tasks</span> settings menu</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.detailview.html">The <span class="phrase">Tasks</span> detail view</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Viewing Tasks</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Viewing or Saving Task Attachments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.list">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">The <span class="phrase">Tasks</span> Components</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.settingsmenu.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
index f7b6f9846..2b552192b 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
@@ -51,10 +51,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.menubar.html">The menu bar</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">The <span class="phrase">Tasks</span> list view</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subscribing to public and shared task lists</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subscribing to public and shared task lists</a></p></li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.settingsmenu">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">The <span class="phrase">Tasks</span> Components</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.toolbar.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.toolbar.html
index c4b91130d..786d371c3 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.toolbar.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.gui.toolbar.html
@@ -58,13 +58,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Editing Tasks</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Changing a task's due date</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marking tasks as done</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Moving tasks to another folder</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Changing task confirmations</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Exporting tasks</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.print.html">Printing tasks</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.delete.html">Deleting tasks</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.toolbar">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">The <span class="phrase">Tasks</span> Components</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.categories.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.categories.html
new file mode 100644
index 000000000..4fca66079
--- /dev/null
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Using categories for tasks</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Managing Tasks">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Changing a task's due date">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Moving tasks to another folder">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Tasks</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Managing Tasks</h2>
+<div class="sect2" id="ox.appsuite.user.sect.tasks.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Using categories for tasks</h3></div></div></div>
+<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.categories">To organise tasks independently from folders, you can use categories. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">You can mark tasks with categories.</p></li>
+<li class="listitem"><p role="presentation">You can display all tasks that have been marked with a specific category.</p></li>
+</ul>
+<p> You can create, edit or delete your own categories, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>.</p>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories">
+<p class="title">How to mark tasks with a category:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Select a task. Click the <span class="guibutton"><strong>Edit contact</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.mark.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in the tool bar.</p>
+<p role="presentation">The task editing window opens.</p>
+</li>
+<li class="step">
+<p role="presentation">To do so, click on <span class="guibutton"><strong>Add category</strong></span> next to <span class="guibutton"><strong>Categories</strong></span>. Select a category.</p>
+<p role="presentation">In order to remove a category from the task, click the <span class="guibutton"><strong>Remove category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the category.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories.view">
+<p class="title">How to display tasks that have been marked with a specific category:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Select a task that has been marked with a category.</p></li>
+<li class="step"><p role="presentation">Click on the category in the detail view.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Result: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">The list view shows all tasks that have been marked with this category.</p></li>
+<li class="listitem"><p role="presentation">To display the previous list, click the <span class="guibutton"><strong>Cancel search</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in the search field.</p></li>
+</ul>
+          <p>Tip: You can also use the search function by searching for a category using the search options.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.tasks.manage.categories">
+        </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Searching for Tasks</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new email messages</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.tasks.manage.categories">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.changeduedate.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.changeduedate.html
index 191c8b218..b5d027247 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.changeduedate.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.changeduedate.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Managing Tasks">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="Marking tasks as done">
-<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Moving tasks to another folder">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Using categories for tasks">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -48,7 +48,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changeduedate"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The <span class="phrase">Tasks</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The <span class="phrase">Tasks</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">The <span class="phrase">Tasks</span> list view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.changestatus.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.changestatus.html
index b2bd12711..e63f93e59 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.changestatus.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.changestatus.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Tasks</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.changestatus">
 <div class="titlepage"><div><div><h3 class="title">Changing task confirmations</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.10.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">If you are a task participant, you can later change your confirmation for this task. You can add a comment that is visible to other task participants.</p>
+<a class="indexterm" name="id-1.10.15.11.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">If you are a task participant, you can later change your confirmation for this task. You can add a comment that is visible to other task participants.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.changestatus">
 <p class="title">How to change your confirmation:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changestatus"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The <span class="phrase">Tasks</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The <span class="phrase">Tasks</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">The <span class="phrase">Tasks</span> list view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.delete.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.delete.html
index 6f75cc654..c94e9ca91 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.delete.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Tasks</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Deleting tasks</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Warning:</strong></span> Deleted tasks <span class="phrase"><strong>cannot</strong></span> be restored.</p>
+<a class="indexterm" name="id-1.10.15.15.2"></a><a class="indexterm" name="id-1.10.15.15.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Warning:</strong></span> Deleted tasks <span class="phrase"><strong>cannot</strong></span> be restored.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.delete">
 <p class="title">How to delete tasks:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -50,9 +50,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.delete">
         </p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The <span class="phrase">Tasks</span> tool bar</a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">The <span class="phrase">Tasks</span> list view</a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.delete">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.export.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.export.html
index a9ba31cca..21d47dc4c 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.export.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Tasks</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exporting tasks</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">You can export tasks in the iCal format. You can e.g. use this format to exchange tasks with other calendar applications. You can export individual tasks or all tasks from a folder.</p>
+<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><a class="indexterm" name="id-1.10.15.13.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">You can export tasks in the iCal format. You can e.g. use this format to exchange tasks with other calendar applications. You can export individual tasks or all tasks from a folder.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.export.selected">
 <p class="title">How to export individual tasks:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -63,12 +63,16 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.export"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The <span class="phrase">Tasks</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">The <span class="phrase">Tasks</span> folder view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The <span class="phrase">Tasks</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">The <span class="phrase">Tasks</span> list view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.10.15.12.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.10.15.13.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.manage.export">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
 </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.html
index 8d06c5811..6e1f9efba 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marking tasks as done</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Changing a task's due date</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Moving tasks to another folder</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Changing task confirmations</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a></p></li>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.import.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.import.html
index c71797cd5..f721dff86 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.import.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Tasks</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importing tasks</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.11.2"></a><a class="indexterm" name="id-1.10.15.11.3"></a><a class="indexterm" name="id-1.10.15.11.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">You can import tasks from files in iCal format.</p>
+<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">You can import tasks from files in iCal format.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.import">
 <p class="title">How to import tasks from an iCal file:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,19 +54,15 @@
           <p>Result: The tasks are added to the folder.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.tasks.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.tasks.manage.import"></p>
+<p class="title">User interface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">The <span class="phrase">Tasks</span> folder view</a></p></li></ul>
+<p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Exporting tasks</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Creating Tasks</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Exporting tasks</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Creating Tasks</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.tasks.manage.import">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.markasdone.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.markasdone.html
index cb660cc18..0f16f2e69 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.markasdone.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.markasdone.html
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.markasdone"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The <span class="phrase">Tasks</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The <span class="phrase">Tasks</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">The <span class="phrase">Tasks</span> list view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.move.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.move.html
index 6bb787f2b..9267c4635 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.move.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.move.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Managing Tasks">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Changing a task's due date">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Using categories for tasks">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.changestatus.html" title="Changing task confirmations">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Next</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Tasks</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Moving tasks to another folder</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">You can move tasks to another folder.</p>
+<a class="indexterm" name="id-1.10.15.10.2"></a><a class="indexterm" name="id-1.10.15.10.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">You can move tasks to another folder.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.move">
 <p class="title">How to move tasks to another folder:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 <p id="ox.appsuite.user.tip.tasks.manage.move">Tip: You can also move the selected objects by dragging the objects from the folder view to a folder.</p>
 <p id="ox.appsuite.user.related.tasks.manage.move"></p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The <span class="phrase">Tasks</span> tool bar</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">The <span class="phrase">Tasks</span> folder view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The <span class="phrase">Tasks</span> tool bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">The <span class="phrase">Tasks</span> list view</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">Adding personal task list</a></p></li></ul>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.print.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.print.html
index c2dbc98f1..f4f393e6c 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.print.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Managing Tasks</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Printing tasks</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">You can print the data of a single task or of multiple tasks.</p>
+<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">You can print the data of a single task or of multiple tasks.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.print.data">
 <p class="title">How to print a task's data:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,9 +51,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.print">
         </p>
 <p class="title">User interface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The <span class="phrase">Tasks</span> tool bar</a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">The <span class="phrase">Tasks</span> list view</a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.print">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
diff --git a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.search.html b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.search.html
index 114d9410b..f0db0719c 100644
--- a/help/l10n/en_GB/ox.appsuite.user.sect.tasks.search.html
+++ b/help/l10n/en_GB/ox.appsuite.user.sect.tasks.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Viewing Tasks</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/es_ES/bk01-toc.html b/help/l10n/es_ES/bk01-toc.html
index fb629c269..cd4084f2f 100644
--- a/help/l10n/es_ES/bk01-toc.html
+++ b/help/l10n/es_ES/bk01-toc.html
@@ -63,8 +63,8 @@
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.search.html">Búsqueda de configuraciones</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuste de la Configuración general</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a></li>
-<li class="sect1 feat-io-ox-core-countdown"><a href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a></li>
-<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a></li>
+<li class="sect1 feat-io-ox-core-countdown"><a href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a></li>
+<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.personaldata.html">Cambio de datos personales de contacto</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.wizard.html">Uso de un asistente para configurar aplicaciones locales</a></li>
 <li class="sect1 cap-switchboard"><a href="ox.appsuite.user.sect.settings.presencestatus.html">Establecer el estado de presencia</a></li>
@@ -134,7 +134,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.new.html">El botón Nuevo correo</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de pestañas de <span class="phrase">Correo electrónico</span></a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de categorías de la bandeja de entrada</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.popup.html">El elemento emergente de <span class="phrase">Correo electrónico</span></a></li>
@@ -144,13 +144,13 @@
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></li>
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a></li>
 <li class="sect1 cap-webmail">
-<a href="ox.appsuite.user.sect.email.send.html">Envío de correos</a><ul>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a></li>
+<a href="ox.appsuite.user.sect.email.send.html">enviar correos</a><ul>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.replyto.html">Configuración de la dirección de respuesta</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a></li>
-<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envío de adjuntos como enlace</a></li>
+<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">enviar adjuntos como enlace</a></li>
 <li class="sect2 feat-io-ox-core-templates"><a href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></li>
@@ -174,6 +174,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.movecopy.html">Mover o copiar correos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.collectaddress.html">Recopilación de direcciones</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.source.html">Mostrar código fuente del correo</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.draft.html">Uso de borradores de correo</a></li>
@@ -185,6 +186,9 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.archive.html">Archivado de correos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a></li>
+<li class="sect2 cap-dumpster"><a href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a></li>
 </ul>
@@ -238,10 +242,10 @@
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.attachments.html">Visualización y guardado de adjuntos de citas</a></li>
 <li class="sect1 cap-calendar">
-<a href="ox.appsuite.user.sect.calendar.add.html">crear citas</a><ul>
+<a href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a><ul>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.datepicker.html">Uso del selector de fecha</a></li>
-<li class="sect2 cap-calendar cap-switchboard"><a href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a></li>
+<li class="sect2 cap-calendar cap-switchboard"><a href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.serial.html">Establecer cita periódica</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.display.html">Configuración de la visualización de una cita</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.alarms.html">Uso de recordatorios de citas</a></li>
@@ -249,10 +253,10 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attachments.html">Añadir adjuntos</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.followup.html">Creación de una cita de seguimiento</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.recipients.html">Invitación de destinatarios de correo a nuevas citas</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Crear citas desde adjuntos iCal</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a></li>
 </ul>
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a></li>
@@ -273,6 +277,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modificación de recordatorios de citas</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Cambio del organizador</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.timezones.html">Gestión de zonas horarias favoritas</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.colors.html">Uso de colores del calendario</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.move.html">Mover citas a otro calendario</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.import.html">Importación de citas</a></li>
@@ -360,6 +365,7 @@
 <a href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envío de correos desde una libreta de direcciones</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitar contactos a una cita</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Mover o copiar contactos</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envío de contactos como vCard</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a></li>
@@ -413,6 +419,7 @@
 <a href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marcado de tareas como realizadas</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Cambio de la fecha de vencimiento de una tarea</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.move.html">Mover tareas a otra carpeta</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Cambiar confirmaciones de tareas</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.import.html">Importación de tareas</a></li>
@@ -515,7 +522,7 @@
 </ul>
 </li>
 <li class="sect1 cap-deputy">
-<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestionar representantes</a><ul>
+<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestionar representantes</a><ul>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.add.html">Adición de representantes</a></li>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">Visualización, edición, borrado de representantes</a></li>
 </ul>
@@ -584,12 +591,19 @@
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.logout.html">Cierre de sesión de <span class="phrase">Guard</span></a></li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a></li>
+<li class="sect1 cap-guard">
+<a href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a><ul>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.change.html">Cambiar la contraseña</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.reset.html">restablecer la contraseña</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Eliminación de la función de restablecimiento de contraseña</a></li>
+</ul>
+</li>
 <li class="sect1 cap-guard">
 <a href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves PGP de destinatarios</a></li>
 <li class="sect2 cap-smime"><a href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a></li>
-<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves públicas</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Gestionar claves S/MIME de destinatarios</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html">Configuración de <span class="phrase">Guard</span></a></li>
diff --git a/help/l10n/es_ES/index.html b/help/l10n/es_ES/index.html
index 34040adce..3d2e3f603 100644
--- a/help/l10n/es_ES/index.html
+++ b/help/l10n/es_ES/index.html
@@ -34,7 +34,7 @@
 </h3></div></div>
 <div><p class="copyright">Copyright ©  OX Software GmbH </p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">Aviso Legal</a></div>
-<div><p class="pubdate">Martes, 21. Noviembre 2023 Version 8.19.0 </p></div>
+<div><p class="pubdate">Jueves, 21. Diciembre 2023 Version 8.20.0 </p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">Índice temas de ayuda</h2>
@@ -81,10 +81,10 @@
                 <a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
+                <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a>
+                <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Uso de un asistente para configurar aplicaciones locales</a>
@@ -97,6 +97,19 @@
               </p></li>
 </ul>
 </li>
+<li class="listitem" id="ox.appsuite.user.startpage.toc.keyboard" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.chap.keyboard.html"><i>Entrada de teclado</i></a>
+            </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.navigation.html">Uso de la navegación con el teclado</a>
+              </p></li>
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.shortkeys.html">Uso de atajos de teclado</a>
+              </p></li>
+</ul>
+</li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.portal" style="list-style-type: none">
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.chap.portal.html"><i>
@@ -135,12 +148,12 @@
                 <a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a>
+                <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a>
               </p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.5.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.6.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Uso de la integración con AI</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.5.1.6"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -155,13 +168,13 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.search.html">Búsqueda de correos</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.5.1.11"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.11"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a>
               </p></li>
-<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.5.1.13"><p role="presentation">
+<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
               </p></li>
 </ul>
@@ -183,7 +196,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Visualización de citas</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a>
+                <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a>
@@ -191,7 +204,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.7"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -200,25 +213,25 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a>
               </p></li>
-<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.6.1.10"><p role="presentation">
+<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.7.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Uso de calendarios de recursos</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Búsqueda de citas</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.12"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.7.1.12"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creación, edición o gestión de citas como representante</a>
               </p></li>
-<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation">
+<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.7.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">Uso de grupos</a>
               </p></li>
-<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.6.1.14"><p role="presentation">
+<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">Uso de recursos</a>
               </p></li>
-<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.6.1.15"><p role="presentation">
+<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.7.1.15"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">Uso de recursos gestionados</a>
               </p></li>
-<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.6.1.16"><p role="presentation">
+<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.7.1.16"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
               </p></li>
 </ul>
@@ -242,7 +255,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Adición automática de Contactos o Recursos desde una libreta de direcciones</a>
               </p></li>
-<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.7.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.8.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Adición automática de Contactos o Recursos desde el Directorio de Direcciones</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -254,7 +267,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Edición de contactos o listas distribución</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.9"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.8.1.9"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -269,7 +282,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Búsqueda de contactos</a>
               </p></li>
-<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation">
+<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.8.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Ajustes de la libreta de direcciones</a>
               </p></li>
 </ul>
@@ -344,7 +357,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Añadir cuentas de almacenamiento</a>
               </p></li>
-<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.9.1.10"><p role="presentation">
+<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.10.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.settings.html">Configuración de <span class="phrase">Ficheros</span></a>
               </p></li>
 </ul>
@@ -357,19 +370,19 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a>
               </p></li>
-<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.10.1.3"><p role="presentation">
+<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.11.1.3"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.10.1.4"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestionar representantes</a>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.11.1.4"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestionar representantes</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Administración de cuentas</a>
               </p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.10.1.6"><p role="presentation">
+<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.11.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
               </p></li>
-<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.10.1.7"><p role="presentation">
+<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.11.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a>
               </p></li>
 </ul>
@@ -388,7 +401,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.sessions.html">Visualización o cierre de sesión en clientes activos</a>
               </p></li>
-<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.11.1.5"><p role="presentation">
+<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.12.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Autenticación multifactor</a>
               </p></li>
 </ul>
diff --git a/help/l10n/es_ES/ox.appsuite.user.chap.calendar.html b/help/l10n/es_ES/ox.appsuite.user.chap.calendar.html
index c98a174f8..044c5dcbe 100644
--- a/help/l10n/es_ES/ox.appsuite.user.chap.calendar.html
+++ b/help/l10n/es_ES/ox.appsuite.user.chap.calendar.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="Configuración del correo">
+<link rel="prev" href="ox.appsuite.user.sect.email.mailfilter.apply.html" title="Aplicar una regla a correos ya existentes">
 <link rel="next" href="ox.appsuite.user.sect.calendar.gui.html" title="Los componentes de Calendario">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.mailfilter.apply.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.gui.html">Siguiente</a></li>
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Los componentes de <span class="phrase">Calendario</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Visualización de citas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.attachments.html">Visualización y guardado de adjuntos de citas</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.8.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a></p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/es_ES/ox.appsuite.user.chap.dataorganisation.html
index b9a576c84..e324ee28e 100644
--- a/help/l10n/es_ES/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/es_ES/ox.appsuite.user.chap.dataorganisation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="Configuración de WebDAV en Windows">
+<link rel="prev" href="ox.appsuite.user.sect.drive.settings.html" title="Configuración de Ficheros">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.folder.html" title="Administración de datos con carpetas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.settings.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.folder.html">Siguiente</a></li>
@@ -35,7 +35,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a></p></li>
 <li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.12.2.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a></p></li>
-<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestionar representantes</a></p></li>
+<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestionar representantes</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Administración de cuentas</a></p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.12.2.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a></p></li>
 <li class="listitem cap-dataexport" id="id-1.12.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.chap.drive.html b/help/l10n/es_ES/ox.appsuite.user.chap.drive.html
index ec37e3069..601588194 100644
--- a/help/l10n/es_ES/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/es_ES/ox.appsuite.user.chap.drive.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.search.html" title="Búsqueda de tareas">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.delete.html" title="Borrado de tareas">
 <link rel="next" href="ox.appsuite.user.sect.drive.gui.html" title="Los componentes de Ficheros">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.search.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.delete.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.drive.gui.html">Siguiente</a></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.chap.email.html b/help/l10n/es_ES/ox.appsuite.user.chap.email.html
index 6eb65183d..41e26659e 100644
--- a/help/l10n/es_ES/ox.appsuite.user.chap.email.html
+++ b/help/l10n/es_ES/ox.appsuite.user.chap.email.html
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">Uso de la integración con AI</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.7.7.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Añadir carpetas de correo</a></p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.chap.guard.html b/help/l10n/es_ES/ox.appsuite.user.chap.guard.html
index f27d769cb..5db597b07 100644
--- a/help/l10n/es_ES/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/es_ES/ox.appsuite.user.chap.guard.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="Administración de métodos de verificación">
+<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="Cerrar sesión automáticamente">
 <link rel="next" href="ox.appsuite.user.sect.guard.setup.html" title="Configuración de Guard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.autologout.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.setup.html">Siguiente</a></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.chap.security.html b/help/l10n/es_ES/ox.appsuite.user.chap.security.html
index 7b9c1af58..83861830d 100644
--- a/help/l10n/es_ES/ox.appsuite.user.chap.security.html
+++ b/help/l10n/es_ES/ox.appsuite.user.chap.security.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="Visualización, edición, borrado de cuentas">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="Descarga de datos personales">
 <link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="Visualización o cierre de sesión en clientes activos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">Siguiente</a></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.chap.settings.html b/help/l10n/es_ES/ox.appsuite.user.chap.settings.html
index 70b3c73f2..19fb73fb4 100644
--- a/help/l10n/es_ES/ox.appsuite.user.chap.settings.html
+++ b/help/l10n/es_ES/ox.appsuite.user.chap.settings.html
@@ -36,8 +36,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Búsqueda de configuraciones</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuste de la Configuración general</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.personaldata.html">Cambio de datos personales de contacto</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Uso de un asistente para configurar aplicaciones locales</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.4.3.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Establecer el estado de presencia</a></p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.chap.tasks.html b/help/l10n/es_ES/ox.appsuite.user.chap.tasks.html
index 6f34c44ad..09fc416dd 100644
--- a/help/l10n/es_ES/ox.appsuite.user.chap.tasks.html
+++ b/help/l10n/es_ES/ox.appsuite.user.chap.tasks.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="Ajustes de la libreta de direcciones">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.delete.html" title="Borrado de contactos">
 <link rel="next" href="ox.appsuite.user.sect.tasks.gui.html" title="Los componentes de Tareas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.settings.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.delete.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.gui.html">Siguiente</a></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.index.html b/help/l10n/es_ES/ox.appsuite.user.index.html
index 18f823bea..1a5f6f0ea 100644
--- a/help/l10n/es_ES/ox.appsuite.user.index.html
+++ b/help/l10n/es_ES/ox.appsuite.user.index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="Configuración de Guard">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Gestionar claves S/MIME de destinatarios">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -21,7 +21,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.settings.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 </ul></div>
@@ -45,18 +45,26 @@
 </dt>
 <dt class="cap-dataexport">descargar datos personales, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a>
 </dt>
-<dt class="cap-deputy">gestionar representantes, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestionar representantes</a>
-</dt>
-<dt class="cap-guard">
-        Guard
+<dt class="cap-infostore">
+        Ficheros
         
         
         
-      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
+</dt>
+<dt class="cap-deputy">gestionar representantes, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestionar representantes</a>
 </dt>
 <dt class="cap-portal">Portal, <a class="indexterm" href="ox.appsuite.user.sect.portal.settings.html">Ajustes del portal</a>
 </dt>
 </dl></dd>
+<dt class="cap-guard">ajustes</dt>
+<dd><dl><dt class="cap-guard">
+        Guard
+        
+        
+        
+      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+</dt></dl></dd>
 <dt class="cap-infostore">Ajustes de Ficheros</dt>
 <dd><dl>
 <dt class="cap-infostore">añadir ficheros, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
@@ -65,7 +73,7 @@
 </dt>
 <dt class="cap-infostore">mostrar ficheros y carpetas ocultos, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
 </dt>
-<dt class="cap-infostore">presentar diapositivas para imágenes, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
+<dt class="cap-infostore">Presentación para imágenes, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
 </dt>
 </dl></dd>
 <dt class="cap-contacts">Ajustes de la libreta de direcciones</dt>
@@ -74,12 +82,12 @@
 </dt>
 <dt class="cap-contacts">enlazar direcciones postales con servicio de mapas, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Ajustes de la libreta de direcciones</a>
 </dt>
-<dt class="cap-contacts">nombres, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Ajustes de la libreta de direcciones</a>
+<dt class="cap-contacts">Nombres, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Ajustes de la libreta de direcciones</a>
 </dt>
 </dl></dd>
 <dt class="cap-guard">ajustes de seguridad de Guard</dt>
 <dd><dl>
-<dt class="cap-guard">ajustes avanzados, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+<dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
 </dt>
 <dt class="cap-guard">De manera predeterminada, añadir firma a correos salientes, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
 </dt>
@@ -89,12 +97,18 @@
 </dt>
 <dt class="cap-guard">Recordar contraseña de manera predeterminada, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
 </dt>
-<dt class="cap-guard">S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
-</dt>
 </dl></dd>
 <dt class="cap-guard">Ajustes de seguridad de Guard</dt>
-<dd><dl><dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="cap-guard">configuración de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+</dt>
+<dt class="cap-guard">configuración de caché de correo, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+</dt>
+<dt class="cap-guard">mostrar configuraciones avanzadas para redactar correo, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+</dt>
+<dt class="cap-guard">opciones de restablecimiento, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+</dt>
+</dl></dd>
 <dt class="cap-calendar">Ajustes del calendario</dt>
 <dd><dl>
 <dt class="cap-calendar">aplicar automáticamente los cambios de citas recibidos por correo a su calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
@@ -115,17 +129,17 @@
 </dt>
 <dt class="cap-calendar">mostrar calendario de cumpleaños, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
-<dt class="cap-calendar">Mostrar citas rechazadas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
+<dt class="cap-calendar">mostrar citas rechazadas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
 <dt class="cap-calendar">mostrar recordatorios de citas pasadas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
-<dt class="cap-calendar">Recordatorios de citas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
+<dt class="cap-calendar">recordatorios de citas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
 <dt class="cap-calendar">Reuniones de Jitsi, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
 <dt class="cap-calendar">Reuniones de Zoom, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
-<dt class="cap-calendar">Semana laboral, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
+<dt class="cap-calendar">semana de trabajo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
 <dt class="cap-calendar">suscribirse a calendarios compartidos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
@@ -142,13 +156,13 @@
 </dt>
 <dt class="cap-webmail">disposición, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
-<dt class="cap-webmail">eliminar permanentemente los correos borrados, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+<dt class="cap-webmail">Eliminar permanentemente los correos borrados, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="cap-webmail">enviar automáticamente correos a CCO, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="cap-webmail">estilo de texto predeterminado, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
-<dt class="cap-webmail">formato del mensaje, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+<dt class="cap-webmail">formato de mensaje, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="cap-webmail">fuente de ancho fijo, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
@@ -162,11 +176,13 @@
 </dt>
 <dt class="cap-webmail">mostrar carpeta con todos los mensajes no leídos, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
+<dt class="cap-webmail">mostrar categorías, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+</dt>
 <dt class="cap-webmail">mostrar el texto citado en color diferente, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="cap-webmail">mostrar fecha y hora, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
-<dt class="cap-webmail">mostrar solicitudes de confirmación de lectura, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+<dt class="cap-webmail">Mostrar solicitudes de confirmación de lectura, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="cap-webmail">mostrar tamaño del mensaje, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
@@ -182,7 +198,7 @@
 </dt>
 <dt class="cap-webmail">recopilar contactos automáticamente al leer, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
-<dt class="cap-webmail">reenviar correos como, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+<dt class="cap-webmail">Reenviar correos como, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="cap-webmail">Seleccionar automáticamente el mensaje leído más reciente al comienzo, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
@@ -219,7 +235,7 @@
 </dt>
 <dt class="cap-contacts">contacto, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.attachments.html">Adición de adjuntos</a>, <a class="indexterm" href="ox.appsuite.user.sect.tasks.add.attachments.html">Añadir adjuntos</a>
 </dt>
-<dt class="cap-webmail">correo electrónico, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a>
 </dt>
 <dt class="cap-webmail">de correo ya existente, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a>
 </dt>
@@ -335,7 +351,7 @@
 </dt>
 <dt class="cap-contacts">contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.delete.html">Borrado de contactos</a>
 </dt>
-<dt class="cap-webmail">Correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a>, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a>
 </dt>
 <dt class="">cuenta, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Visualización, edición, borrado de cuentas</a>
 </dt>
@@ -389,48 +405,49 @@
 </dt>
 <dt class="cap-calendar">Botón Nueva cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.new.html">El botón Nueva cita</a>
 </dt>
+<dt class="cap-share_links cap-share_mail_attachments">compartir, ver compartido, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a>
+</dt>
 <dt class="cap-calendar">componentes, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.html">Los componentes de Calendario</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Creación de citas usando el calendario de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creación de citas usando el calendario de recursos</a>
+<dt class="feat-io-ox-core-resourceCalendars">crear citas usando el calendario de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creación de citas usando el calendario de recursos</a>
 </dt>
 <dt class="cap-calendar">el menú Configuración, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">El menú de configuración de Calendario</a>
 </dt>
-<dt class="cap-calendar">Importar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importación de calendarios desde ficheros</a>
+<dt class="cap-calendar">importar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importación de calendarios desde ficheros</a>
 </dt>
 <dt class="cap-calendar">mini calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">El mini calendario</a>
 </dt>
 <dt class="cap-calendar">selector de fecha, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">El selector de fecha</a>
 </dt>
-<dt class="cap-calendar_google">Suscribirse a calendarios de Google, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Suscribirse a calendarios de Google</a>
+<dt class="cap-calendar_google">suscribirse a calendarios de Google, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Suscribirse a calendarios de Google</a>
 </dt>
 <dt class="cap-calendar">suscribirse a calendarios iCal, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Suscripción a calendarios externos desde una url iCal</a>
 </dt>
 <dt class="cap-calendar">suscribirse a calendarios públicos y compartidos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Suscripción a calendarios públicos y compartidos</a>
 </dt>
+<dt class="feat-io-ox-core-resourceCalendars">usar calendarios de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Uso de calendarios de recursos</a>
+</dt>
+<dt class="feat-io-ox-core-categories">usar categorías, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
+</dt>
 <dt class="cap-calendar">usar colores del calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Uso de colores del calendario</a>
 </dt>
 <dt class="cap-calendar">usar la vista de planificación, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Uso de calendarios de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Uso de calendarios de recursos</a>
-</dt>
 <dt class="cap-calendar">ventana de edición, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.create.html">La ventana de edición de citas:</a>
 </dt>
 <dt class="cap-calendar">ventana emergente, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de Calendario</a>
 </dt>
 <dt class="cap-calendar">vista de calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.calendarview.html">Vista del calendario Día, Semana laboral, Semana, Mes o Año.</a>
 </dt>
-<dt class="cap-calendar">vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de Calendario</a>
+<dt class="cap-calendar">Vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de Calendario</a>
 </dt>
 <dt class="cap-calendar">vista de detalle, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista de detalle de Calendario</a>
 </dt>
-<dt class="cap-calendar">Vista de lista, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de Calendario</a>
+<dt class="cap-calendar">vista de lista, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de Calendario</a>
 </dt>
 <dt class="cap-calendar">vista de planificación, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.scheduling.html">La vista de planificación</a>
 </dt>
 </dl></dd>
-<dt class="cap-share_links cap-share_mail_attachments">calendario</dt>
-<dd><dl><dt class="cap-share_links cap-share_mail_attachments">compartir, ver compartido, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a>
-</dt></dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Calendario de recursos</dt>
 <dd><dl>
 <dt class="feat-io-ox-core-resourceCalendars">crear, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creación de calendarios de recursos y grupos de calendarios de recursos</a>
@@ -484,7 +501,7 @@
 </dt>
 <dt class="">permisos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">¿Cuál es la finalidad de los permisos?</a>
 </dt>
-<dt class="">Renombrar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Renombrado de carpetas</a>
+<dt class="">renombrar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Renombrado de carpetas</a>
 </dt>
 <dt class="cap-infostore">subir, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Subida de ficheros o carpetas</a>
 </dt>
@@ -492,8 +509,18 @@
 </dt>
 </dl></dd>
 <dt class="feat-io-ox-core-categories">Categorías</dt>
-<dd><dl><dt class="feat-io-ox-core-categories">gestionar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="feat-io-ox-core-categories">gestionar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+</dt>
+<dt class="feat-io-ox-core-categories">usar para citas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
+</dt>
+<dt class="feat-io-ox-core-categories">usar para contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a>
+</dt>
+<dt class="feat-io-ox-core-categories">usar para correos, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
+</dt>
+<dt class="feat-io-ox-core-categories">usar para tareas, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">Categorías de la bandeja de entrada</dt>
 <dd><dl><dt class="cap-webmail">trabajo con, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a>
 </dt></dl></dd>
@@ -520,7 +547,7 @@
 </dt>
 <dt class="">Citas</dt>
 <dd><dl>
-<dt class="cap-calendar">Añadir adjuntos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Añadir adjuntos</a>
+<dt class="cap-calendar">añadir adjuntos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Añadir adjuntos</a>
 </dt>
 <dt class="cap-calendar">añadir participantes o recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.participants.html">Añadir participantes o recursos</a>
 </dt>
@@ -564,15 +591,15 @@
 </dt>
 <dt class="cap-calendar">guardar adjunto, <a class="indexterm" href="ox.appsuite.user.sect.calendar.attachments.html">Visualización y guardado de adjuntos de citas</a>
 </dt>
-<dt class="cap-calendar">Importar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importación de citas</a>
+<dt class="cap-calendar">importar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importación de citas</a>
 </dt>
 <dt class="cap-calendar">imprimir, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.print.html">Impresión de citas</a>
 </dt>
 <dt class="cap-calendar">invitar a los destinatarios de correo a nuevas citas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.recipients.html">Invitación de destinatarios de correo a nuevas citas</a>
 </dt>
-<dt class="cap-calendar">invitar desde una libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitar contactos a una cita</a>
+<dt class="cap-calendar">invitar a participantes a una nueva cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a>
 </dt>
-<dt class="cap-calendar">Invitar participantes a una nueva cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a>
+<dt class="cap-calendar">invitar desde una libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitar contactos a una cita</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">llamar a los participantes de la cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a>
 </dt>
@@ -582,15 +609,17 @@
 </dt>
 <dt class="cap-calendar">planificar para otro día, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a>
 </dt>
-<dt class="cap-calendar cap-switchboard">programar conferencia de audio/vídeo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a>
+<dt class="cap-calendar cap-switchboard">programar conferencia de audio/vídeo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a>
 </dt>
-<dt class="cap-calendar">resolver conflictos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a>
+<dt class="cap-calendar">resolver conflictos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a>
 </dt>
 <dt class="cap-calendar">responder a invitaciones, <a class="indexterm" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a>
 </dt>
+<dt class="feat-io-ox-core-categories">usar categorías, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
+</dt>
 <dt class="cap-calendar">usar colores del calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Uso de colores del calendario</a>
 </dt>
-<dt class="">usar cuenta atrás, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
+<dt class="">usar cuenta atrás, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
 </dt>
 <dt class="cap-calendar">usar el selector de fecha, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.datepicker.html">Uso del selector de fecha</a>
 </dt>
@@ -652,7 +681,7 @@
 </dt>
 <dt class="cap-contacts">contactos, consulte los ajustes de la libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Ajustes de la libreta de direcciones</a>
 </dt>
-<dt class="cap-webmail">correo electrónico, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="">datos de contacto personales, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Cambio de datos personales de contacto</a>
 </dt>
@@ -663,19 +692,14 @@
 <dt class="">notificaciones, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
 </dl></dd>
-<dt class="cap-infostore">configuración</dt>
-<dd><dl><dt class="cap-infostore">
-        Ficheros
-        
-        
-        
-      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
-</dt></dl></dd>
 <dt class="cap-share_links cap-share_mail_attachments">Configuración de Correo</dt>
 <dd><dl><dt class="cap-share_links cap-share_mail_attachments">Suscripción a carpetas IMAP, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Suscripción a carpetas de correo compartidas o personales</a>
 </dt></dl></dd>
+<dt class="cap-guard">Configuración de Guard</dt>
+<dd><dl><dt class="cap-guard">opciones de redacción, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+</dt></dl></dd>
 <dt class="cap-calendar">Configuración de Jitsi</dt>
-<dd><dl><dt class="cap-calendar">Copiar enlace a la ubicación automáticamente, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
+<dd><dl><dt class="cap-calendar">copiar enlace a la ubicación automáticamente, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt></dl></dd>
 <dt class="">Configuración de tareas</dt>
 <dd><dl>
@@ -690,20 +714,20 @@
 <dd><dl>
 <dt class="cap-calendar">añadir siempre una contraseña de reunión aleatoria, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
-<dt class="cap-calendar">Copiar enlace a la ubicación automáticamente, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
+<dt class="cap-calendar">copiar enlace a la ubicación automáticamente, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
-<dt class="cap-calendar">Copiar información de acceso telefónico a la descripción, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
+<dt class="cap-calendar">copiar información de acceso telefónico a la descripción, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
 </dl></dd>
 <dt class="">Configuración del calendario</dt>
 <dd><dl>
-<dt class="">borrar automáticamente el correo de invitación cuando la cita haya sido aceptada o rechazada, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
+<dt class="">Borrar automáticamente el correo de invitación cuando la cita haya sido aceptada o rechazada, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
 <dt class="cap-portal">configuración avanzada, <a class="indexterm" href="ox.appsuite.user.sect.portal.settings.html">Ajustes del portal</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Ajustes de la libreta de direcciones</a>
 </dt>
-<dt class="">recibir notificación como creador de la cita cuando los participantes acepten o rechacen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
+<dt class="">Recibir notificación como creador de la cita cuando los participantes acepten o rechacen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
-<dt class="">recibir notificación como participante de la cita cuando otros participantes acepten o rechacen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
+<dt class="">Recibir notificación como participante de la cita cuando otros participantes acepten o rechacen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
 <dt class="">recibir notificaciones cuando se ha creado, modificado o borrado, una cita en la que participa, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
@@ -801,6 +825,8 @@
 </dt>
 <dt class="cap-contacts">suscribirse a libretas de direcciones públicas y compartidas, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Suscribirse a libretas de direcciones públicas y compartidas</a>
 </dt>
+<dt class="feat-io-ox-core-categories">usar categorías, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a>
+</dt>
 <dt class="cap-contacts">ver adjunto, <a class="indexterm" href="ox.appsuite.user.sect.contacts.attachments.html">Visualización o guardado de adjuntos de contactos</a>
 </dt>
 <dt class="cap-contacts">visualizar, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.html">Visualización de contactos</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualización de los contactos de una libreta de direcciones</a>
@@ -812,9 +838,9 @@
 <dd><dl>
 <dt class="">cambiar, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.changepassword.html">Modificación de la contraseña</a>
 </dt>
-<dt class="cap-guard">cambiar contraseña de Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
+<dt class="cap-guard">cambiar contraseña de Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Cambiar la contraseña</a>
 </dt>
-<dt class="cap-guard">restablecer la contraseña de Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
+<dt class="cap-guard">restablecer la contraseña de Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">restablecer la contraseña</a>
 </dt>
 <dt class="">Uso de contraseñas de aplicación, <a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">Uso de contraseñas de aplicación</a>
 </dt>
@@ -830,41 +856,14 @@
 </dl></dd>
 <dt class="">correo</dt>
 <dd><dl>
-<dt class="cap-guard">borrar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
-</dt>
-<dt class="cap-guard">cifrar correos entrantes, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Cifrado de correos entrantes mediante una regla de filtrado</a>
-</dt>
-<dt class="cap-guard">enviar correos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a>
-</dt>
-<dt class="">imágenes externas, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Imágenes vinculadas externamente en correos</a>
-</dt>
-<dt class="cap-guard">leer correos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Lectura de correos cifrados</a>
-</dt>
-<dt class="cap-guard">mostrar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
-</dt>
-<dt class="">sonidos de notificación, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
-</dt>
-<dt class="cap-guard">verificar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
-</dt>
-<dt class="cap-infostore">visualizar adjuntos, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Visualización de adjuntos de correo en Ficheros</a>
-</dt>
-</dl></dd>
-<dt class="cap-webmail">Correo</dt>
-<dd><dl>
-<dt class="cap-webmail">añadir adjuntos, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a>
+<dt class="cap-webmail">añadir adjuntos, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a>
 </dt>
 <dt class="cap-webmail">añadir adjuntos de correos ya existentes, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a>
 </dt>
 <dt class="cap-portal">añadir al portal, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.addportal.html">Añadir un correo al portal</a>
 </dt>
-<dt class="feat-io-ox-core-enterprisePicker">añadir automáticamente desde el directorio de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Adición automática de Contactos o Recursos desde el Directorio de Direcciones</a>
-</dt>
-<dt class="cap-contacts">añadir automáticamente desde libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Adición automática de Contactos o Recursos desde una libreta de direcciones</a>
-</dt>
 <dt class="cap-webmail">añadir carpeta, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Añadir carpetas de correo</a>
 </dt>
-<dt class="cap-webmail">añadir cuenta de correo, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a>
-</dt>
 <dt class="cap-webmail">archivar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">Archivado de correos</a>
 </dt>
 <dt class="cap-webmail">asignar color, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a>
@@ -873,71 +872,61 @@
 </dt>
 <dt class="cap-webmail">borrar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a>
 </dt>
+<dt class="cap-guard">borrar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
+</dt>
 <dt class="cap-webmail">buscar, <a class="indexterm" href="ox.appsuite.user.sect.email.search.html">Búsqueda de correos</a>
 </dt>
 <dt class="cap-webmail">Categorías de la bandeja de entrada, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a>
 </dt>
-<dt class="cap-webmail">clasificar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a>
-</dt>
-<dt class="cap-share_links cap-share_mail_attachments">compartir, ver compartido, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a>
+<dt class="cap-guard">cifrar correos entrantes, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Cifrado de correos entrantes mediante una regla de filtrado</a>
 </dt>
-<dt class="cap-webmail">configuración, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+<dt class="cap-webmail">clasificar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a>
 </dt>
 <dt class="cap-webmail">copiar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Mover o copiar correos</a>
 </dt>
-<dt class="cap-webmail">correo unificado, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a>
+<dt class="cap-webmail">Correo unificado, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a>
 </dt>
 <dt class="cap-tasks">crear recordatorio, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.reminder.html">Creación de recordatorios de correo</a>
 </dt>
-<dt class="cap-webmail">desactivar o activar cuentas de correo instrumentales, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Desactivar o activar de cuentas de correo instrumentales</a>
-</dt>
-<dt class="cap-deputy">editar, administrar como representante, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a>
-</dt>
-<dt class="cap-webmail">enviar, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
+<dt class="cap-webmail">enviar, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a>
 </dt>
 <dt class="cap-calendar">enviar a participantes en citas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attendees.html">Envío de un correo a participantes de citas</a>
 </dt>
-<dt class="cap-deputy">enviar como representante, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a>
+<dt class="cap-infostore">enviar adjuntos como enlace, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">enviar adjuntos como enlace</a>
 </dt>
-<dt class="cap-webmail">enviar desde la libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envío de correos desde una libreta de direcciones</a>
+<dt class="cap-guard">enviar correos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a>
 </dt>
 <dt class="cap-webmail">enviar un aviso de ausencia, <a class="indexterm" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Envío de un aviso de ausencia automático</a>
 </dt>
-<dt class="cap-infostore">Envío de adjuntos como enlace, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envío de adjuntos como enlace</a>
-</dt>
 <dt class="feat-io-ox-core-mailPDFExport">exportar como PDF, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exportación de correos como PDF</a>
 </dt>
 <dt class="cap-webmail">filtros, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Uso de filtros de correo</a>
 </dt>
 <dt class="cap-webmail">Gestionar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a>
 </dt>
-<dt class="cap-webmail">guardar adjunto, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a>
-</dt>
 <dt class="cap-webmail">guardar como EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">Almacenamiento de correos</a>
 </dt>
-<dt class="cap-guard">importar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importación de claves de Autocrypt</a>
+<dt class="">imágenes externas, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Imágenes vinculadas externamente en correos</a>
 </dt>
 <dt class="cap-webmail">importar de EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importación de correos</a>
 </dt>
-<dt class="cap-webmail">imprimir, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a>
+<dt class="cap-guard">leer correos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Lectura de correos cifrados</a>
 </dt>
 <dt class="cap-webmail">limpiar carpetas, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a>
 </dt>
-<dt class="cap-webmail cap-switchboard">llamar al remitente o a otro destinatario, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a>
-</dt>
 <dt class="cap-webmail">marcar carpeta como leída, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a>
 </dt>
 <dt class="cap-webmail">marcar como leído, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a>
 </dt>
-<dt class="cap-webmail">marcar como leído, ajuste para, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
-</dt>
 <dt class="cap-webmail">marcar como no leído, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a>
 </dt>
-<dt class="cap-webmail">mostrar código fuente del correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Mostrar código fuente del correo</a>
+<dt class="cap-guard">mostrar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
 </dt>
 <dt class="cap-webmail">mover, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Mover o copiar correos</a>
 </dt>
-<dt class="cap-webmail">recopilar direcciones, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Recopilación de direcciones</a>
+<dt class="cap-webmail">Recuperar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a>
+</dt>
+<dt class="cap-dumpster">recuperar correos borrados permanentemente, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a>
 </dt>
 <dt class="cap-webmail">reenviar automáticamente, <a class="indexterm" href="ox.appsuite.user.sect.email.send.autoforward.html">Reenvío automático de correos</a>
 </dt>
@@ -945,27 +934,40 @@
 </dt>
 <dt class="cap-webmail">responder, <a class="indexterm" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a>
 </dt>
-<dt class="cap-webmail">seleccionar una dirección de remite, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a>
+<dt class="cap-webmail">seleccionar una dirección de remite, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a>
 </dt>
-<dt class="cap-guard">transferir claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Transferencia de claves de Autocrypt a otros clientes</a>
+<dt class="">sonidos de notificación, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
 <dt class="cap-webmail">usar borrador, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">Uso de borradores de correo</a>
 </dt>
-<dt class="cap-webmail">usar firmas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a>
-</dt>
-<dt class="feat-io-ox-core-openai">usar funciones de AI al redactar correos, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Uso de funciones de AI al redactar correos</a>
-</dt>
 <dt class="feat-io-ox-core-openai">usar funciones de AI en respuestas, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">Uso de funciones de AI al responder a correos</a>
 </dt>
 <dt class="feat-io-ox-core-openai">usar integración con AI, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Uso de la integración con AI</a>
 </dt>
-<dt class="feat-io-ox-core-templates">usar plantillas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a>
-</dt>
-<dt class="cap-webmail">ver adjunto, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a>
+<dt class="cap-guard">verificar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
 </dt>
 <dt class="cap-webmail">visualizar, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a>
 </dt>
 </dl></dd>
+<dt class="cap-contacts">Correo</dt>
+<dd><dl>
+<dt class="feat-io-ox-core-enterprisePicker">añadir automáticamente desde el directorio de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Adición automática de Contactos o Recursos desde el Directorio de Direcciones</a>
+</dt>
+<dt class="cap-contacts">añadir automáticamente desde libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Adición automática de Contactos o Recursos desde una libreta de direcciones</a>
+</dt>
+<dt class="cap-share_links cap-share_mail_attachments">compartir, ver compartido, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a>
+</dt>
+<dt class="cap-webmail">desactivar o activar cuentas de correo instrumentales, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Desactivar o activar de cuentas de correo instrumentales</a>
+</dt>
+<dt class="cap-webmail">enviar desde la libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envío de correos desde una libreta de direcciones</a>
+</dt>
+<dt class="cap-guard">importar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importación de claves de Autocrypt</a>
+</dt>
+<dt class="cap-guard">transferir claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Transferencia de claves de Autocrypt a otros clientes</a>
+</dt>
+<dt class="cap-infostore">visualizar adjuntos, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Visualización de adjuntos de correo en Ficheros</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">
       Correo electrónico
       
@@ -979,28 +981,60 @@
   </a>
 </dt>
 <dd><dl>
+<dt class="cap-webmail">añadir cuenta de correo, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a>
+</dt>
+<dt class="cap-webmail">barra de categorías de la bandeja de entrada, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de categorías de la bandeja de entrada</a>
+</dt>
 <dt class="cap-webmail">barra de herramientas, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de Correo electrónico</a>
 </dt>
-<dt class="cap-webmail">barra de pestañas, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de pestañas de Correo electrónico</a>
+<dt class="cap-webmail">borrar permanentemente, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a>
 </dt>
 <dt class="cap-webmail">Botón Nuevo correo, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.new.html">El botón Nuevo correo</a>
 </dt>
 <dt class="cap-webmail">componentes, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.html">Los componentes de Correo electrónico</a>
 </dt>
+<dt class="cap-webmail">configuración, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+</dt>
+<dt class="cap-deputy">editar, administrar como representante, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a>
+</dt>
 <dt class="cap-webmail">el menú Configuración, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">El menú de configuración de Correo electrónico</a>
 </dt>
+<dt class="cap-deputy">enviar como representante, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a>
+</dt>
+<dt class="cap-webmail">guardar adjunto, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a>
+</dt>
+<dt class="cap-webmail">imprimir, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a>
+</dt>
+<dt class="cap-webmail cap-switchboard">llamar al remitente o a otro destinatario, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a>
+</dt>
+<dt class="cap-webmail">marcar como leído, ajuste para, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+</dt>
+<dt class="cap-webmail">mostrar código fuente del correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Mostrar código fuente del correo</a>
+</dt>
+<dt class="cap-webmail">recopilar direcciones, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Recopilación de direcciones</a>
+</dt>
+<dt class="cap-webmail">usar firmas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a>
+</dt>
+<dt class="feat-io-ox-core-openai">usar funciones de AI al redactar correos, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Uso de funciones de AI al redactar correos</a>
+</dt>
+<dt class="feat-io-ox-core-templates">usar plantillas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a>
+</dt>
+<dt class="feat-io-ox-core-categories">utilizar categorías, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
+</dt>
 <dt class="cap-webmail">ventana de edición, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.create.html">La ventana de edición de correo</a>
 </dt>
 <dt class="cap-webmail">ventana emergente, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.popup.html">El elemento emergente de Correo electrónico</a>
 </dt>
-<dt class="cap-webmail">vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de Correo electrónico</a>
+<dt class="cap-webmail">ver adjunto, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a>
+</dt>
+<dt class="cap-webmail">Vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de Correo electrónico</a>
 </dt>
 <dt class="cap-webmail">vista de detalle, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de Correo electrónico</a>
 </dt>
 <dt class="cap-webmail">vista de lista, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de Correo electrónico</a>
 </dt>
 </dl></dd>
-<dt class="cap-webmail">correo unificado, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a>
+<dt class="cap-webmail">Correo unificado, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a>
 </dt>
 <dt class="cap-webmail">Correo, consulte Correo electrónico, <a class="indexterm" href="ox.appsuite.user.chap.email.html">
     Correo electrónico
@@ -1058,7 +1092,7 @@
 <div class="indexdiv">
 <h3>D</h3>
 <dl>
-<dt class="">datos de contacto personales, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Cambio de datos personales de contacto</a>
+<dt class="">Datos de contacto personales, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Cambio de datos personales de contacto</a>
 </dt>
 <dt class="">Definiciones, <a class="indexterm" href="ox.appsuite.user.sect.about.glossary.html">Terminología</a>
 </dt>
@@ -1141,14 +1175,14 @@
 <dd><dl>
 <dt class="cap-contacts">contactos como vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envío de contactos como vCard</a>
 </dt>
-<dt class="cap-webmail">correo electrónico, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a>
 </dt>
 </dl></dd>
 <dt class="cap-switchboard">Establece el estado de presencia, <a class="indexterm" href="ox.appsuite.user.sect.settings.presencestatus.html">Establecer el estado de presencia</a>
 </dt>
 <dt class="">Estructura de carpetas</dt>
 <dd><dl>
-<dt class="">Favoritos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Añadir carpetas a favoritos</a>
+<dt class="">favoritos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Añadir carpetas a favoritos</a>
 </dt>
 <dt class="">navegar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Navegación por el árbol de carpetas</a>
 </dt>
@@ -1260,6 +1294,8 @@
   </a>
 </dt>
 <dd><dl>
+<dt class="cap-infostore">ajustes, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
+</dt>
 <dt class="cap-infostore">añadir carpeta, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.html">Ficheros: Añadir carpetas</a>
 </dt>
 <dt class="cap-portal">Añadir ficheros al portal, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.addportal.html">Añadir ficheros al portal</a>
@@ -1282,8 +1318,6 @@
 </dt>
 <dt class="cap-infostore">componentes, <a class="indexterm" href="ox.appsuite.user.sect.drive.gui.html">Los componentes de Ficheros</a>
 </dt>
-<dt class="cap-infostore">configuración, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
-</dt>
 <dt class="cap-infostore">Copia de ficheros, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.copy.html">Copia de ficheros</a>
 </dt>
 <dt class="cap-infostore">Creación o edición de descripciones, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creación o edición de descripciones</a>
@@ -1400,7 +1434,7 @@
 </dt></dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Grupo de calendarios de recursos</dt>
 <dd><dl>
-<dt class="feat-io-ox-core-resourceCalendars">Añadir calendarios de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creación de calendarios de recursos y grupos de calendarios de recursos</a>
+<dt class="feat-io-ox-core-resourceCalendars">añadir calendarios de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creación de calendarios de recursos y grupos de calendarios de recursos</a>
 </dt>
 <dt class="feat-io-ox-core-resourceCalendars">crear, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creación de calendarios de recursos y grupos de calendarios de recursos</a>
 </dt>
@@ -1424,7 +1458,7 @@
 </dt>
 <dt class="cap-guard">borrar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
 </dt>
-<dt class="cap-guard">cambiar contraseña, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
+<dt class="cap-guard">cambiar contraseña, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Cambiar la contraseña</a>
 </dt>
 <dt class="cap-guard">cerrar sesión, <a class="indexterm" href="ox.appsuite.user.sect.guard.logout.html">Cierre de sesión de Guard</a>
 </dt>
@@ -1450,25 +1484,29 @@
 </dt>
 <dt class="cap-guard">descifrar ficheros cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.decrypt.html">Descifrado de ficheros</a>
 </dt>
+<dt class="cap-guard">eliminar la función de restablecimiento de contraseña, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Eliminación de la función de restablecimiento de contraseña</a>
+</dt>
 <dt class="cap-guard">enviar correos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a>
 </dt>
-<dt class="cap-guard">gestión de claves, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a>
+<dt class="cap-guard">Gestión de claves, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a>
+</dt>
+<dt class="cap-guard">gestionar claves PGP de los destinatarios, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves PGP de destinatarios</a>
 </dt>
 <dt class="cap-guard">gestionar claves PGP propias, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a>
 </dt>
 <dt class="cap-smime">gestionar claves propias S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a>
 </dt>
-<dt class="cap-guard">gestionar claves públicas, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves públicas</a>
+<dt class="cap-guard">gestionar claves S/MIME de destinatarios, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Gestionar claves S/MIME de destinatarios</a>
 </dt>
 <dt class="cap-guard">guardar documentos seleccionados en un formato cifrado, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Guardar documentos seleccionados en formato cifrado</a>
 </dt>
-<dt class="cap-guard">importación de claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importación de claves de Autocrypt</a>
+<dt class="cap-guard">importar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importación de claves de Autocrypt</a>
 </dt>
 <dt class="cap-guard">leer correos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Lectura de correos cifrados</a>
 </dt>
 <dt class="cap-guard">mostrar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
 </dt>
-<dt class="cap-guard">restablecer la contraseña, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
+<dt class="cap-guard">restablecer la contraseña, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">restablecer la contraseña</a>
 </dt>
 <dt class="cap-guard">Transferir claves de Autocrypt a otros clientes, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Transferencia de claves de Autocrypt a otros clientes</a>
 </dt>
@@ -1494,20 +1532,18 @@
 </dt>
 </dl></dd>
 <dt class="cap-webmail">importar</dt>
-<dd><dl>
-<dt class="cap-contacts">contactos en formato CSV, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a>
-</dt>
-<dt class="cap-contacts">contactos en formato vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a>
-</dt>
-<dt class="cap-webmail">Correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importación de correos</a>
-</dt>
-</dl></dd>
+<dd><dl><dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importación de correos</a>
+</dt></dl></dd>
 <dt class="cap-calendar">Importar</dt>
 <dd><dl>
-<dt class="cap-calendar">Calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importación de calendarios desde ficheros</a>
+<dt class="cap-calendar">calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importación de calendarios desde ficheros</a>
 </dt>
 <dt class="cap-calendar">citas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importación de citas</a>
 </dt>
+<dt class="cap-contacts">contactos en formato CSV, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a>
+</dt>
+<dt class="cap-contacts">contactos en formato vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a>
+</dt>
 <dt class="cap-tasks">tareas, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importación de tareas</a>
 </dt>
 </dl></dd>
@@ -1517,7 +1553,7 @@
 </dt>
 <dt class="cap-contacts">contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.print.html">Impresión de contactos</a>
 </dt>
-<dt class="cap-webmail">correo electrónico, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a>
 </dt>
 <dt class="cap-infostore">documentos, ficheros de texto, imágenes, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Impresión de ficheros como PDF</a>
 </dt>
@@ -1587,7 +1623,7 @@
 <dl>
 <dt class="cap-webmail cap-switchboard">Jitsi</dt>
 <dd><dl>
-<dt class="cap-contacts cap-switchboard">Llamar a contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
+<dt class="cap-contacts cap-switchboard">llamar a contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">llamar a los participantes de la cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a>
 </dt>
@@ -1595,7 +1631,7 @@
 </dt>
 <dt class="cap-webmail cap-switchboard">llamar al remitente o a otro destinatario, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a>
 </dt>
-<dt class="cap-calendar cap-switchboard">programar conferencias de audio/vídeo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a>
+<dt class="cap-calendar cap-switchboard">programar conferencias de audio/vídeo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a>
 </dt>
 </dl></dd>
 </dl>
@@ -1644,7 +1680,7 @@
 </dt>
 <dt class="cap-contacts">ventana de edición de lista de distribución, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.createlist.html">La ventana de edición de lista de distribución</a>
 </dt>
-<dt class="cap-contacts">vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista de carpeta de Libreta de direcciones</a>
+<dt class="cap-contacts">Vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista de carpeta de Libreta de direcciones</a>
 </dt>
 <dt class="cap-contacts">vista de detalle, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista de detalle de Libreta de direcciones</a>
 </dt>
@@ -1713,23 +1749,25 @@
 <dd><dl>
 <dt class="">Abrir área de notificación automáticamente, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
-<dt class="">Usar el área de notificación, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a>
-</dt>
-<dt class="">Uso de cuentas atrás para Citas, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
+<dt class="">usar el área de notificación, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a>
 </dt>
 </dl></dd>
 <dt class="">Notificaciones</dt>
-<dd><dl><dt class="">mostrar notificaciones de escritorio, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="">mostrar notificaciones de escritorio, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
+</dt>
+<dt class="">usar cuentas atrás para citas, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">Nuevo</dt>
 <dd><dl>
 <dt class="cap-tasks">añadir lista de tareas personales, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.personal.html">Adición de lista de tareas personales</a>
 </dt>
-<dt class="cap-calendar">Calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Adición de calendarios</a>
+<dt class="cap-calendar">calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Adición de calendarios</a>
 </dt>
 <dt class="cap-calendar">calendarios personales, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.personal.html">Adición de calendarios personales</a>
 </dt>
-<dt class="cap-webmail">Carpetas de correo, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Añadir carpetas de correo</a>
+<dt class="cap-webmail">carpetas de correo, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Añadir carpetas de correo</a>
 </dt>
 <dt class="cap-infostore">Carpetas de Ficheros, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.html">Ficheros: Añadir carpetas</a>, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.personal.html">Ficheros: creación de carpetas</a>
 </dt>
@@ -1737,7 +1775,7 @@
 </dt>
 <dt class="cap-contacts">contacto, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.create.html">Creación de un nuevo contacto</a>
 </dt>
-<dt class="cap-webmail">correo electrónico, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a>
 </dt>
 <dt class="cap-guard">crear documentos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.createencrypted.html">Creación de nuevos documentos cifrados</a>
 </dt>
@@ -1777,20 +1815,23 @@
 <dt class="cap-infostore">PDF, imprimir fichero como, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Impresión de ficheros como PDF</a>
 </dt>
 </dl></dd>
-<dt class="">permisos</dt>
+<dt class="">Permisos</dt>
 <dd><dl>
 <dt class="cap-share_links cap-share_mail_attachments">administrador, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">¿Qué permisos se pueden usar?</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">aplicación, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">¿Qué permisos se pueden usar?</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">autor, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">¿Qué permisos se pueden usar?</a>
-</dt>
 <dt class="">definición, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">¿Cuál es la finalidad de los permisos?</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">ejemplos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">Casos de uso de permisos</a>
-</dt>
 <dt class="cap-share_links cap-share_mail_attachments">espectador, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">¿Qué permisos se pueden usar?</a>
 </dt>
+</dl></dd>
+<dt class="cap-share_links cap-share_mail_attachments">permisos</dt>
+<dd><dl>
+<dt class="cap-share_links cap-share_mail_attachments">autor, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">¿Qué permisos se pueden usar?</a>
+</dt>
+<dt class="cap-share_links cap-share_mail_attachments">ejemplos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">Casos de uso de permisos</a>
+</dt>
 <dt class="cap-share_links cap-share_mail_attachments">revisor, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">¿Qué permisos se pueden usar?</a>
 </dt>
 </dl></dd>
@@ -1824,15 +1865,22 @@
 </dt></dl></dd>
 <dt class="">Primeros pasos, <a class="indexterm" href="ox.appsuite.user.chap.firststeps.html">Primeros Pasos</a>
 </dt>
-<dt class="cap-calendar cap-switchboard">Programar conferencia, audio/vídeo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a>
+<dt class="cap-calendar cap-switchboard">Programación de conferencias de audio/vídeo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a>
 </dt>
-<dt class="cap-calendar cap-switchboard">Programar conferencias de audio/vídeo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a>
+<dt class="cap-calendar cap-switchboard">Programar conferencia, audio/vídeo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>R</h3>
 <dl>
+<dt class="cap-webmail">Recuperar</dt>
+<dd><dl>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a>
+</dt>
+<dt class="cap-dumpster">correos borrados permanentemente, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a>
+</dt>
+</dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Recurso</dt>
 <dd><dl>
 <dt class="feat-io-ox-core-enterprisePicker">añadir automáticamente desde el directorio de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Adición automática de Contactos o Recursos desde el Directorio de Direcciones</a>
@@ -1841,7 +1889,7 @@
 </dt>
 <dt class="cap-edit_resource">usar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resources.html">Uso de recursos</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Uso de calendarios de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Uso de calendarios de recursos</a>
+<dt class="feat-io-ox-core-resourceCalendars">usar calendarios de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Uso de calendarios de recursos</a>
 </dt>
 <dt class="feat-io-ox-core-managedResources">uso, recursos gestionados, <a class="indexterm" href="ox.appsuite.user.sect.calendar.managedresources.html">Uso de recursos gestionados</a>
 </dt>
@@ -1883,7 +1931,7 @@
 </dt>
 <dt class="cap-deputy">enviar correos, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a>
 </dt>
-<dt class="cap-deputy">gestionar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestionar representantes</a>
+<dt class="cap-deputy">gestionar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestionar representantes</a>
 </dt>
 <dt class="cap-deputy">visualizar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">Visualización, edición, borrado de representantes</a>
 </dt>
@@ -1940,7 +1988,7 @@
 </dt>
 <dt class="cap-calendar">calendarios iCal, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Suscripción a calendarios externos desde una url iCal</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">Carpetas de correo, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Suscripción a carpetas de correo compartidas o personales</a>
+<dt class="cap-share_links cap-share_mail_attachments">carpetas de correo, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Suscripción a carpetas de correo compartidas o personales</a>
 </dt>
 <dt class="cap-contacts">libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Suscripción a libretas de direcciones externas</a>
 </dt>
@@ -2023,11 +2071,13 @@
 </dt>
 <dt class="cap-contacts">suscribirse a listas de tareas públicas y compartidas, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Suscribirse a listas de tareas públicas y compartidas</a>
 </dt>
+<dt class="feat-io-ox-core-categories">usar categorías, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a>
+</dt>
 <dt class="cap-tasks">ventana de edición, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.create.html">La ventana de edición</a>
 </dt>
 <dt class="cap-tasks">ver adjunto, <a class="indexterm" href="ox.appsuite.user.sect.tasks.attachments.html">Visualización o almacenamiento de adjuntos de tareas</a>
 </dt>
-<dt class="cap-tasks">vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista de carpeta de Tareas</a>
+<dt class="cap-tasks">Vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista de carpeta de Tareas</a>
 </dt>
 <dt class="cap-tasks">vista de detalle, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.detailview.html">La vista de detalle de Tareas</a>
 </dt>
@@ -2036,7 +2086,7 @@
 </dl></dd>
 <dt class="cap-calendar cap-switchboard">Teléfono</dt>
 <dd><dl>
-<dt class="cap-contacts cap-switchboard">Llamar a contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
+<dt class="cap-contacts cap-switchboard">llamar a contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">llamar a los participantes de la cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a>
 </dt>
@@ -2050,7 +2100,9 @@
 <div class="indexdiv">
 <h3>U</h3>
 <dl>
-<dt class="">Usar el área de notificación, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a>
+<dt class="">Usar cuentas atrás para citas, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
+</dt>
+<dt class="">usar el área de notificación, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a>
 </dt>
 <dt class="cap-webmail">Usar firmas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a>
 </dt>
@@ -2060,8 +2112,6 @@
 </dt>
 <dt class="feat-io-ox-core-templates">Usar plantillas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a>
 </dt>
-<dt class="">Uso de cuentas atrás para Citas, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
-</dt>
 <dt class="">Uso en dispositivos móviles, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.mobile.html">Notas sobre el uso en dispositivos móviles</a>
 </dt>
 </dl>
@@ -2086,12 +2136,13 @@
 </dt>
 <dt class="">vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.foldertree.html">La vista de carpetas</a>
 </dt>
+<dt class="">Vista de carpeta</dt>
 <dd><dl>
 <dt class="">abrir, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Navegación por el árbol de carpetas</a>
 </dt>
 <dt class="">cambiar el ancho, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Navegación por el árbol de carpetas</a>
 </dt>
-<dt class="">Favoritos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Añadir carpetas a favoritos</a>
+<dt class="">favoritos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Añadir carpetas a favoritos</a>
 </dt>
 <dt class="">ocultar carpetas, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.hide.html">Ocultar carpetas</a>
 </dt>
@@ -2100,7 +2151,7 @@
 </dt>
 <dt class="">Vista de lista, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.list.html">La vista de lista</a>
 </dt>
-<dt class="cap-webmail cap-calendar cap-tasks">vista halo, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualización de contactos en la vista halo</a>
+<dt class="cap-webmail cap-calendar cap-tasks">Vista halo, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualización de contactos en la vista halo</a>
 </dt>
 <dt class="">Vista halo, consulte elemento emergente, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.popup.html">La ventana emergente</a>
 </dt>
@@ -2194,7 +2245,7 @@
 </dl></dd>
 <dt class="cap-webmail cap-switchboard">Zoom</dt>
 <dd><dl>
-<dt class="cap-contacts cap-switchboard">Llamar a contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
+<dt class="cap-contacts cap-switchboard">llamar a contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">llamar a los participantes de la cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a>
 </dt>
@@ -2202,7 +2253,7 @@
 </dt>
 <dt class="cap-webmail cap-switchboard">llamar al remitente o a otro destinatario, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a>
 </dt>
-<dt class="cap-calendar cap-switchboard">programar conferencia de audio/vídeo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a>
+<dt class="cap-calendar cap-switchboard">programar conferencia de audio/vídeo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a>
 </dt>
 </dl></dd>
 </dl>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.about.glossary.html b/help/l10n/es_ES/ox.appsuite.user.sect.about.glossary.html
index 73ea7d2a4..ffe42935c 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.about.glossary.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.about.glossary.html
@@ -47,10 +47,17 @@
 </dd>
 <dt class="feat-io-ox-core-categories" id="ox.appsuite.user.reference.about.glossary.categories"><span class="glossterm">Categorías</span></dt>
 <dd class="glossdef feat-io-ox-core-categories">
-<p role="presentation">Las categorías se pueden utilizar para clasificar citas, contactos y tareas. De esa manera, los objetos relacionados semánticamente se pueden identificar y encontrar fácilmente. Dependiendo de la configuración, están predefinidas categorías específicas. Puede establecer sus propias categorías.</p>
-<p role="presentation">Nota: Dichas categorías no se pueden usar para correos. Para los correos hay pestañas de la bandeja de entrada.</p>
+<p role="presentation">Las categorías le permiten clasificar correos, citas, contactos y tareas en las aplicaciones, independientemente de la estructura de carpetas. Esto permite identificar y encontrar más fácilmente objetos relacionados lógicamente, por ejemplo, todos los correos, citas, contactos y tareas que pertenecen a un proyecto o cliente específicos. Dependiendo de la configuración, hay categorías específicas predefinidas. Puede configurar sus propias categorías.</p>
+<p role="presentation">Nota: Para correos, también puede usar pestañas de la bandeja de entrada.</p>
 <p role="presentation">Temas relacionados: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a></p></li></ul></p>
 </dd>
+<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Categorías de la bandeja de entrada</span></dt>
+<dd class="glossdef cap-webmail">
+<p role="presentation">Las pestañas de la bandeja de entrada proporcionan una forma simple y sencilla de mantener ordenada la <span class="guilabel"><strong>Bandeja de entrada</strong></span>. Usando pestañas, los correos entrantes se guardan separados por remitente en la carpeta <span class="guilabel"><strong>Bandeja de entrada</strong></span>. Dependiendo de la configuración, están predefinidas pestañas de bandeja de entrada específicas. Se pueden definir pestañas adicionales de acuerdo a sus necesidades.</p>
+<p role="presentation">Las pestañas de la bandeja de entrada solo se pueden usar en la carpeta <span class="guilabel"><strong>Bandeja de entrada</strong></span>. Si necesita más opciones de almacenamiento, utilice la vista de carpeta para crear carpetas de correo.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Nota: Las categorías de la bandeja de entrada descritas aquí solo se pueden usar para correos. Dependiendo de la configuración, puede usar categorías separadas para correos, citas, contactos y tareas.</p>
+<p role="presentation">Temas relacionados: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a></p></li></ul></p>
+</dd>
 <dt id="ox.appsuite.user.reference.about.glossary.account"><span class="glossterm">Cuenta</span></dt>
 <dd class="glossdef">
 <p role="presentation">Una cuenta, o una cuenta de usuario, es un permiso de acceso a un sistema informático. Ejemplos de cuentas: <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -144,13 +151,6 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.user">Usuario</a></p>
 </li></ul></p>
 </dd>
-<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Pestañas de la bandeja de entrada</span></dt>
-<dd class="glossdef cap-webmail">
-<p role="presentation">Las pestañas de la bandeja de entrada proporcionan una forma simple y sencilla de mantener ordenada la <span class="guilabel"><strong>Bandeja de entrada</strong></span>. Usando pestañas, los correos entrantes se guardan separados por remitente en la carpeta <span class="guilabel"><strong>Bandeja de entrada</strong></span>. Dependiendo de la configuración, están predefinidas pestañas de bandeja de entrada específicas. Se pueden definir pestañas adicionales de acuerdo a sus necesidades.</p>
-<p role="presentation">Las pestañas de la bandeja de entrada solo se pueden usar en la carpeta <span class="guilabel"><strong>Bandeja de entrada</strong></span>. Si necesita más opciones de almacenamiento, utilice la vista de carpeta para crear carpetas de correo.</p>
-<p role="presentation" class="feat-io-ox-core-categories">Nota: Las pestañas de la bandeja de entrada descritas aquí solo se pueden usar para correos. Dependiendo de la configuración, puede usar categorías separadas para citas, contactos y tareas.</p>
-<p role="presentation">Temas relacionados: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a></p></li></ul></p>
-</dd>
 <dt class="cap-calendar" id="ox.appsuite.user.reference.about.glossary.resource"><span class="glossterm">Recurso</span></dt>
 <dd class="glossdef cap-calendar">
 <p role="presentation">Los recursos son salas o dispositivos que se pueden agregar a una cita. Un recurso consta de un nombre de recurso, una dirección de correo y una descripción opcional.</p>
@@ -181,7 +181,7 @@
 <li class="listitem"><p role="presentation">planificar, editar u organizar las citas de otro usuario</p></li>
 </ul></p>
 <p role="presentation">Temas relacionados: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestionar representantes</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestionar representantes</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creación, edición o gestión de citas como representante</a></p>
 </li></ul></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.alarms.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.alarms.html
index 8a0e6b1af..d96351ac3 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.alarms.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.alarms.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.display.html" title="Configuración de la visualización de una cita">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Añadir participantes o recursos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.alarms">
 <div class="titlepage"><div><div><h3 class="title">Uso de recordatorios de citas</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.12.2"></a><p id="ox.appsuite.user.concept.calendar.add.alarms">Al crear o editar una cita, puede configurar que se le recuerde la fecha de vencimiento de la cita. Para hacerlo, puede usar una o varias de las siguientes notificaciones: </p>
@@ -64,7 +64,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modificación de recordatorios de citas</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.alarms">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.alarms">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.attachments.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.attachments.html
index 4db62e15f..cefc5dfab 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.attachments.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.attachments.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Añadir participantes o recursos">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Uso de la vista de planificación">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attachments">
 <div class="titlepage"><div><div><h3 class="title">Añadir adjuntos</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.14.2"></a><a class="indexterm" name="id-1.8.10.14.3"></a><p id="ox.appsuite.user.concept.calendar.add.attachments">Dependiendo de la configuración, se pueden adjuntar ficheros guardados en su ordenador o en la aplicación <span class="phrase">Ficheros</span>.</p>
@@ -65,7 +65,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.attachments">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attachments">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.attendees.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.attendees.html
index 0cbefb0f2..05ef26c46 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.attendees.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.attendees.html
@@ -1,11 +1,11 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Invitar participantes a una nueva cita</title>
+<title>Invitación de participantes a una nueva cita</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Creación de una cita de seguimiento">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="Invitación de destinatarios de correo a nuevas citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attendees">
-<div class="titlepage"><div><div><h3 class="title">Invitar participantes a una nueva cita</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Invitación de participantes a una nueva cita</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.17.2"></a><p id="ox.appsuite.user.concept.calendar.add.attendees">Si una cita tiene varios participantes, puede invitar a esos participantes a una nueva cita.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.add.attendees">
 <p class="title">Cómo invitar participantes a una nueva cita:</p>
@@ -67,10 +67,10 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.attendees">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attendees">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.call.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.call.html
index ac376cc48..bb7ab95cb 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.call.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.call.html
@@ -1,11 +1,11 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Programación de conferencias de audio o vídeo</title>
+<title>Programación de conferencias de audio/vídeo</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Uso del selector de fecha">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Establecer cita periódica">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.call">
-<div class="titlepage"><div><div><h3 class="title">Programación de conferencias de audio o vídeo</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Programación de conferencias de audio/vídeo</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.9.2"></a><a class="indexterm" name="id-1.8.10.9.3"></a><a class="indexterm" name="id-1.8.10.9.4"></a><a class="indexterm" name="id-1.8.10.9.5"></a><a class="indexterm" name="id-1.8.10.9.6"></a><p id="ox.appsuite.user.precondition.calendar.add.call">Requisito: Debe tener configurada una cuenta con un proveedor de conferencias de audio o vídeo.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.add.call">
 <p class="title">Cómo programar una conferencia de audio o vídeo en la ventana de edición de citas:</p>
@@ -71,7 +71,7 @@
 <p role="presentation" class="feat-jitsi"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.jitsi">Reuniones de Jitsi</a></p>
 <p role="presentation" class="feat-zoom"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.zoom">Reuniones de Zoom</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.call">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.call">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.conflicthandling.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.conflicthandling.html
index e56ee02ef..9a658631f 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.conflicthandling.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.conflicthandling.html
@@ -1,11 +1,11 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>resolver conflictos</title>
+<title>Resolución de conflictos</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Crear citas desde adjuntos iCal">
 <link rel="next" href="ox.appsuite.user.sect.calendar.invitation.html" title="Responder a invitaciones de cita">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.conflicthandling">
-<div class="titlepage"><div><div><h3 class="title">resolver conflictos</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Resolución de conflictos</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.20.2"></a><p id="ox.appsuite.user.concept.calendar.add.conflicthandling">Se produce un conflicto cuando coinciden las siguientes circunstancias:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
@@ -82,7 +82,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.create.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.create.html
index 194e416a8..ac68754f1 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.create.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.create.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Uso del selector de fecha">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.create">
 <div class="titlepage"><div><div><h3 class="title">Creación de nuevas citas</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.7.2"></a><a class="indexterm" name="id-1.8.10.7.3"></a><div class="task" id="ox.appsuite.user.task.calendar.add.create">
@@ -94,7 +94,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.datepicker.html">Uso del selector de fecha</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.serial.html">Establecer cita periódica</a></p>
-<p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a></p>
+<p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.display.html">Configuración de la visualización de una cita</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.alarms.html">Uso de recordatorios de citas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Añadir participantes o recursos</a></p>
@@ -107,16 +107,16 @@
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creación de citas usando el calendario de recursos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creación de una cita de seguimiento</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Invitación de destinatarios de correo a nuevas citas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Crear citas desde adjuntos iCal</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitar contactos a una cita</a></p>
 <p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.create">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.create">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.datepicker.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.datepicker.html
index 4c527f722..d5823465d 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.datepicker.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.datepicker.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.create.html" title="Creación de nuevas citas">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.call.html" title="Programación de conferencias de audio o vídeo">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.call.html" title="Programación de conferencias de audio/vídeo">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.datepicker">
 <div class="titlepage"><div><div><h3 class="title">Uso del selector de fecha</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.8.2"></a><p id="ox.appsuite.user.concept.calendar.add.datepicker">El selector de fecha permite seleccionar la fecha a introducir en un campo de fecha.</p>
@@ -87,7 +87,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Edición de tareas</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.datepicker">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.datepicker">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.display.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.display.html
index 95bb6da3d..7c8cc72e7 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.display.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.display.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Establecer cita periódica">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Uso de recordatorios de citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.display">
 <div class="titlepage"><div><div><h3 class="title">Configuración de la visualización de una cita</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.11.2"></a><p id="ox.appsuite.user.concept.calendar.add.display">Existen las siguientes posibilidades: </p>
@@ -75,7 +75,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">¿Cómo se muestran las citas en una vista de calendario? </a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.display">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.display">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.followup.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.followup.html
index 5b2abec88..66e0ac827 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.followup.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.followup.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Uso de la vista de planificación">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Invitar participantes a una nueva cita">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Invitación de participantes a una nueva cita">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.followup">
 <div class="titlepage"><div><div><h3 class="title">Creación de una cita de seguimiento</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.16.2"></a><a class="indexterm" name="id-1.8.10.16.3"></a><p id="ox.appsuite.user.concept.calendar.add.followup">Se puede crear una cita de seguimiento para una cita ya existente. La cita de seguimiento aparece ya rellenada con los datos fundamentales de la cita existente.</p>
@@ -64,10 +64,10 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.followup">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.followup">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.html
index c2b135fe8..394e4b4ca 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.html
@@ -1,7 +1,7 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>crear citas</title>
+<title>Creación de citas</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
@@ -36,12 +36,12 @@
     
   </h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.add">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">crear citas</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Creación de citas</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.calendar.add">Aprenda cómo crear una cita y las funciones disponibles para definir sus datos: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.datepicker.html">Uso del selector de fecha</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.8.10.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.8.10.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.serial.html">Establecer cita periódica</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.display.html">Configuración de la visualización de una cita</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.alarms.html">Uso de recordatorios de citas</a></p></li>
@@ -49,10 +49,10 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attachments.html">Añadir adjuntos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creación de una cita de seguimiento</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Invitación de destinatarios de correo a nuevas citas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Crear citas desde adjuntos iCal</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.hint.calendar.add">Notas: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.icalattachment.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.icalattachment.html
index 16ec21324..c90a00efd 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.icalattachment.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.icalattachment.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="Invitación de destinatarios de correo a nuevas citas">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="resolver conflictos">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Resolución de conflictos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.icalattachment">
 <div class="titlepage"><div><div><h3 class="title">Crear citas desde adjuntos iCal</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.19.2"></a><a class="indexterm" name="id-1.8.10.19.3"></a><p id="ox.appsuite.user.concept.calendar.add.icalattachment">Puede crear una cita desde un adjunto de correo iCal. Un adjunto iCal puede identificarse por la extensión .ics.</p>
@@ -54,12 +54,12 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a>
             </p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a>
             </p></li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.participants.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.participants.html
index 89d6d73cc..30968eaf5 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.participants.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.participants.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Uso de recordatorios de citas">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Añadir adjuntos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.participants">
 <div class="titlepage"><div><div><h3 class="title">Añadir participantes o recursos</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.13.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.participants">
@@ -67,6 +67,7 @@
 <li class="listitem"><p role="presentation">Si los participantes aceptan la cita, recibirá un correo.</p></li>
 </ul>
           <p role="presentation" class="feat-io-ox-core-managedResources">Nota: Al agregar un recurso administrado, el delegado de reserva recibe una solicitud de reserva para este recurso. Tan pronto como el delegado de la reserva acepte o rechace su solicitud de reserva del recurso, se le informará.</p>
+          
         </div>
 </div>
 <p id="ox.appsuite.user.tip.calendar.add.participants">Consejo: Para encontrar citas libres de todos los participantes y recursos puede <a class="link" href="ox.appsuite.user.sect.calendar.add.scheduling.html">usar la vista de planificación</a>.</p>
@@ -82,7 +83,7 @@
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Adición automática de Contactos o Recursos desde una libreta de direcciones</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Adición automática de Contactos o Recursos desde el Directorio de Direcciones</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.participants">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.participants">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.recipients.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.recipients.html
index 827cc05df..88c26e8f6 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.recipients.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.recipients.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Invitar participantes a una nueva cita">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Invitación de participantes a una nueva cita">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Crear citas desde adjuntos iCal">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.recipients">
 <div class="titlepage"><div><div><h3 class="title">Invitación de destinatarios de correo a nuevas citas</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.18.2"></a><p id="ox.appsuite.user.concept.calendar.add.recipients">Puede invitar, a los destinatarios de un correo enviado o recibido, a una nueva cita.</p>
@@ -59,7 +59,7 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a>
             </p>
 </li>
 <li class="listitem" style="list-style-type: none">
@@ -67,13 +67,13 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a>
             </p>
 </li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.recipients">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.recipients">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.scheduling.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.scheduling.html
index 8f50d30e6..f2f9158ef 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.scheduling.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.scheduling.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Añadir adjuntos">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Creación de una cita de seguimiento">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.scheduling">
 <div class="titlepage"><div><div><h3 class="title">Uso de la vista de planificación</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.15.2"></a><a class="indexterm" name="id-1.8.10.15.3"></a><a class="indexterm" name="id-1.8.10.15.4"></a><a class="indexterm" name="id-1.8.10.15.5"></a><p id="ox.appsuite.user.concept.calendar.add.scheduling">Cuando se planifica una cita con varios participantes o recursos, la vista de Planificación muestra los periodos libres y ocupados de los usuarios y recursos.</p>
@@ -91,12 +91,12 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy">Mostrar información de libre/ocupado a otros</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.scheduling">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.scheduling">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.serial.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.serial.html
index 04cb4a896..383c0db6b 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.serial.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.add.serial.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.call.html" title="Programación de conferencias de audio o vídeo">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.call.html" title="Programación de conferencias de audio/vídeo">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.display.html" title="Configuración de la visualización de una cita">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.serial">
 <div class="titlepage"><div><div><h3 class="title">Establecer cita periódica</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.10.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.serial">
@@ -108,7 +108,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.serial.html">Creación de tareas periódicas</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.serial">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.serial">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.attachments.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.attachments.html
index 2d35b8453..336634a65 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.attachments.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Calendario">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.view.appointments.html" title="¿Cómo se muestran las citas en una vista de calendario?">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.call.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.call.html
index cadc69464..41cb242b9 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.call.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.call.html
@@ -64,7 +64,7 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">Llamar a los participantes de la tarea</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.deputy.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.deputy.html
index 77471f653..6278204d3 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.deputy.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.deputy.html
@@ -63,12 +63,12 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestionar representantes</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestionar representantes</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.deputy">Tema superior: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.edit.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.edit.html
index f5ca59fc4..e3a79ba30 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.edit.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.edit.html
@@ -116,7 +116,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.datepicker.html">Uso del selector de fecha</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.serial.html">Establecer cita periódica</a></p>
-<p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a></p>
+<p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.display.html">Configuración de la visualización de una cita</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.alarms.html">Uso de recordatorios de citas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Añadir participantes o recursos</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.create.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.create.html
index 4fb42b01f..3aacbd994 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.create.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.create.html
@@ -111,7 +111,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista de detalle de <span class="phrase">Calendario</span></a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 <p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creación, edición o gestión de citas como representante</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a></p>
 </li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.detailview.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.detailview.html
index 6725e84da..32a8bf6e1 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.detailview.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.detailview.html
@@ -67,7 +67,7 @@
 <li class="listitem">
 <p role="presentation">Más datos de la cita, si se configura: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">adjuntos</p></li>
+<li class="listitem"><p role="presentation">Adjuntos</p></li>
 <li class="listitem"><p role="presentation">definición</p></li>
 <li class="listitem">
 <p role="presentation">organizador, destinatarios adicionales, recursos</p>
@@ -105,10 +105,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualización de contactos en la vista halo</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Cambio del estado de la cita</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modificación de recordatorios de citas</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.detailview">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Los componentes de <span class="phrase">Calendario</span></a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.foldertree.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.foldertree.html
index 4dd88e506..23d5378b0 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.foldertree.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.foldertree.html
@@ -65,7 +65,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Visualización de citas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">Adición de calendarios personales</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Uso de colores del calendario</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creación de calendarios de recursos y grupos de calendarios de recursos</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.edit.html">Edición de calendarios de recursos</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creación de citas usando el calendario de recursos</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.list.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.list.html
index 72a87e72f..fb6893333 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.list.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.list.html
@@ -57,11 +57,11 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista de detalle de <span class="phrase">Calendario</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Visualización de citas en la distintas vistas</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.view.html">Visualización de calendarios de recursos</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.list">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Los componentes de <span class="phrase">Calendario</span></a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.new.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.new.html
index 5d2658a4e..78904ff50 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.new.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.new.html
@@ -52,10 +52,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">Suscribirse a calendarios de Google</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Suscripción a calendarios públicos y compartidos</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.popup.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.popup.html
index 87ec0fdc7..6c3b71eab 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.popup.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.popup.html
@@ -71,7 +71,7 @@
 <li class="listitem">
 <p role="presentation">Más datos de la cita, si se configura: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">adjuntos</p></li>
+<li class="listitem"><p role="presentation">Adjuntos</p></li>
 <li class="listitem"><p role="presentation">definición</p></li>
 <li class="listitem">
 <p role="presentation">organizador, destinatarios adicionales, recursos</p>
@@ -119,15 +119,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creación de una cita de seguimiento</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Cambio del estado de la cita</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modificación de recordatorios de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Cambio del organizador</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Mover citas a otro calendario</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exportación de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Impresión de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Borrado de citas</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Envío de un correo a participantes de citas</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.popup">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Los componentes de <span class="phrase">Calendario</span></a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.toolbar.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.toolbar.html
index 27f2c9752..5bb281417 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.toolbar.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.gui.toolbar.html
@@ -72,18 +72,11 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creación de una cita de seguimiento</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Envío de un correo a participantes de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modificación de recordatorios de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Cambio del organizador</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Mover citas a otro calendario</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exportación de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Impresión de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Borrado de citas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.toolbar">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Los componentes de <span class="phrase">Calendario</span></a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.invitation.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.invitation.html
index 1ffb004b6..377070ee5 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.invitation.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.invitation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Calendario">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="resolver conflictos">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Resolución de conflictos">
 <link rel="next" href="ox.appsuite.user.sect.calendar.edit.html" title="Edición de citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.categories.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.categories.html
new file mode 100644
index 000000000..863512f0d
--- /dev/null
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.categories.html
@@ -0,0 +1,106 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Uso de categorías para citas</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Gestión de citas">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Gestión de zonas horarias favoritas">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Uso de colores del calendario">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Calendario</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de citas</h2>
+<div class="sect2" id="ox.appsuite.user.sect.calendar.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Uso de categorías para citas</h3></div></div></div>
+<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><a class="indexterm" name="id-1.8.15.11.4"></a><p id="ox.appsuite.user.concept.calendar.manage.categories">Para organizar citas independientemente de los calendarios, puedes utilizar categorías. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Puede marcar citas con categorías.</p></li>
+<li class="listitem"><p role="presentation">Puede mostrar todas las citas que se han marcado con una categoría específica.</p></li>
+</ul>
+<p> Puede crear, editar o borrar categorías propias; consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>.</p>
+<div class="task" id="ox.appsuite.user.task.calendar.manage.categories">
+<p class="title">Cómo marcar citas con una categoría:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Dependiendo de la vista seleccionada, utilice las siguientes opciones: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Pulse una cita en una vista del calendario. Pulse el icono <span class="guibutton"><strong>Editar cita</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> en la ventana emergente.</p></li>
+<li class="listitem"><p role="presentation">Seleccione una cita en la vista de lista. Pulse el icono <span class="guibutton"><strong>Editar cita</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> de la barra de herramientas.</p></li>
+</ul></p>
+<p role="presentation">Se abre la ventana de edición de citas.</p>
+</li>
+<li class="step">
+<p role="presentation">Para hacerlo, pulse en <span class="guibutton"><strong>Añadir categoría</strong></span> ubicado junto a <span class="guibutton"><strong>Categorías</strong></span>. Seleccione una categoría.</p>
+<p role="presentation">Para eliminar una categoría de la cita, pulse el icono <span class="guibutton"><strong>Eliminar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> que hay junto a la categoría.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.calendar.categories.view">
+<p class="title">Cómo mostrar citas que han sido marcadas con una categoría específica:</p>
+<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Dependiendo de la vista seleccionada, utilice las siguientes opciones: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">En una vista de calendario, pulse en una cita que haya sido marcada con una categoría. En la ventana emergente, pulse en la categoría.</p></li>
+<li class="listitem"><p role="presentation">En la vista de lista, seleccione una cita que haya sido marcada con una categoría. Pulse en la categoría en la vista de detalle.</p></li>
+</ul></p></li></ul></div>
+<div class="taskrelated">
+          <p>Resultado: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vista de lista muestra todas las citas que se han marcado con esta categoría.</p></li>
+<li class="listitem"><p role="presentation">Para mostrar la vista anterior, pulse en el icono <span class="guibutton"><strong>Cancelar búsqueda</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> en el campo de búsqueda.</p></li>
+</ul>
+          <p>Consejo: También puede utilizar la función de búsqueda buscando una categoría mediante las opciones de búsqueda.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.calendar.manage.categories">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Búsqueda de citas</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.calendar.manage.categories">Tema superior <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.changeorganizer.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
index 4989d73ed..735e0c87a 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
@@ -64,8 +64,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changeorganizer"></p>
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.changereminder.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.changereminder.html
index 213431168..68a8e471a 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.changereminder.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.changereminder.html
@@ -60,9 +60,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changereminder"></p>
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista de detalle de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.changestatus.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.changestatus.html
index 58849ccbf..4386da371 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.changestatus.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.changestatus.html
@@ -64,6 +64,7 @@
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista de detalle de <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.colors.html
index 8acbf09fb..fdae7a078 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.colors.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.colors.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Gestión de citas">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Gestión de zonas horarias favoritas">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Uso de categorías para citas">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.move.html" title="Mover citas a otro calendario">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.move.html">Siguiente</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.colors">
 <div class="titlepage"><div><div><h3 class="title">Uso de colores del calendario</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">Se puede definir un color de calendario. De manera predeterminada, todas las citas de dicho calendario se mostrarán en el color del calendario. Si asigna un color individual a una cita al crearla o editarla, la cita se mostrará con el color asignado, no con el del calendario.</p>
+<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">Se puede definir un color de calendario. De manera predeterminada, todas las citas de dicho calendario se mostrarán en el color del calendario. Si asigna un color individual a una cita al crearla o editarla, la cita se mostrará con el color asignado, no con el del calendario.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.colors">
 <p class="title">Cómo seleccionar un color al calendario:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,19 +46,15 @@
 <li class="step"><p role="presentation">Seleccione un color del desplegable de selección de colores.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.colors">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.colors"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a></p></li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">¿Cómo se muestran las citas en una vista de calendario? </a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">¿Cómo se muestran las citas en una vista de calendario? </a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.colors">Tema superior <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.delete.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.delete.html
index 709be42fa..a1d80c26b 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.delete.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Borrado de citas</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Advertencia:</strong></span> Las citas eliminadas <span class="phrase"><strong>no</strong></span> se podrán restaurar. Dependiendo de la configuración, sólo puede borrar una cita de sus calendarios privados si usted es el organizador de la cita.</p>
+<a class="indexterm" name="id-1.8.15.17.2"></a><a class="indexterm" name="id-1.8.15.17.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Advertencia:</strong></span> Las citas eliminadas <span class="phrase"><strong>no</strong></span> se podrán restaurar. Dependiendo de la configuración, sólo puede borrar una cita de sus calendarios privados si usted es el organizador de la cita.</p>
 <p id="ox.appsuite.user.concept.calendar.manage.delete">Puede borrar citas de un calendario si tiene permiso para borrar elementos.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.delete">
 <p class="title">Cómo eliminar citas:</p>
@@ -73,11 +73,14 @@
         </p>
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a>
+            </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a>
             </p>
 </li></ul>
 <p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.export.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.export.html
index 615c2b050..e5e70a468 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.export.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exportación de citas</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">Puede exportar citas en formato iCal. Puede, por ejemplo, usar este formato para intercambiar citas con otras aplicaciones de calendario. Puede exportar citas individuales o todas las citas de un calendario.</p>
+<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">Puede exportar citas en formato iCal. Puede, por ejemplo, usar este formato para intercambiar citas con otras aplicaciones de calendario. Puede exportar citas individuales o todas las citas de un calendario.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.manage.export.selected">
 <p class="title">Cómo exportar citas individuales:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -65,14 +65,16 @@
 <p id="ox.appsuite.user.related.calendar.manage.export"></p>
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importación de citas</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.8.15.14.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.8.15.15.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.manage.export">Tema superior <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.html
index c7dec3ae3..6c7fd1b7b 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.html
@@ -43,6 +43,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modificación de recordatorios de citas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Cambio del organizador</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Gestión de zonas horarias favoritas</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Uso de colores del calendario</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Mover citas a otro calendario</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importación de citas</a></p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.import.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.import.html
index 47e83795d..2d28cf90d 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.import.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importación de citas</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><a class="indexterm" name="id-1.8.15.13.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">Puede importar citas de ficheros en formato iCal.</p>
+<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">Puede importar citas de ficheros en formato iCal.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.import">
 <p class="title">Cómo importar citas desde un fichero iCal:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -55,22 +55,16 @@
           <p>Nota: Se eliminarán todos los participantes de las citas importadas. En su lugar, se le agregará como participante.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.import"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a></p></li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exportación de citas</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importación de calendarios desde ficheros</a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exportación de citas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importación de calendarios desde ficheros</a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.import">Tema superior <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.move.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.move.html
index 71d9c54dd..126d6d636 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.move.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.move.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Mover citas a otro calendario</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">Puede mover citas individuales a otro calendario, pero no citas periódicas.</p>
+<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">Puede mover citas individuales a otro calendario, pero no citas periódicas.</p>
 <p>Requisito: Debe tener los permisos adecuados para crear objetos en el calendario de destino.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.move">
 <p class="title">Cómo mover citas a otro calendario:</p>
@@ -57,8 +57,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.move"></p>
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.print.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.print.html
index e3eaf190d..d8cbf611a 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.print.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Impresión de citas</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><a class="indexterm" name="id-1.8.15.15.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">Para imprimir calendarios y citas puede: </p>
+<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><a class="indexterm" name="id-1.8.15.16.4"></a><a class="indexterm" name="id-1.8.15.16.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">Para imprimir calendarios y citas puede: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">imprimir una hoja de calendario con citas</p></li>
 <li class="listitem"><p role="presentation">imprimir los datos de una cita</p></li>
@@ -89,14 +89,20 @@
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">El menú de configuración de <span class="phrase">Calendario</span></a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">El menú de configuración de <span class="phrase">Calendario</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a>
             </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a>
+            </p>
 </li></ul>
 <p>
       </p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.timezones.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.timezones.html
index 9694fb9c7..0859223bc 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.timezones.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.manage.timezones.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Gestión de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Cambio del organizador">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Uso de colores del calendario">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Uso de categorías para citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.search.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.search.html
index 2bcda686d..397368fad 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.search.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.search.html
@@ -89,7 +89,7 @@
             <a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Visualización de citas en la distintas vistas</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.settings.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.settings.html
index e7098c4ad..07c211a48 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.settings.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.settings.html
@@ -74,7 +74,7 @@
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek"><b>Semana laboral. </b><a class="indexterm" name="id-1.8.22.6.2.1.2.1.2"></a></p>
+<p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek"><b>Semana de trabajo. </b><a class="indexterm" name="id-1.8.22.6.2.1.2.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek.start"><b>Primer día. </b>Define el comienzo de una semana laboral.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek.length"><b>Duración. </b>Determina el número de días de una semana laboral.</p></li>
@@ -103,8 +103,8 @@
 <p id="ox.appsuite.user.reference.calendar.settings.jitsi"></p>
 <h3 class="title">Reuniones de Jitsi</h3>
 <p><a class="indexterm" name="id-1.8.22.9.2"></a>Con esas opciones se puede definir el comportamiento si se selecciona <span class="guibutton"><strong>Reunión de Jitsi</strong></span> en el desplegable <span class="guibutton"><strong>Conferencia</strong></span> al crear citas. </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>Copiar enlace a la ubicación automáticamente. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Determina si el enlace para la participación en la reunión de Jitsi se copiará al campo <span class="guibutton"><strong>Ubicación</strong></span>.</p></li></ul>
-<p> Véase <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a></p>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>copiar enlace a la ubicación automáticamente. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Determina si el enlace para la participación en la reunión de Jitsi se copiará al campo <span class="guibutton"><strong>Ubicación</strong></span>.</p></li></ul>
+<p> Véase <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 </div>
 <div id="ox.appsuite.user.reference.calendar.settings.zoom" class="feat-zoom">
 <p id="ox.appsuite.user.reference.calendar.settings.zoom"></p>
@@ -115,21 +115,21 @@
 <p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments"><b>Citas. </b></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.password"><b>Añadir siempre una contraseña de reunión aleatoria. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.1.1.2"></a>Determina si la conferencia quedará asegurada por una contraseña creada automáticamente.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>Copiar enlace a la ubicación automáticamente. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Determina si el enlace para la participación en la reunión de Zoom se copiará al campo <span class="guibutton"><strong>Ubicación</strong></span>.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>Copiar información de acceso telefónico a la descripción. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Determina si el enlace para la participación en la reunión de Zoom se copiará al campo <span class="guibutton"><strong>Ubicación</strong></span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>copiar enlace a la ubicación automáticamente. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Determina si el enlace para la participación en la reunión de Zoom se copiará al campo <span class="guibutton"><strong>Ubicación</strong></span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>copiar información de acceso telefónico a la descripción. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Determina si el enlace para la participación en la reunión de Zoom se copiará al campo <span class="guibutton"><strong>Ubicación</strong></span>.</p></li>
 </ul>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.dialinnumber"><b>Números de acceso telefónico. </b>Si tiene al menos una cuenta de Zoom Pro, Zoom ofrece números de acceso telefónico por país. Para indicar los países a mostrar en las invitaciones a citas, pulse en <span class="guibutton"><strong>Abrir perfil de Zoom</strong></span>.</p></li>
 </ul>
-<p>Véase <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a></p>
+<p>Véase <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 </div>
 <p id="ox.appsuite.user.reference.calendar.settings.advanced"></p>
 <h3 class="title">Configuración avanzada</h3>
 <p><a class="indexterm" name="id-1.8.22.11.2"></a>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>mostrar calendario de cumpleaños. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Define si se muestra un calendario de fechas de nacimiento en la vista de carpeta.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>mostrar recordatorios de citas pasadas. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Determina si se muestran los recordatorios de citas pasadas.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>Mostrar calendario de cumpleaños. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Define si se muestra un calendario de fechas de nacimiento en la vista de carpeta.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>Mostrar recordatorios de citas pasadas. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Determina si se muestran los recordatorios de citas pasadas.</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.calendar.settings.advanced.emailchanges"><b>Aplicar automáticamente los cambios de citas recibidos por correo a su calendario. </b><a class="indexterm" name="id-1.8.22.11.3.1.3.1.2"></a>Define en qué casos las invitaciones a citas de contactos externos se agregarán automáticamente a su calendario. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -143,7 +143,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.declined"><b>Mostrar citas rechazadas. </b><a class="indexterm" name="id-1.8.22.11.3.1.6.1.2"></a>Define si se muestran las citas que rechazó. Consulte <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a></p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.participantsedit"><b>Marcar siempre "Los participantes pueden editar citas" al crear o editar citas. </b><a class="indexterm" name="id-1.8.22.11.3.1.7.1.2"></a>Define si los participantes, de manera predeterminada, tienen el permiso para editar una cita.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.wholeday"><b>Marcar automáticamente las citas de todo el día como "libre" al crear o editar citas. </b><a class="indexterm" name="id-1.8.22.11.3.1.8.1.2"></a>Determina si se muestran las citas de día completo como libres de manera predeterminada.</p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>usar color de la primera categoría para citas. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Determina si las citas a las que se ha asignado una categoría se muestran con el color de dicha categoría. Al asignar varias categorías a una cita, se usará el color de la categoría asignada en primer lugar. Vea <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>Usar color de la primera categoría para citas. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Determina si las citas a las que se ha asignado una categoría se muestran con el color de dicha categoría. Al asignar varias categorías a una cita, se usará el color de la categoría asignada en primer lugar. Vea <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a></p></li>
 </ul>
 <p>
       </p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.appointments.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.appointments.html
index 2f56abc9f..35c1dfb61 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.appointments.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.appointments.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Visualización de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.appointments">
 <div class="titlepage"><div><div><h3 class="title">¿Cómo se muestran las citas en una vista de calendario? </h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.9.2"></a><a class="indexterm" name="id-1.8.8.9.3"></a><a class="indexterm" name="id-1.8.8.9.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">Las siguientes propiedades de las citas determinan la visualización de las citas en la vista de calendario: </p>
+<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><a class="indexterm" name="id-1.8.8.8.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">Las siguientes propiedades de las citas determinan la visualización de las citas en la vista de calendario: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">El color de la cita</p>
@@ -67,7 +67,7 @@
 <p role="presentation">Una cita que haya rechazado se mostrará en gris. El asunto estará precedido por el icono <span class="guibutton"><strong>Rechazada</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.declined"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>. El asunto aparece tachado.</p>
 <p role="presentation">En los ajustes del calendario se determina si se mostrarán las citas rechazadas.</p>
 </li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.6.2.1.6"><p role="presentation">Una cita que ha sido rechazada por todos los demás participantes se marcará con el icono <span class="guibutton"><strong>Todos rechazados</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>.</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.6.2.1.6"><p role="presentation">Una cita que ha sido rechazada por todos los demás participantes se marcará con el icono <span class="guibutton"><strong>Todos rechazados</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>.</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.view.appointments.private"></p>
 <h4 class="title">Apariencia de cita privada</h4>
@@ -94,7 +94,7 @@
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.secret"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span>cita secreta</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.unconfirmed"><object type="image/svg+xml" data="../../images/question-circle.svg" height="15"></object></span>cita no confirmada</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.rejected"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>cita rechazada</p></li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>cita rechazada por todos los demás participantes</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>cita rechazada por todos los demás participantes</p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.view.appointments">
         </p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.html
index b732747ce..04a70ccdf 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.html
@@ -43,14 +43,6 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.timezones.html">Visualización de múltiples zonas horarias</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">¿Cómo se muestran las citas en una vista de calendario? </a></p></li>
 </ul>
-<p id="ox.appsuite.user.related.calendar.view">
-      </p>
-<p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a>
-          </p></li></ul>
-<p>
-    </p>
 <p id="ox.appsuite.user.parent.calendar.view">Tema superior: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
     <span class="phrase">Calendario</span>
     
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.timezones.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.timezones.html
index 24ae19565..ff2996a54 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.timezones.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.timezones.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Visualización de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.timezones">
 <div class="titlepage"><div><div><h3 class="title">Visualización de múltiples zonas horarias</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">Además de la zona horaria predeterminada, puede visualizar zonas horarias que usted haya añadido a favoritas. La zona horaria predeterminada se puede cambiar en la configuración básica.</p>
+<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">Además de la zona horaria predeterminada, puede visualizar zonas horarias que usted haya añadido a favoritas. La zona horaria predeterminada se puede cambiar en la configuración básica.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.timezones">
 <p class="title">Cómo visualizar múltiples zonas horarias en una vista del calendario:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.views.html b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.views.html
index eaaf2fd6f..d1ee6ddb0 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.views.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.calendar.view.views.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Visualización de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.views">
 <div class="titlepage"><div><div><h3 class="title">Visualización de citas en la distintas vistas</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><a class="indexterm" name="id-1.8.8.7.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Aprenda a visualizar las citas de uno o varios calendarios de distintas vistas:</p>
+<a class="indexterm" name="id-1.8.8.6.2"></a><a class="indexterm" name="id-1.8.8.6.3"></a><a class="indexterm" name="id-1.8.8.6.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Aprenda a visualizar las citas de uno o varios calendarios de distintas vistas:</p>
 <div class="task" id="ox.appsuite.user.task.calendar.view.views">
 <p class="title">Cómo ver una cita:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.call.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.call.html
index e4595b3c1..acad4b3c1 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.call.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.call.html
@@ -71,7 +71,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">Llamar a los participantes de la tarea</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Establecer el estado de presencia</a></p></li>
 </ul>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.create.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.create.html
index 11f668498..16fdbdb18 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.create.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.create.html
@@ -50,8 +50,8 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">Una foto de contacto, si se subió. Pulse en la foto de contacto para editarla o cargar una nueva.</p>
-<p role="presentation">Apellido, nombre</p>
-<p role="presentation">Si se introdujo: título, información profesional, residencia</p>
+<p role="presentation">apellidos, nombre</p>
+<p role="presentation">si se introdujo: título, información profesional, lugar de residencia</p>
 </li>
 <li class="listitem">
 <p role="presentation">Información personal </p>
@@ -88,13 +88,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">La ventana de edición</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista de detalle de <span class="phrase">Libreta de direcciones</span></a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creación de un nuevo contacto</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Añadir contactos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Edición de contactos o listas distribución</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.create">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Los componentes de <span class="phrase">Libreta de direcciones</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.detailview.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.detailview.html
index 30027cdc6..ae7e3087c 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.detailview.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.detailview.html
@@ -46,17 +46,17 @@
 <p class="title">Contenido</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Una foto de contacto, si se subió</p>
-<p role="presentation">Apellido, nombre</p>
-<p role="presentation">Si se introdujo: título, información profesional, residencia</p>
+<p role="presentation">una foto de contacto, si se subió</p>
+<p role="presentation">apellidos, nombre</p>
+<p role="presentation">si se introdujo: título, información profesional, lugar de residencia</p>
 </li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.7.11.4.1.3">
-<p role="presentation">Las categorías asignadas</p>
+<p role="presentation">las categorías asignadas</p>
 <p role="presentation">Al pulsar en una categoría, se buscan contactos asignados a esa categoría.</p>
 </li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.4"><p role="presentation">Dependiendo de la configuración: la disponibilidad actual del contacto para llamadas</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.5">
-<p role="presentation">Dependiendo de la configuración: Iconos para comunicarse con el contacto: </p>
+<p role="presentation">Dependiendo de la configuración: iconos para comunicarse con el contacto: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Correo</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.detailview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>. Abre la ventana para redactar un correo.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Llamar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.detailview.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>. Abre un menú con funciones de llamada.</p></li>
@@ -84,7 +84,7 @@
 </li>
 <li class="listitem"><p role="presentation">Una nota</p></li>
 <li class="listitem"><p role="presentation">Máximo 18 campos de usuario opcionales</p></li>
-<li class="listitem"><p role="presentation">adjuntos</p></li>
+<li class="listitem"><p role="presentation">Adjuntos</p></li>
 </ul>
 </li>
 </ul>
@@ -97,15 +97,11 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.create.html">La ventana de edición de contactos</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualización de los contactos de una libreta de direcciones</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.attachments.html">Visualización o guardado de adjuntos de contactos</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.detailview">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Los componentes de <span class="phrase">Libreta de direcciones</span></a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.foldertree.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.foldertree.html
index f710ea0cb..5cdbd38c2 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.foldertree.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.foldertree.html
@@ -62,6 +62,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualización de los contactos de una libreta de direcciones</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Añadir libretas de direcciones</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.list.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.list.html
index ec9772ec2..1ed889623 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.list.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.list.html
@@ -53,8 +53,8 @@
 <p role="presentation">Se muestran los siguientes detalles de cada contacto: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">una foto si se subió</p></li>
-<li class="listitem"><p role="presentation">Apellido, nombre</p></li>
-<li class="listitem"><p role="presentation">Datos profesionales, si se introdujeron</p></li>
+<li class="listitem"><p role="presentation">apellidos, nombre</p></li>
+<li class="listitem"><p role="presentation">datos profesionales, si se introdujeron</p></li>
 </ul>
 <p role="presentation">Los nombres que comienzan con un número o un carácter especial se muestran debajo de <span class="guibutton"><strong>#</strong></span> en la parte superior de la vista de lista. Los nombres que comienzan con un signo especial se muestran debajo de <span class="guibutton"><strong>Ω</strong></span> en la parte inferior de la vista de lista.</p>
 </li>
@@ -66,11 +66,8 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.settingsmenu.html">El menú de configuración de <span class="phrase">Libreta de direcciones</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista de detalle de <span class="phrase">Libreta de direcciones</span></a></p>
-</li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualización de los contactos de una libreta de direcciones</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.list">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Los componentes de <span class="phrase">Libreta de direcciones</span></a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.new.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.new.html
index c54c292ac..45e0564a9 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.new.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.new.html
@@ -42,7 +42,7 @@
 <a class="indexterm" name="id-1.9.7.6.2"></a><p id="ox.appsuite.user.concept.contacts.gui.new">Crea un contacto nuevo. Si se pulsa el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>, se abre un menú con funciones adicionales: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">nueva lista de distribución</p></li>
-<li class="listitem"><p role="presentation">Suscribirse a libretas de direcciones compartidas o a otras</p></li>
+<li class="listitem"><p role="presentation">suscribirse a libretas de direcciones compartidas o a otras</p></li>
 <li class="listitem"><p role="presentation">nuevo correo, nueva cita, nuevo contacto</p></li>
 </ul>
 <p id="ox.appsuite.user.hint.contacts.gui.new">Nota: si la carpeta está cerrada, el botón se mostrará como icono. En este caso, el icono <span class="guibutton"><strong>Más acciones </strong></span> no se mostrará. Para mostrar la vista de carpeta, pulse el icono <span class="guibutton"><strong>Abrir vista de carpeta</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.open"><object type="image/svg+xml" data="../../images/layout-split.svg" height="15"></object></span> de la parte inferior izquierda.</p>
@@ -52,7 +52,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creación de un nuevo contacto</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Añadir contactos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">Creación de nuevas listas de distribución</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Suscripción a libretas de direcciones externas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Suscribirse a libretas de direcciones públicas y compartidas</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.settingsmenu.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
index 62083e7e9..ff585973c 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
@@ -45,7 +45,7 @@
 <li class="listitem"><p role="presentation">Ajustar todas las configuraciones</p></li>
 <li class="listitem"><p role="presentation">Seleccione un tema para la interfaz de usuario</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Opciones de lista</strong></span>. Determina si las imágenes de contacto, las casillas de verificación o ninguno de estos elementos se mostrarán en la vista de lista.</p></li>
-<li class="listitem"><p role="presentation">Suscribirse a libretas de direcciones compartidas o a otras</p></li>
+<li class="listitem"><p role="presentation">suscribirse a libretas de direcciones compartidas o a otras</p></li>
 <li class="listitem"><p role="presentation">Dependiendo de la configuración: <span class="guibutton"><strong>Conectar su dispositivo</strong></span>. Inicia un asistente para configurar aplicaciones locales con las que puede acceder a sus datos del software colaborativo.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.contacts.gui.settingsmenu"></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.toolbar.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.toolbar.html
index aa74ea093..1ce2ffef8 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.toolbar.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.gui.toolbar.html
@@ -64,13 +64,7 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Edición de contactos o listas distribución</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envío de correos desde una libreta de direcciones</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitar contactos a una cita</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Mover o copiar contactos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envío de contactos como vCard</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exportación de contactos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.print.html">Impresión de contactos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.delete.html">Borrado de contactos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.toolbar">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Los componentes de <span class="phrase">Libreta de direcciones</span></a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.categories.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.categories.html
new file mode 100644
index 000000000..3811ca905
--- /dev/null
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Uso de categorías para los contactos</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Gestión de contactos">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Invitar contactos a una cita">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Mover o copiar contactos">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Libreta de direcciones</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de contactos</h2>
+<div class="sect2" id="ox.appsuite.user.sect.contacts.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Uso de categorías para los contactos</h3></div></div></div>
+<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><p id="ox.appsuite.user.concept.contacts.manage.categories">Para organizar contactos independientemente de las carpetas, puede utilizar categorías. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Puede marcar contactos con categorías.</p></li>
+<li class="listitem"><p role="presentation">Puede mostrar todos los contactos que han sido marcados con una categoría específica.</p></li>
+</ul>
+<p> Puede crear, editar o borrar categorías propias; consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>.</p>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories">
+<p class="title">Cómo marcar contactos con una categoría:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Seleccione un contacto. Pulse el icono <span class="guibutton"><strong>Editar contacto</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> de la barra de herramientas.</p>
+<p role="presentation">Se abre la ventana de edición de contactos.</p>
+</li>
+<li class="step">
+<p role="presentation">Para hacerlo, pulse en <span class="guibutton"><strong>Añadir categoría</strong></span> ubicado junto a <span class="guibutton"><strong>Categorías</strong></span>. Seleccione una categoría.</p>
+<p role="presentation">Para eliminar una categoría del contacto, pulse en el icono <span class="guibutton"><strong>Eliminar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> que hay junto a la categoría.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories.view">
+<p class="title">Cómo mostrar contactos que han sido marcados con una categoría específica:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione un contacto que haya sido marcado con una categoría.</p></li>
+<li class="step"><p role="presentation">Pulse en la categoría en la vista de detalle.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Resultado: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vista de lista muestra todos los contactos que se han marcado con esta categoría. </p></li>
+<li class="listitem"><p role="presentation">Para mostrar la lista anterior, pulse en el icono <span class="guibutton"><strong>Cancelar búsqueda</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> en el campo de búsqueda.</p></li>
+</ul>
+          <p>Consejo: También puede utilizar la función de búsqueda buscando una categoría mediante las opciones de búsqueda.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.contacts.manage.categories">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Búsqueda de contactos</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.contacts.manage.categories">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.delete.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.delete.html
index 3df650697..c04d6b4c1 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.delete.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de contactos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Borrado de contactos</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Advertencia:</strong></span> Los contactos y listas de distribución borrados <span class="phrase"><strong>no</strong></span> se pueden restaurar.</p>
+<a class="indexterm" name="id-1.9.17.15.2"></a><a class="indexterm" name="id-1.9.17.15.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Advertencia:</strong></span> Los contactos y listas de distribución borrados <span class="phrase"><strong>no</strong></span> se pueden restaurar.</p>
 <p id="ox.appsuite.user.concept.contacts.manage.delete">Puede borrar contactos o listas de distribución de una libreta de direcciones si dispone de permiso para borrar elementos de dicha libreta de direcciones. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">No puede borrar contactos de la libreta de direcciones <span class="guibutton"><strong>Todos los usuarios</strong></span>.</p></li>
@@ -55,9 +55,14 @@
 <p id="ox.appsuite.user.related.contacts.manage.delete">
         </p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.delete">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.export.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.export.html
index 50f6eb6b2..566e07f35 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.export.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de contactos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exportación de contactos</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">Puede exportar contactos o listas de distribución a estos formatos: </p>
+<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><a class="indexterm" name="id-1.9.17.13.4"></a><a class="indexterm" name="id-1.9.17.13.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">Puede exportar contactos o listas de distribución a estos formatos: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">vCard. Puede, por ejemplo, utilizar este formato para intercambiar contactos con otras aplicaciones de correo.</p></li>
 <li class="listitem"><p role="presentation">CSV. Puede utilizar este formato para exportar contactos a formatos de hoja de cálculo.</p></li>
@@ -76,7 +76,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.export"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista de carpeta de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -84,7 +88,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envío de contactos como vCard</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.9.17.12.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.9.17.13.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.export">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.html
index 73ea6022b..522d1a2c0 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem cap-webmail" id="id-1.9.17.4.1.1"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envío de correos desde una libreta de direcciones</a></p></li>
 <li class="listitem cap-calendar" id="id-1.9.17.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitar contactos a una cita</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Mover o copiar contactos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envío de contactos como vCard</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a></p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.import.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.import.html
index fc0c12181..fed80cf28 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.import.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de contactos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importación de contactos</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><a class="indexterm" name="id-1.9.17.11.5"></a><a class="indexterm" name="id-1.9.17.11.6"></a><a class="indexterm" name="id-1.9.17.11.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">Puedes importar contactos desde ficheros que tengan los siguientes formatos: </p>
+<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><a class="indexterm" name="id-1.9.17.12.6"></a><a class="indexterm" name="id-1.9.17.12.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">Puedes importar contactos desde ficheros que tengan los siguientes formatos: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">vCard. Notas: </p>
@@ -71,19 +71,15 @@
 <li class="step"><p role="presentation">Pulse en <span class="guibutton"><strong>Importar</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.contacts.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.contacts.manage.import"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista de carpeta de <span class="phrase">Libreta de direcciones</span></a></p></li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exportación de contactos</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Añadir contactos</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exportación de contactos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Añadir contactos</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.contacts.manage.import">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.inviteappointment.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
index ac0f5d685..fad589d49 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Gestión de contactos">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.manage.sendmail.html" title="Envío de correos desde una libreta de direcciones">
-<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Mover o copiar contactos">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Uso de categorías para los contactos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -53,7 +53,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.inviteappointment"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista de detalle de <span class="phrase">Libreta de direcciones</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></p></li></ul>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.movecopy.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.movecopy.html
index ba043c281..11a84706a 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.movecopy.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.movecopy.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Gestión de contactos">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Invitar contactos a una cita">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Uso de categorías para los contactos">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html" title="Envío de contactos como vCard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Siguiente</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de contactos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.movecopy">
 <div class="titlepage"><div><div><h3 class="title">Mover o copiar contactos</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><a class="indexterm" name="id-1.9.17.9.4"></a><a class="indexterm" name="id-1.9.17.9.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">Puede mover o copiar contactos o listas de distribución a otra libreta de direcciones.</p>
+<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><a class="indexterm" name="id-1.9.17.10.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">Puede mover o copiar contactos o listas de distribución a otra libreta de direcciones.</p>
 <p id="ox.appsuite.user.hints.contacts.manage.movecopy">Notas: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">No puede mover o copiar contactos o listas de distribución a la libreta de direcciones <span class="guibutton"><strong>Todos los usuarios</strong></span>.</p></li>
@@ -61,7 +61,10 @@
 <p id="ox.appsuite.user.tip.contacts.manage.movecopy">Consejo: También puede mover los objetos seleccionados arrastrando los objetos desde la vista de carpeta a una libreta de direcciones.</p>
 <p id="ox.appsuite.user.related.contacts.manage.movecopy"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.personal.html">Añadir libretas de direcciones personales</a></p></li></ul>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.print.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.print.html
index f3537ed2b..fd48a34a4 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.print.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de contactos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Impresión de contactos</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">Puede imprimir los datos de un solo contacto o de varios contactos. Puede seleccionar entre diferentes diseños de impresión.</p>
+<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">Puede imprimir los datos de un solo contacto o de varios contactos. Puede seleccionar entre diferentes diseños de impresión.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.print.list">
 <p class="title">Cómo imprimir los datos de un contacto:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,9 +54,17 @@
 <p id="ox.appsuite.user.related.contacts.manage.print">
         </p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista de carpeta de <span class="phrase">Libreta de direcciones</span></a>
+            </p>
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.print">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.sendmail.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.sendmail.html
index d65006275..4fa35979b 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.sendmail.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.sendmail.html
@@ -53,10 +53,14 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendmail"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista de detalle de <span class="phrase">Libreta de direcciones</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendmail">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.sendvcard.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.sendvcard.html
index d98a4179b..6cb31379c 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.sendvcard.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.manage.sendvcard.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de contactos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.sendvcard">
 <div class="titlepage"><div><div><h3 class="title">Envío de contactos como vCard</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">Puede enviar contactos o listas de distribución como vCard adjunto a un correo.</p>
+<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">Puede enviar contactos o listas de distribución como vCard adjunto a un correo.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.sendvcard">
 <p class="title">Cómo enviar un contacto como adjunto vCard:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,12 +49,15 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendvcard"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exportación de contactos</a></p></li>
-<li class="listitem cap-webmail" id="id-1.9.17.10.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li>
+<li class="listitem cap-webmail" id="id-1.9.17.11.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendvcard">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.search.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.search.html
index f377ed50c..8f1af13b5 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.search.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualización de los contactos de una libreta de direcciones</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.settings.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.settings.html
index 7282c0805..506c738ee 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.settings.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.settings.html
@@ -60,7 +60,7 @@
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>nombres. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a>
+<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>Nombres. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Especifica el orden en que el nombre y el apellido de un contacto aparecen en la libreta de direcciones.</p></li></ul>
 <p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.useaddressbook.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.useaddressbook.html
index fd7e787ff..74019ca38 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.useaddressbook.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.useaddressbook.html
@@ -70,7 +70,7 @@
 <p> </p>
 <p class="title">Acciones de nivel superior:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Añadir participantes o recursos</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Creación de recursos gestionados</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.useaddressdirectory.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.useaddressdirectory.html
index 7e989ec10..68de8bf96 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.useaddressdirectory.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.useaddressdirectory.html
@@ -77,7 +77,7 @@
 <p id="ox.appsuite.user.related.contacts.useaddressdirectory"></p>
 <p class="title">Acciones de nivel superior:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Añadir participantes o recursos</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Creación de recursos gestionados</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.view.haloview.html b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.view.haloview.html
index 1a999b8be..d2bfb3d2e 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.contacts.view.haloview.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.contacts.view.haloview.html
@@ -48,11 +48,11 @@
 <li class="listitem"><p role="presentation">Seleccione una cita o una tarea en las aplicaciones <span class="phrase">Calendario</span> o <span class="phrase">Tareas</span>. Pulse en un participante en la vista de detalle o en la ventana emergente.</p></li>
 </ul></p>
 <p role="presentation">Dependiendo de las entradas del contacto en la libreta de direcciones, estos datos se mostrarán en una ventana emergente: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Una foto si se subió</p></li>
-<li class="listitem"><p role="presentation">Apellido, nombre</p></li>
-<li class="listitem"><p role="presentation">Datos profesionales, si se introdujeron</p></li>
+<li class="listitem"><p role="presentation">una foto si se subió</p></li>
+<li class="listitem"><p role="presentation">apellidos, nombre</p></li>
+<li class="listitem"><p role="presentation">datos profesionales, si se introdujeron</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.4"><p role="presentation">Dependiendo de la configuración: la disponibilidad actual del contacto para llamadas</p></li>
-<li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">Dependiendo de la configuración: Iconos para comunicarse con el contacto: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">Dependiendo de la configuración: iconos para comunicarse con el contacto: <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Correo</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>. Abre la ventana para redactar un correo.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Llamar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>. Abre un menú con funciones de llamada.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Invitar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.invite"><object type="image/svg+xml" data="../../images/calendar-plus.svg" height="15"></object></span>. Abre la ventana para crear una cita.</p></li>
@@ -62,7 +62,7 @@
 <li class="listitem"><p role="presentation">Direcciones de correo. Si pulsa en una dirección de correo, se muestra la página para enviar un nuevo correo.</p></li>
 <li class="listitem"><p role="presentation">Números de teléfono profesionales y privados. Si pulsa en un número, se abre una función para realizar una llamada, si está disponible.</p></li>
 <li class="listitem"><p role="presentation">Direcciones profesionales y privadas. En la configuración de la libreta de direcciones puede definir si se debe utilizar un servicio de mapas al pulsar sobre una dirección.</p></li>
-<li class="listitem"><p role="presentation">adjuntos</p></li>
+<li class="listitem"><p role="presentation">Adjuntos</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">La libreta de direcciones en la que se guarda el contacto</p></li>
 <li class="listitem"><p role="presentation">Sus conversaciones recientes con este contacto. Si pulsa en un correo, su contenido se mostrará en una ventana emergente.</p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.accounts.edit.html b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
index 3a1ee2697..79df4537b 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
@@ -94,7 +94,7 @@
               <a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a>
             </p>
 <p role="presentation" class="cap-webmail">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a>
+              <a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a>
             </p>
 <p role="presentation" class="cap-infostore">
               <a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Añadir cuentas de almacenamiento</a>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
index a64dd5af2..dbe644dcd 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
@@ -64,7 +64,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.accounts.functionalmail">Tema superior: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Administración de cuentas</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.categories.html b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.categories.html
index b3078d27c..58c5ef472 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.categories.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.categories.html
@@ -32,15 +32,15 @@
   <h1 class="sr-only">Organización de datos y comparticiones</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.categories">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Gestión de Categorías</h2></div></div></div>
-<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Aprenda a gestionar <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categorías</a> que le permiten clasificar citas, contactos y tareas. Las categorías tienen las siguientes propiedades: </p>
+<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Aprenda a gestionar <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categorías</a> que le permiten organizar correos, citas, contactos y tareas en todas las aplicaciones, independientemente de la estructura de carpetas. Por ejemplo, puede utilizar una categoría propia para un proyecto o cliente específico. Las categorías tienen las siguientes propiedades: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Una categoría consta de un nombre y un color.</p></li>
 <li class="listitem"><p role="presentation">Al buscar objetos, puede utilizar categorías como términos de búsqueda.</p></li>
-<li class="listitem"><p role="presentation">Dependiendo de la configuración, están predefinidas categorías concretas. Dichas categorías no se pueden editar ni borrar.</p></li>
-<li class="listitem"><p role="presentation">Puede crear, editar y eliminar sus propias categorías.</p></li>
-<li class="listitem"><p role="presentation">Puede asignar una o varias categorías a citas, contactos y tareas, y borrarlas más tarde.</p></li>
+<li class="listitem"><p role="presentation">Dependiendo de la configuración, hay predefinidas categorías específicas. Dichas categorías no se pueden editar ni borrar.</p></li>
+<li class="listitem"><p role="presentation">Puede crear, editar y borrar categorías propias.</p></li>
+<li class="listitem"><p role="presentation">Puede asignar una o varias categorías a correos, citas, contactos y tareas y borrarlas más tarde.</p></li>
 </ul>
-<p> Nota: Esas categorías no se pueden usar para correos. Para los correos existen las categorías de la bandeja de entrada. Consulte <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a>.</p>
+<p> Nota: Para los correos también puede usar las pestañas de la bandeja de entrada. Se puede asignar una categoría de la bandeja de entrada específica a un correo. La categoría depende del remitente; consulte <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a>.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.categories">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">crear una categoría propia</p></li>
@@ -51,9 +51,15 @@
 <p class="title">Cómo gestionar sus categorías:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step help-hide-inline">
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la parte derecha de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>. Se abre la ventana <span class="guilabel"><strong>Configuración</strong></span>.</p>
+<p role="presentation">Pulse en <span class="guibutton"><strong>Básica</strong></span> en el panel izquierdo. Pulse <span class="guibutton"><strong>Gestionar categorías</strong></span> debajo de <span class="guibutton"><strong>Configuración avanzada</strong></span></p>
+<p role="presentation">También puede usar uno de los siguientes métodos: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Seleccione un correo. Pulse en el icono <span class="guibutton"><strong>Añadir categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> de la barra de herramientas. Seleccione <span class="guibutton"><strong>Gestionar categorías</strong></span>.</p></li>
+<li class="listitem">
 <p role="presentation">Abra la ventana de edición de citas, contactos o tareas creando o editando una cita, un contacto o una tarea.</p>
 <p role="presentation">Para ello pulse en <span class="guibutton"><strong>Añadir categoría</strong></span> junto a <span class="guibutton"><strong>Categorías</strong></span>. Seleccione <span class="guibutton"><strong>Gestionar categorías</strong></span>.</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">También se puede usar el botón <span class="guibutton"><strong>Gestionar categorías</strong></span> de la configuración general, debajo de <span class="guibutton"><strong>Configuración avanzada</strong></span>.</p></li></ul>
+</li>
+</ul></p>
 <p role="presentation">Se abre la ventana <span class="guilabel"><strong>Gestionar categorías</strong></span>.</p>
 </li>
 <li class="step">
@@ -69,41 +75,22 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creación de un nuevo contacto</a>
+<p role="presentation" class="cap-webmail">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
           </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Creación de nuevas tareas</a>
-          </p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
           </p>
 <p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Edición de contactos o listas distribución</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a>
           </p>
 <p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Edición de tareas</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuste de la Configuración general</a>
           </p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Búsqueda de citas</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Búsqueda de contactos</a>
-          </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Búsqueda de tareas</a>
-          </p>
-</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.deputy.add.html b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.deputy.add.html
index bf9c30a82..3bfc35622 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.deputy.add.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.deputy.add.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Gestionar representantes">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Gestionar representantes">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="gestionar representantes">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="gestionar representantes">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html" title="Visualización, edición, borrado de representantes">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Organización de datos y comparticiones</h1>
-<h2 class="sr-only">Gestionar representantes</h2>
+<h2 class="sr-only">gestionar representantes</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.add">
 <div class="titlepage"><div><div><h3 class="title">Adición de representantes</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.8.2"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.add">Existen las siguientes opciones: </p>
@@ -86,7 +86,7 @@
             </p></li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Tema superior: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestionar representantes</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Tema superior: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestionar representantes</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.deputy.edit.html b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
index bab46f30c..4a33dfef4 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Gestionar representantes">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="gestionar representantes">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.add.html" title="Adición de representantes">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.accounts.html" title="Administración de cuentas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Organización de datos y comparticiones</h1>
-<h2 class="sr-only">Gestionar representantes</h2>
+<h2 class="sr-only">gestionar representantes</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.edit">
 <div class="titlepage"><div><div><h3 class="title">Visualización, edición, borrado de representantes</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.9.2"></a><a class="indexterm" name="id-1.12.6.9.3"></a><a class="indexterm" name="id-1.12.6.9.4"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.edit">Existen las siguientes opciones: </p>
@@ -81,7 +81,7 @@
             </p></li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Tema superior: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestionar representantes</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Tema superior: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestionar representantes</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.deputy.html b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.deputy.html
index 29ce9b887..0293651b4 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.deputy.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.deputy.html
@@ -1,7 +1,7 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Gestionar representantes</title>
+<title>gestionar representantes</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Organización de datos y comparticiones</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.deputy">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Gestionar representantes</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">gestionar representantes</h2></div></div></div>
 <a class="indexterm" name="id-1.12.6.2"></a><a class="indexterm" name="id-1.12.6.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.deputy">Puede designar a otros usuarios para actuar como su <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">representante</a>. Puede conceder a uno o varios representantes distintos niveles de permisos para administrar la comunicación por correo y la planificación de citas en su nombre.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.deputy">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.sharing.examples.html b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
index c4c5a6f1f..18c897bbb 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.dataorganisation.sharing.html" title="Compartición de datos">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html" title="¿Qué permisos se pueden usar?">
-<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Gestionar representantes">
+<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="gestionar representantes">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.sharing.share.html b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.sharing.share.html
index d95249245..e04cdf037 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.sharing.share.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.dataorganisation.sharing.share.html
@@ -37,7 +37,7 @@
 <p class="title">Tiene las siguientes posibilidades:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Carpetas de correo </p>
+<p role="presentation">carpetas de correo </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">La carpeta <span class="guibutton"><strong>Bandeja de entrada</strong></span>, como todas las carpetas y subcarpetas que hay en <span class="guibutton"><strong>Mis carpetas</strong></span>, se pueden compartir con usuarios internos con permisos de lectura.</p>
@@ -48,7 +48,7 @@
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">calendario </p>
+<p role="presentation">Calendario </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Las carpetas que hay en <span class="guibutton"><strong>Mis calendarios</strong></span> se pueden compartir con usuarios internos con permisos de lectura o edición.</p></li>
 <li class="listitem"><p role="presentation">La carpeta <span class="guibutton"><strong>Mis calendarios</strong></span> no se puede compartir.</p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.content.html b/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.content.html
index 6b370022c..e2bb638d7 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.content.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.content.html
@@ -76,6 +76,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Ver el contenido de la carpeta de <span class="phrase">Ficheros</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Visualización del contenido de un fichero</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizar ficheros y carpetas de <span class="phrase">Ficheros</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.foldertree.html b/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.foldertree.html
index 9a62bf68c..d5e909f1f 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.foldertree.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.foldertree.html
@@ -73,6 +73,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">Ficheros</span>: creación de carpetas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">Suscribirse a carpetas públicas y compartidas de <span class="phrase">Ficheros</span></a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizar ficheros y carpetas de <span class="phrase">Ficheros</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.toolbar.html b/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.toolbar.html
index 803a4ccfd..c6b528ad8 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.toolbar.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.toolbar.html
@@ -76,20 +76,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Ver el contenido de la carpeta de <span class="phrase">Ficheros</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Visualización del contenido de un fichero</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.send.html">Envío de ficheros como adjuntos de correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Edición de nombres de ficheros</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creación o edición de descripciones</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.move.html">Mover ficheros o carpetas de <span class="phrase">Ficheros</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.copy.html">Copia de ficheros</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Guardar ficheros como PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Impresión de ficheros como PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.addportal.html">Añadir ficheros al portal</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.favorite.html">Añadir ficheros o carpetas de <span class="phrase">Ficheros</span> a Favoritos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.delete.html">Borrado de ficheros o carpetas de <span class="phrase">Ficheros</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.lock.html">Bloqueo o desbloqueo de ficheros</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Trabajo con versiones</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizar ficheros y carpetas de <span class="phrase">Ficheros</span></a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Cifrado o descifrado de ficheros</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.toolbar">Tema superior: <a class="xref" href="ox.appsuite.user.sect.drive.gui.html">Los componentes de <span class="phrase">Ficheros</span></a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.viewer.html b/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.viewer.html
index 5bf3f1841..ba36f0a19 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.viewer.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.drive.gui.viewer.html
@@ -106,23 +106,9 @@
               <a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">Celebración de una presentación</a>
             </p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Edición de nombres de ficheros</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creación o edición de descripciones</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Guardar ficheros como PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Impresión de ficheros como PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Trabajo con versiones</a>
-            </p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizar ficheros y carpetas de <span class="phrase">Ficheros</span></a>
+            </p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-share_links cap-share_mail_attachments">
               <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a>
             </p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.drive.settings.html b/help/l10n/es_ES/ox.appsuite.user.sect.drive.settings.html
index ca78379aa..33b66eb6e 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.drive.settings.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.drive.settings.html
@@ -51,13 +51,13 @@
 </div>
 <p id="ox.appsuite.user.reference.drive.settings">Dependiendo de la configuración, están disponibles las siguientes funciones:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">añadir ficheros</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">Añadir ficheros</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.versionhistory">Historial de versiones</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.advanced">Ajustes avanzados</a></p></li>
 </ul>
 <p>Vea también: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Búsqueda de configuraciones</a></p>
 <p id="ox.appsuite.user.reference.drive.settings.adddrive"></p>
-<h3 class="title">añadir ficheros</h3>
+<h3 class="title">Añadir ficheros</h3>
 <p><a class="indexterm" name="id-1.11.17.6.2"></a>Determina si se debería crear un fichero nuevo o una nueva versión de un fichero que posiblemente exista con el mismo nombre. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><b>Añadir nueva versión. </b>Se creará una nueva versión del fichero.</p></li>
@@ -76,7 +76,7 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.advanced.playdiashow"><b>Presentar diapositivas para imágenes. </b><a class="indexterm" name="id-1.11.17.8.2.1.1.1.2"></a>Determina cómo se presentan las fotos que se muestran en el visor</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.advanced.playdiashow"><b>Presentación para imágenes. </b><a class="indexterm" name="id-1.11.17.8.2.1.1.1.2"></a>Determina cómo se presentan las fotos que se muestran en el visor</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.advanced.showhiddenobjects"><b>mostrar ficheros y carpetas ocultos. </b><a class="indexterm" name="id-1.11.17.8.2.1.2.1.2"></a>Determina si se muestran los ficheros y carpetas ocultos. Los nombres de ficheros y carpetas ocultos van precedidos por un punto. Las aplicaciones locales de <span class="phrase">Ficheros</span> precisan tales ficheros y carpetas por motivos internos. Para no poner en riesgo la funcionalidad de las aplicaciones locales de <span class="phrase">Ficheros</span>, dichos ficheros y carpetas ocultas no se deben modificar ni borrar.</p></li>
 </ul>
 <p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.accounts.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.accounts.html
index 52037861e..cde580955 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.accounts.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.accounts.html
@@ -76,7 +76,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Configuración de la dirección de respuesta</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.attachments.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.attachments.html
index e5e9a1a97..2bcc2a496 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.attachments.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="Correo electrónico">
 <link rel="prev" href="ox.appsuite.user.sect.email.view.html" title="Visualización de correos">
-<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.call.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.call.html
index 52820cc88..a37627504 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.call.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.call.html
@@ -58,7 +58,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Establecer el estado de presencia</a></p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.deputy.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.deputy.html
index 9687393fe..85a1cf956 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.deputy.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.deputy.html
@@ -91,12 +91,12 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creación, edición o gestión de citas como representante</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestionar representantes</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestionar representantes</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.email.deputy">Tema superior: <a class="xref" href="ox.appsuite.user.chap.email.html"><i>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.create.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.create.html
index 36d74635d..e62d08d93 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.create.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.create.html
@@ -62,7 +62,7 @@
 </li>
 <li class="listitem"><p role="presentation">Botones <span class="guibutton"><strong>CC</strong></span>, <span class="guibutton"><strong>CCO</strong></span>. Se abren los campos <span class="guibutton"><strong>CC</strong></span> o <span class="guibutton"><strong>CCO</strong></span>.</p></li>
 <li class="listitem">
-<p role="presentation">Botón <span class="guibutton"><strong>RE</strong></span>. Abre el campo <span class="guibutton"><strong>Responder a</strong></span>.</p>
+<p role="presentation">Botón <span class="guibutton"><strong>Re</strong></span>. Abre el campo <span class="guibutton"><strong>Responder a</strong></span>.</p>
 <p role="presentation">Su respuesta al correo se enviará a las direcciones de correo introducidas en este campo.</p>
 </li>
 <li class="listitem">
@@ -83,6 +83,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Enviar</strong></span>. Envía el correo a los destinatarios indicados.</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.13.5.1.5"><p role="presentation"><span class="guibutton"><strong>Enviar más tarde</strong></span>. Abre un menú que le permite seleccionar cuándo se debería enviar el correo.</p></li>
 <li class="listitem">
 <p role="presentation">Barra de botones </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -116,17 +117,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">La ventana de edición</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Reenvío de correos</a></p>
-<p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Uso de funciones de AI al redactar correos</a></p>
-<p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 <p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.email.gui.create">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.detailview.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.detailview.html
index 9bdfe82e3..5b57ab34c 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.detailview.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.detailview.html
@@ -63,6 +63,7 @@
 <li class="listitem">
 <p role="presentation">Dependiendo de la configuración, una de las siguientes funciones estará disponible: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Icono <span class="guibutton"><strong>Asignar categoría</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Abre un menú con funciones para asignar una categoría o para gestionar categorías.</p></li>
 <li class="listitem"><p role="presentation">Icono <span class="guibutton"><strong>Asignar color</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Abre un menú que le permite asignar una etiqueta coloreada al correo.</p></li>
 <li class="listitem"><p role="presentation">Icono <span class="guibutton"><strong>Marcar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Marca el correo.</p></li>
 </ul>
@@ -80,6 +81,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation">Si se selecciona un correo con un adjunto como enlace en la carpeta <span class="guibutton"><strong>Enviados</strong></span>, se mostrará información sobre el adjunto en la parte superior del texto del correo.</p></li>
+<li class="listitem"><p role="presentation">Dependiendo de la configuración: Si están disponibles, se mostrarán las categorías asignadas.</p></li>
 <li class="listitem">
 <p role="presentation">Texto del correo</p>
 <p role="presentation">Las citas de correos anteriores se marcan al comienzo de la línea.</p>
@@ -95,15 +97,11 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">El elemento emergente de <span class="phrase">Correo electrónico</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">La ventana de edición de correo</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.detailview">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.foldertree.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.foldertree.html
index 243c09ea4..9baeb42fb 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.foldertree.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.foldertree.html
@@ -47,14 +47,16 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Bandeja de entrada</strong></span>. De manera predeterminada, todos los correos recibidos se alojan en esta carpeta.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Borradores</strong></span>. Contiene los correos guardados como borrador.</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Enviados</strong></span>. Contiene el correo que ha enviado.</p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Enviados</strong></span>. Contiene los correos que ha enviado.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Papelera</strong></span>. Contiene el correo que ha borrado.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Archivo</strong></span>. Contiene los correos que ha archivado. Esta carpeta se creará automáticamente cuando archive un correo por primera vez.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Mis carpetas</strong></span>. Contiene las carpetas de correo que ha creado. Esta carpeta se creará automáticamente al crear una carpeta de correo por primera vez.</p></li>
 </ul>
 <p>Dependiendo de la configuración y de los ajustes de correo, podrían estar disponibles carpetas adicionales. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Carpetas para correos no leídos, carpetas para mensajes marcados</p></li>
+<li class="listitem"><p role="presentation">Carpeta para mensajes marcados</p></li>
+<li class="listitem"><p role="presentation">Carpeta para mensajes no leídos</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.7.5.2.3"><p role="presentation">Carpeta para mensajes que se enviarán más tarde</p></li>
 <li class="listitem"><p role="presentation">Carpetas de correo compartidas y públicas a las que está suscrito.</p></li>
 <li class="listitem"><p role="presentation">Carpetas de cuentas de correo instrumentales que le ha asignado el administrador.</p></li>
 </ul>
@@ -67,10 +69,10 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Añadir carpetas de correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Desactivar o activar de cuentas de correo instrumentales</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Desactivar o activar de cuentas de correo instrumentales</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a></p>
 </li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.html
index a53eb170a..e9d82e612 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">El botón Nuevo correo</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de pestañas de <span class="phrase">Correo electrónico</span></a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de categorías de la bandeja de entrada</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">El elemento emergente de <span class="phrase">Correo electrónico</span></a></p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.list.html
index 8dabe3c35..70acc0abe 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.list.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.list.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="Los componentes de Correo electrónico">
-<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barra de pestañas de Correo electrónico">
+<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barra de categorías de la bandeja de entrada">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.detailview.html" title="La vista de detalle de Correo electrónico">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -52,6 +52,7 @@
 <li class="listitem"><p role="presentation">Se muestran los siguientes detalles por cada correo: Remitente, asunto, fecha de recepción. Los correos no leídos se marcan con el icono <span class="guibutton"><strong>No leído</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span>.</p></li>
 <li class="listitem"><p role="presentation">La información emergente sobre el nombre de un remitente muestra la dirección de correo dicho remitente.</p></li>
 <li class="listitem"><p role="presentation">Si está disponible, se muestra información adicional: iconos de adjuntos, etiqueta o marca coloreadas, número de correos de una <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">conversación</a>, prioridad.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.10.5.1.7"><p role="presentation">Si están disponibles, se mostrarán las categorías asignadas. En la configuración de correo puede especificar si las categorías asignadas se muestran en la vista de lista.</p></li>
 <li class="listitem"><p role="presentation">Los correos cifrados se marcan con el icono Cifrado <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.encrypted"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Si un aviso de ausencia está activo, se muestra una notificación encima de la vista de lista.</p>
@@ -69,12 +70,9 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">El menú de configuración de <span class="phrase">Correo electrónico</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.list">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.new.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.new.html
index 62e7aeb4c..4e37aac2a 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.new.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.new.html
@@ -52,7 +52,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a></p>
 </li></ul>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.popup.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.popup.html
index 96856e180..8017cdfd1 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.popup.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.popup.html
@@ -71,8 +71,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p></li>
-<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualización de contactos en la vista halo</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.popup">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.settingsmenu.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.settingsmenu.html
index 378b093c3..61e39aaf2 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.settingsmenu.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.settingsmenu.html
@@ -59,7 +59,6 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.tabs.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.tabs.html
index 15a9829fb..9cb4edca1 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.tabs.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.tabs.html
@@ -1,7 +1,7 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>La barra de pestañas de Correo electrónico</title>
+<title>La barra de categorías de la bandeja de entrada</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
@@ -38,15 +38,14 @@
 <h2 class="sr-only">Los componentes de <span class="phrase">Correo electrónico</span>
 </h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.tabs">
-<div class="titlepage"><div><div><h3 class="title">La barra de pestañas de <span class="phrase">Correo electrónico</span>
-</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">La barra de categorías de la bandeja de entrada</h3></div></div></div>
 <a class="indexterm" name="id-1.7.8.9.2"></a><p id="ox.appsuite.user.concept.email.gui.tabs">Muestra las pestañas de la bandeja de entrada predefinidas para los correos de la carpeta <span class="guibutton"><strong>Bandeja de entrada</strong></span>. Esto permite asignar los correos entrantes a determinadas pestañas ordenadas por remitentes.</p>
 <p id="ox.appsuite.user.reference.email.gui.tabs">
         </p>
 <p class="title">Notas:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Dependiendo de la configuración, las pestañas de la bandeja de entrada podrían no estar disponibles.</p></li>
-<li class="listitem"><p role="presentation">Si las pestañas de la bandeja de entrada están disponibles, se puede mostrar u ocultar la barra de pestañas. Para ello pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse <span class="guibutton"><strong>Categorías de la Bandeja de entrada</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Si las categorías de la bandeja de entrada están disponibles, puede mostrar u ocultar la barra de categorías de la bandeja de entrada. Para hacerlo, pulse en el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Categorías de la bandeja de entrada</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">El número de pestañas de la bandeja de entrada y sus nombres y orden están predefinidos. Dependiendo de la configuración, algunas pestañas de la bandeja de entrada se podrían renombrar o desactivar.</p></li>
 </ul>
 <p>
@@ -54,14 +53,9 @@
 <p id="ox.appsuite.user.related.email.gui.tabs">
         </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a>
-            </p></li>
-</ul>
+            </p></li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.reference.email.gui.tabs.parent">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.toolbar.html
index 47e19966d..9f1aa7c87 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.toolbar.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.gui.toolbar.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="Los componentes de Correo electrónico">
 <link rel="prev" href="ox.appsuite.user.sect.email.gui.foldertree.html" title="La vista de carpeta de Correo electrónico">
-<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barra de pestañas de Correo electrónico">
+<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barra de categorías de la bandeja de entrada">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -49,7 +49,8 @@
 <li class="listitem"><p role="presentation">Icono <span class="guibutton"><strong>Archivar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.archive"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span>. Archiva los correos que haya seleccionado.</p></li>
 <li class="listitem"><p role="presentation">Iconos para <span class="guibutton"><strong>responder</strong></span> y <span class="guibutton"><strong>reenviar</strong></span> los correos seleccionados: <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">Dependiendo de la configuración: el icono <span class="guibutton"><strong>Integración con AI</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>. Abre un menú con funciones de AI para la edición del contenido del correo.</p></li>
-<li class="listitem"><p role="presentation">Icono <span class="guibutton"><strong>Asignar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Abre un menú que le permite mover un correo a una categoría. Este icono sólo está disponible si está visible la barra de pestañas de la Bandeja de entrada.</p></li>
+<li class="listitem"><p role="presentation">Dependiendo de la configuración: El icono <span class="guibutton"><strong>Asignar categoría de la bandeja de entrada</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.inboxcategories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Abre un menú que le permite mover un correo a una categoría de la bandeja de entrada. Este icono solo está disponible si se muestra la barra de pestañas de la bandeja de entrada.</p></li>
+<li class="listitem"><p role="presentation">Dependiendo de la configuración: El icono <span class="guibutton"><strong>Asignar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Abre un menú con funciones para asignar una categoría o para gestionar categorías.</p></li>
 <li class="listitem"><p role="presentation">Dependiendo de la configuración: el icono <span class="guibutton"><strong>Asignar color</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Abre un menú que le permite asignar una etiqueta coloreada a los correos seleccionados.</p></li>
 <li class="listitem"><p role="presentation">Dependiendo de la configuración: el icono <span class="guibutton"><strong>Marcar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Marca el correo.</p></li>
 <li class="listitem"><p role="presentation">Icono <span class="guibutton"><strong>Mover</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.moveto"><object type="image/svg+xml" data="../../images/folder-symlink.svg" height="15"></object></span>. Mueve los correos seleccionados a otra carpeta.</p></li>
@@ -63,25 +64,12 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de pestañas de <span class="phrase">Correo electrónico</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Reenvío de correos</a></p>
 </li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Uso de funciones de AI al responder a correos</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Mover o copiar correos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Mostrar código fuente del correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Uso de borradores de correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creación de recordatorios de correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Añadir un correo al portal</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Almacenamiento de correos</a></p>
-<p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exportación de correos como PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p>
-</li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Uso de funciones de AI al responder a correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.toolbar">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.addportal.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.addportal.html
index ee5748295..c4fd5de4e 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.addportal.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.addportal.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.addportal">
 <div class="titlepage"><div><div><h3 class="title">Añadir un correo al portal</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.15.2"></a><a class="indexterm" name="id-1.7.15.15.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">Puede añadir un correo como widget al portal.</p>
+<a class="indexterm" name="id-1.7.15.16.2"></a><a class="indexterm" name="id-1.7.15.16.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">Puede añadir un correo como widget al portal.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.addportal">
 <p class="title">Cómo añadir un correo al portal:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.addportal"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.add.html">Añadir widgets al portal</a></p></li></ul>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.archive.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.archive.html
index 563ca7167..9d20bec06 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.archive.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.archive.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.archive">
 <div class="titlepage"><div><div><h3 class="title">Archivado de correos</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.20.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">Al archivar correos, se mueven a la carpeta <span class="guibutton"><strong>Fichero</strong></span>. La carpeta <span class="guibutton"><strong>Fichero</strong></span> contiene una subcarpeta distinta por cada año del calendario. Los correos archivados se guardan en dichas subcarpetas ordenados por el año de recepción. La carpeta <span class="guibutton"><strong>Fichero</strong></span> se crea en cuanto se usa esta función por primera vez. Existen las siguientes opciones: </p>
+<a class="indexterm" name="id-1.7.15.21.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">Al archivar correos, se mueven a la carpeta <span class="guibutton"><strong>Fichero</strong></span>. La carpeta <span class="guibutton"><strong>Fichero</strong></span> contiene una subcarpeta distinta por cada año del calendario. Los correos archivados se guardan en dichas subcarpetas ordenados por el año de recepción. La carpeta <span class="guibutton"><strong>Fichero</strong></span> se crea en cuanto se usa esta función por primera vez. Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">archivar los correos de una carpeta más antiguos de 90 días</p></li>
 <li class="listitem"><p role="presentation">archivar correos individuales</p></li>
@@ -61,14 +61,16 @@
 </li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.archive">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.archive"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.archive">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.categories.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.categories.html
new file mode 100644
index 000000000..d9dc808af
--- /dev/null
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.categories.html
@@ -0,0 +1,95 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>De forma predeterminada se utiliza PGP incrustado para correos nuevos</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Recopilación de direcciones">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Clasificación de correos">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Correo electrónico</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de correos</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">De forma predeterminada se utiliza PGP incrustado para correos nuevos</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.categories">Para organizar los correos independientemente de las carpetas, puede utilizar categorías. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Puede marcar correos con categorías.</p></li>
+<li class="listitem"><p role="presentation">Puede ver todos los correos que se han marcado con una categoría específica.</p></li>
+</ul>
+<p> Puede crear, editar o borrar categorías propias, consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>.</p>
+<p id="ox.appsuite.user.tip.email.manage.categories">Independientemente de las categorías, puede utilizar las categorías de la bandeja de entrada. Con las categorías de la bandeja de entrada puede organizar los correos relacionados con los remitentes; consulte <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a>.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.mark">
+<p class="title">Cómo marcar correos con una categoría:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione uno o varios correos.</p></li>
+<li class="step">
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Asignar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.mark.add"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> de la barra de herramientas. Seleccione una categoría.</p>
+<p role="presentation">Para eliminar una categoría del correo, pulse en la categoría.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.view">
+<p class="title">Cómo mostrar correos que han sido marcados con una categoría específica:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione un correo que haya sido marcado con una categoría.</p></li>
+<li class="step"><p role="presentation">Pulse en la categoría en la vista de detalle.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Resultado: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vista de lista muestra todos los correos que se han marcado con esta categoría.</p></li>
+<li class="listitem"><p role="presentation">Para cada correo, se mostrará la carpeta que lo contiene.</p></li>
+<li class="listitem"><p role="presentation">Para mostrar la lista anterior, pulse en el icono <span class="guibutton"><strong>Cancelar búsqueda</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> en el campo de búsqueda.</p></li>
+</ul>
+          <p>Consejo: También puede utilizar la función de búsqueda buscando una categoría mediante las opciones de búsqueda.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.categories"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">Búsqueda de correos</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.categories">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.collectaddress.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.collectaddress.html
index d78e277fe..c8d50c32e 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.collectaddress.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.collectaddress.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.mark.html" title="Marcado de todos los correos como leídos o no leídos">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Clasificación de correos">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="De forma predeterminada se utiliza PGP incrustado para correos nuevos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.mark.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.categories.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -40,7 +40,7 @@
 <div class="titlepage"><div><div><h3 class="title">Recopilación de direcciones</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.10.2"></a><a class="indexterm" name="id-1.7.15.10.3"></a><p id="ox.appsuite.user.concept.email.manage.collectaddress">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Recopilar nuevas direcciones de correo automáticamente al enviar o leer correos activando esta función en los Ajustes de Correo.</p></li>
+<li class="listitem"><p role="presentation">Recopilar nuevas direcciones de correo automáticamente al enviar o leer correos activando esta función en los ajustes avanzados de Correo.</p></li>
 <li class="listitem"><p role="presentation">Añadir manualmente las direcciones de correo a una libreta de direcciones</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.collectaddress">
@@ -56,16 +56,10 @@
           <p>Nota: Esta función sólo está disponible para contactos nuevos.</p>
         </div>
 </div>
-<p role="presentation" class="cap-contacts">
-        <p class="title">Temas relacionados:</p><ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creación de un nuevo contacto</a>
-            </p></li>
-</ul>
-      </p>
+<p role="presentation" class="cap-contacts"><p class="title">Interfaz de usuario:</p><ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p></li></ul> <p class="title">Temas relacionados:</p><ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creación de un nuevo contacto</a></p></li>
+</ul></p>
 <p id="ox.appsuite.user.parent.email.manage.collectaddress">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.delete.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.delete.html
index dd14903cb..5875c3888 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.delete.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.delete.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.archive.html" title="Archivado de correos">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Limpieza de carpetas de correo">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.recover.html" title="Recuperar correos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.archive.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.recover.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -38,20 +38,20 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Borrado de correos</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.21.2"></a><a class="indexterm" name="id-1.7.15.21.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">Existen las siguientes opciones: </p>
+<a class="indexterm" name="id-1.7.15.22.2"></a><a class="indexterm" name="id-1.7.15.22.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Indicar si los correos se mueven a la Papelera o se eliminan permanentemente cuando se borran.</p>
-<p role="presentation">Los correos que se mueven a la papelera se pueden recuperar.</p>
+<p role="presentation">Puede definir si los correos se mueven a la Papelera o se eliminan permanentemente cuando se borran. </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Los correos que se mueven a la papelera se pueden recuperar.</p></li>
+<li class="listitem"><p role="presentation"><span class="cap-dumpster">Los correos borrados permanentemente se pueden recuperar en un plazo de 14 días. Una vez transcurrido este tiempo: </span> Los correos borrados permanentemente <span class="phrase"><strong>no</strong></span> se pueden recuperar.</p></li>
+</ul>
 </li>
-<li class="listitem"><p role="presentation">Borrar mensajes de correo individuales o conversaciones completas.</p></li>
-<li class="listitem"><p role="presentation">Borrar todos los correos de una carpeta de correo.</p></li>
-<li class="listitem"><p role="presentation">Recuperar correos de la papelera.</p></li>
-<li class="listitem"><p role="presentation">Borrar correos de la papelera permanentemente.</p></li>
-<li class="listitem"><p role="presentation">Borrar permanentemente todos los correos de la papelera vaciándola.</p></li>
+<li class="listitem"><p role="presentation">Puede borrar mensajes de correo individuales o conversaciones completas.</p></li>
+<li class="listitem"><p role="presentation">Puede borrar todos los correos de una carpeta de correo.</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.delete.setting">
-<p class="title">Cómo definir si los correos se mueven a la papelera o se eliminan permanentemente cuando se borran.</p>
+<p class="title">Cómo definir si los correos se mueven a la papelera o se eliminan permanentemente cuando se borran:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.setting"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
@@ -65,21 +65,21 @@
 <li class="listitem"><p role="presentation">Si los correos se van a mover a la papelera, deshabilite <span class="guibutton"><strong>Eliminar permanentemente los correos eliminados</strong></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Si los correos se van a borrar permanentemente, active <span class="guibutton"><strong>Eliminar permanentemente los correos borrados</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Los correos borrados permanentemente <span class="phrase"><strong>no</strong></span> se pueden recuperar.</p>
+<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Dependiendo de la configuración, los correos borrados permanentemente <span class="phrase"><strong>no</strong></span> se pueden recuperar.</p>
 </li>
 </ul></p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.delete">
-<p class="title">Cómo borrar un correo:</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.single">
+<p class="title">Cómo borrar correos individuales:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Seleccione uno o varios correos.</p></li>
 <li class="step">
-<p role="presentation">Pulse el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la barra de herramientas.</p>
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la barra de herramientas.</p>
 <p role="presentation">O: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Pulse las teclas [Supr] o [Retroceso] del teclado.</p></li>
 <li class="listitem"><p role="presentation">En el menú contextual de un correo, pulse en <span class="guibutton"><strong>Borrar</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Si se ha seleccionado un correo individual, use el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> en la vista de detalle.</p></li>
+<li class="listitem"><p role="presentation">Si se ha seleccionado un correo individual, use el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la vista de detalle.</p></li>
 </ul></p>
 </li>
 </ol></div>
@@ -87,7 +87,7 @@
           <p>Resultado: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Si la configuración <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Eliminar permanentemente los correos borrados</strong></span></a> está deshabilitada:</p>
+<p role="presentation">Si la configuración <span class="guibutton"><strong>Eliminar permanentemente los correos borrados</strong></span> está deshabilitada:</p>
 <p role="presentation">Los correos se moverán a la carpeta Papelera.</p>
 </li>
 <li class="listitem">
@@ -97,17 +97,17 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptyfolder">
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.emptyfolder">
 <p class="title">Cómo borrar todos los correos de una carpeta:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">En la vista de carpeta,seleccione la carpeta cuyos correos quiere borrar.</p></li>
 <li class="step">
 <p role="presentation">Utilice uno de los métodos siguientes: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto al nombre de la carpeta.</p></li>
-<li class="listitem"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> encima de la lista.</p></li>
+<li class="listitem"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto al nombre de la carpeta.</p></li>
+<li class="listitem"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay encima de la lista.</p></li>
 </ul></p>
 <p role="presentation">Pulse el botón <span class="guibutton"><strong>Borrar todos los mensajes</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si la configuración <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Eliminar permanentemente los correos borrados</strong></span></a> está habilitada, los correos borrados no se podrán recuperar.</p>
+<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si la opción <span class="guibutton"><strong>Eliminar permanentemente correos borrados</strong></span> está habilitada, los correos borrados <span class="phrase"><strong>no</strong></span> se pueden recuperar, dependiendo de la configuración.</p>
 </li>
 <li class="step"><p role="presentation">Confirme que desea borrar el contenido de esta carpeta.</p></li>
 </ol></div>
@@ -115,7 +115,7 @@
           <p>Resultado: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Si la configuración <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Eliminar permanentemente los correos borrados</strong></span></a> está deshabilitada:</p>
+<p role="presentation">Si la configuración <span class="guibutton"><strong>Eliminar permanentemente los correos borrados</strong></span> está deshabilitada:</p>
 <p role="presentation">Los correos se moverán a la carpeta Papelera.</p>
 </li>
 <li class="listitem">
@@ -125,60 +125,22 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
-<p class="title">Cómo recuperar correos eliminados:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Abra la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
-<li class="step"><p role="presentation">Seleccione uno o varios correos.</p></li>
-<li class="step"><p role="presentation">En el menú contextual del correo, pulse en <span class="guibutton"><strong>Mover</strong></span>.</p></li>
-<li class="step"><p role="presentation">Seleccione una carpeta de la ventana <span class="guilabel"><strong>Mover</strong></span>. Pulse en el botón <span class="guibutton"><strong>Mover</strong></span>.</p></li>
-</ol></div>
-<div class="taskrelated">
-          <p>O: </p>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Para recuperar todos los correos de la papelera, pulse en el icono <span class="guibutton"><strong>Más opciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> encima de la lista. Pulse en el botón <span class="guibutton"><strong>Mover todos los mensajes</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Si se ha seleccionado un correo individual, use el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> de la vista de detalle. Pulse en <span class="guibutton"><strong>Mover</strong></span>.</p></li>
-</ul>
-        </div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever">
-<p class="title">Cómo borrar definitivamente un correo:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Advertencia:</strong></span> Los correos borrados permanentemente <span class="phrase"><strong>no</strong></span> se pueden recuperar.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Abra la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
-<li class="step"><p role="presentation">Seleccione uno o varios correos.</p></li>
-<li class="step">
-<p role="presentation">Pulse el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la barra de herramientas.</p>
-<p role="presentation">Si se ha seleccionado un correo individual, también puede usar el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la vista de detalle.</p>
-</li>
-<li class="step"><p role="presentation">Confirme que desea borrar permanentemente los correos seleccionados.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptytrash">
-<p class="title">Cómo borrar permanentemente el contenido de la carpeta Papelera:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Advertencia:</strong></span> Los correos borrados permanentemente <span class="phrase"><strong>no</strong></span> se pueden recuperar.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Seleccione la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
-<li class="step">
-<p role="presentation">Utilice uno de los métodos siguientes: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto a la <span class="guibutton"><strong>Papelera</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay encima de la lista.</p></li>
-</ul></p>
-<p role="presentation">Pulse <span class="guibutton"><strong>Vaciar carpeta</strong></span>.</p>
-</li>
-<li class="step"><p role="presentation">Confirme que desea borrar el contenido de la carpeta.</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.email.manage.delete"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.22.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.email.manage.delete">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.deleteforever.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.deleteforever.html
new file mode 100644
index 000000000..34e299522
--- /dev/null
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.deleteforever.html
@@ -0,0 +1,92 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Borrado de correos</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.recover.html" title="Recuperar correos">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Recuperar correos borrados permanentemente">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.recover.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Correo electrónico</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de correos</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.deleteforever">
+<div class="titlepage"><div><div><h3 class="title">Borrado de correos</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.24.2"></a><a class="indexterm" name="id-1.7.15.24.3"></a><p id="ox.appsuite.user.concept.email.manage.deleteforever">Existen las siguientes opciones: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Borrar correos individuales de la papelera permanentemente.</p></li>
+<li class="listitem"><p role="presentation">Borrar permanentemente todos los correos de la papelera vaciándola.</p></li>
+</ul>
+<p id="ox.appsuite.user.hint.email.manage.deleteforever.html"><span class="cap-dumpster">Los correos borrados permanentemente se pueden recuperar en un plazo de 14 días. Una vez transcurrido este tiempo: </span>Los correos borrados permanentemente <span class="phrase"><strong>no</strong></span> se pueden recuperar.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.single">
+<p class="title">Cómo borrar permanentemente correos individuales:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Abra la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
+<li class="step"><p role="presentation">Seleccione uno o varios correos.</p></li>
+<li class="step">
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la barra de herramientas.</p>
+<p role="presentation">Si se ha seleccionado un correo individual, también puede usar el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la vista de detalle.</p>
+</li>
+<li class="step"><p role="presentation">Confirme que desea borrar permanentemente los correos seleccionados.</p></li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.emptytrash">
+<p class="title">Cómo borrar todos los correos de la papelera permanentemente:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
+<li class="step">
+<p role="presentation">Utilice uno de los métodos siguientes: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto a la <span class="guibutton"><strong>Papelera</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay encima de la lista.</p></li>
+</ul></p>
+<p role="presentation">Pulse <span class="guibutton"><strong>Vaciar carpeta</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Confirme que desea borrar el contenido de la carpeta.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.deleteforever"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.24.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.deleteforever">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.draft.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.draft.html
index 3a0eea240..00588f943 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.draft.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.draft.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.draft">
 <div class="titlepage"><div><div><h3 class="title">Uso de borradores de correo</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">Mientras redacta un correo, se guarda automáticamente como un borrador a intervalos regulares. Existen las siguientes opciones:</p>
+<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">Mientras redacta un correo, se guarda automáticamente como un borrador a intervalos regulares. Existen las siguientes opciones:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Editar o enviar un borrador de correo.</p></li>
 <li class="listitem"><p role="presentation">Editar o enviar una copia de un borrador de correo.</p></li>
@@ -69,11 +69,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.draft"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.manage.draft">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.expungefolder.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.expungefolder.html
index 11eb8c351..92a830bc8 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.expungefolder.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.expungefolder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Borrado de correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Recuperar correos borrados permanentemente">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.unifiedmail.html" title="Utilización del correo unificado">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Siguiente</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.expungefolder">
 <div class="titlepage"><div><div><h3 class="title">Limpieza de carpetas de correo</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.22.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Dependiendo de la configuración del cliente de correo, los correos que borre desde un cliente de correo como Apple Mail, MS Outlook o Mozilla Thunderbird podrían borrarse solo tras desconectarse desde dicho cliente. Mientras tanto, esos correos se mostrarán tachados en el software colaborativo. Para borrar dichos correos, limpie la carpeta de correo.</p>
+<a class="indexterm" name="id-1.7.15.26.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Dependiendo de la configuración del cliente de correo, los correos que borre desde un cliente de correo como Apple Mail, MS Outlook o Mozilla Thunderbird podrían borrarse solo tras desconectarse desde dicho cliente. Mientras tanto, esos correos se mostrarán tachados en el software colaborativo. Para borrar dichos correos, limpie la carpeta de correo.</p>
 <p id="ox.appsuite.user.hint.email.manage.expungefolder">Nota: Dependiendo de la configuración, esta función no está disponible si dichos correos no se muestran.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.expunge">
 <p class="title">Cómo limpiar una carpeta de correo:</p>
@@ -47,14 +47,12 @@
 <li class="step"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.expungefolder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto al nombre de la carpeta. Pulse en <span class="guibutton"><strong>Limpiar</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.expungefolder">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.expungefolder"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.expungefolder">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.html
index ceaf501db..36b99cf74 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.html
@@ -43,17 +43,21 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Mover o copiar correos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Recopilación de direcciones</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Mostrar código fuente del correo</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Uso de borradores de correo</a></p></li>
-<li class="listitem cap-tasks" id="id-1.7.15.4.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creación de recordatorios de correo</a></p></li>
+<li class="listitem cap-tasks" id="id-1.7.15.4.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creación de recordatorios de correo</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Añadir un correo al portal</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Almacenamiento de correos</a></p></li>
-<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exportación de correos como PDF</a></p></li>
+<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exportación de correos como PDF</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importación de correos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archivado de correos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.4.1.19"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a></p></li>
 </ul>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.import.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.import.html
index 5397b4516..e8909a1ca 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.import.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importación de correos</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><p id="ox.appsuite.user.concept.email.manage.import">Puede importar un correo disponible en formato EML.</p>
+<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.import">Puede importar un correo disponible en formato EML.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.import">
 <p class="title">Cómo importar un correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,14 +46,15 @@
 <li class="step"><p role="presentation">Arrastre el fichero eml desde un administrador de ficheros o desde el escritorio a la vista de lista de correos.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.import"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Almacenamiento de correos</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Almacenamiento de correos</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.import">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.inboxcategories.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.inboxcategories.html
index cf6477018..d75f3b01a 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.inboxcategories.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.inboxcategories.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation">asignar correos entrantes a una categoría de la bandeja de entrada</p></li>
 <li class="listitem"><p role="presentation">editar la vista de categorías de la bandeja de entrada</p></li>
 </ul>
-<p role="presentation" class="feat-io-ox-core-categories">Nota: Las categorías de la bandeja de entrada descritas aquí solo se pueden usar para correos. Dependiendo de la configuración, puede usar categorías separadas para citas, contactos y tareas. Consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Nota: Las categorías de la bandeja de entrada descritas aquí solo se pueden usar para correos. Dependiendo de la configuración, puede usar categorías separadas para correos, citas, contactos y tareas. Consulte <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.inboxcategories.activate">
 <p class="title">Cómo activar o desactivar pestañas de la bandeja de entrada:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,7 @@
 <p role="presentation">Para activar las pestañas de la bandeja de entrada, pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.activate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Categorías de la Bandeja de entrada</strong></span>.</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">También puede usar el botón <span class="guibutton"><strong>Configurar categorías de la Bandeja de entrada</strong></span> debajo de <span class="guibutton"><strong>Lectura</strong></span> en la configuración del correo.</p></li></ul>
 <p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configurar categorías</strong></span>. Muestra las categorías de la bandeja de entrada disponibles. Pulse <span class="guibutton"><strong>Activar categorías</strong></span>.</p>
-<p role="presentation">En la parte derecha, bajo la barra de menús, se mostrará la barra de pestañas.</p>
+<p role="presentation">Debajo de la barra de menús se mostrará la barra de categorías de la bandeja de entrada.</p>
 </li>
 <li class="step">
 <p role="presentation">Para desactivar las pestañas de la bandeja de entrada, pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.deactivate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Categorías de la Bandeja de entrada</strong></span>.</p>
@@ -68,7 +68,7 @@
 <p role="presentation">Los correos que no se hayan asignado aún a ninguna categoría de la bandeja de entrada se muestran en la pestaña <span class="guibutton"><strong>General</strong></span>.</p>
 </li>
 <li class="step">
-<p role="presentation">Arrastre un correo desde la vista de la lista a una pestaña de la barra de pestañas y suéltelo allí.</p>
+<p role="presentation">Arrastre un correo desde la vista de la lista a una categoría de la barra de categorías de la bandeja de entrada y suéltelo allí.</p>
 <p role="presentation">También puede seleccionar un correo. Pulse el icono <span class="guibutton"><strong>Asignar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span> de la barra de herramientas. Seleccione una pestaña del menú.</p>
 </li>
 <li class="step"><p role="presentation">Para terminar el proceso, haga una de las operaciones siguientes: <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -82,14 +82,14 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Categorías de la Bandeja de entrada</strong></span>.</p>
-<p role="presentation">También puede pulsar el icono <span class="guibutton"><strong>Configurar categorías</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> de la barra de categorías.</p>
+<p role="presentation">También puede pulsar el icono <span class="guibutton"><strong>Configurar categorías</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> de la barra de categorías de la bandeja de entrada.</p>
 <p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configurar categorías</strong></span>.</p>
 </li>
 <li class="step">
 <p role="presentation">Para activar o desactivar una categoría de la bandeja de entrada, marque o desmarque la casilla de verificación correspondiente.</p>
 <p role="presentation">Para renombrar una categoría de la bandeja de entrada, edite el texto correspondiente.</p>
 <p role="presentation">Nota: Algunas categorías no se pueden editar.</p>
-<p role="presentation">Para ocultar la barra de categorías, pulse en <span class="guibutton"><strong>Desactivar categorías</strong></span>.</p>
+<p role="presentation">Para ocultar la barra de categorías de la bandeja de entrada, pulse en <span class="guibutton"><strong>Desactivar categorías</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">Pulse en <span class="guibutton"><strong>Guardar</strong></span>.</p></li>
 </ol></div>
@@ -98,14 +98,11 @@
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">El menú de configuración de <span class="phrase">Correo electrónico</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de pestañas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de categorías de la bandeja de entrada</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.inboxcategories">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.label.html
index 61e29dba9..2296b5252 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.label.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.label.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Recopilación de direcciones">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="De forma predeterminada se utiliza PGP incrustado para correos nuevos">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.source.html" title="Mostrar código fuente del correo">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.categories.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.source.html">Siguiente</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.label">
 <div class="titlepage"><div><div><h3 class="title">Clasificación de correos</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Dependiendo de la configuración, puede usar una de las siguientes opciones para organizar correos: </p>
+<a class="indexterm" name="id-1.7.15.12.2"></a><a class="indexterm" name="id-1.7.15.12.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Dependiendo de la configuración, puede usar una de las siguientes opciones para organizar correos: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">una etiqueta coloreada</p></li>
 <li class="listitem"><p role="presentation">una marca</p></li>
@@ -69,7 +69,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.label"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.mark.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.mark.html
index 6de0c2724..6a509053b 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.mark.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.mark.html
@@ -62,7 +62,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.mark"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></p></li></ul>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.movecopy.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.movecopy.html
index 759316b30..4eaef7a30 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.movecopy.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.movecopy.html
@@ -67,7 +67,11 @@
 </ul>
 <p id="ox.appsuite.user.related.email.manage.movecopy"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.pdfexport.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.pdfexport.html
index 18874312e..ae0fb74a7 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.pdfexport.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.pdfexport.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.pdfexport">
 <div class="titlepage"><div><div><h3 class="title">Exportación de correos como PDF</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.17.2"></a><a class="indexterm" name="id-1.7.15.17.3"></a><a class="indexterm" name="id-1.7.15.17.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Nota: Dependiendo de la configuración, esta función podría no estar disponible.</p>
+<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><a class="indexterm" name="id-1.7.15.18.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Nota: Dependiendo de la configuración, esta función podría no estar disponible.</p>
 <p id="ox.appsuite.user.concept.email.manage.pdfexport">Se puede exportar un correo y sus adjuntos en formato docx como PDF. En cuanto se crea el fichero PDF, se guardará en una carpeta de <span class="phrase">Ficheros</span> que puede definirse. Dependiendo del volumen de datos, la descarga podría tardar un poco. En cuanto el proceso haya finalizado, se recibirá una notificación.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.pdfexport">
 <p class="title">Cómo exportar correos como PDF:</p>
@@ -54,7 +54,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.pdfexport"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Almacenamiento de correos</a></p></li></ul>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.print.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.print.html
index 3420d5d0b..88fe63ffc 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.print.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Impresión de correos</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.print">Puede imprimir el contenido de uno o varios correos.</p>
+<a class="indexterm" name="id-1.7.15.20.2"></a><a class="indexterm" name="id-1.7.15.20.3"></a><p id="ox.appsuite.user.concept.email.manage.print">Puede imprimir el contenido de uno o varios correos.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.print">
 <p class="title">Cómo imprimir el contenido de un correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -56,7 +56,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.print"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archivado de correos</a></p></li></ul>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.recover.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.recover.html
new file mode 100644
index 000000000..9b91a0dbc
--- /dev/null
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.recover.html
@@ -0,0 +1,97 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Recuperar correos</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Borrado de correos">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Borrado de correos">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Correo electrónico</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de correos</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.recover">
+<div class="titlepage"><div><div><h3 class="title">Recuperar correos</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.recover">Existen las siguientes opciones: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Recuperar correos individuales de la papelera.</p></li>
+<li class="listitem"><p role="presentation">Recuperar todos los correos de la papelera.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.single">
+<p class="title">Cómo recuperar correos individuales de la papelera:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Abra la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
+<li class="step">
+<p role="presentation">Seleccione uno o varios correos.</p>
+<p role="presentation">En el menú contextual del correo, pulse en <span class="guibutton"><strong>Mover</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Seleccione una carpeta de la ventana <span class="guilabel"><strong>Mover</strong></span>. Pulse en <span class="guibutton"><strong>Mover</strong></span>.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>O: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Utilice arrastrar y soltar para mover los correos de la papelera a una carpeta en la vista de carpetas.</p></li>
+<li class="listitem"><p role="presentation">Si se ha seleccionado un correo individual, use el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.single.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> de la vista de detalle. Pulse en <span class="guibutton"><strong>Mover</strong></span>.</p></li>
+</ul>
+        </div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.all">
+<p class="title">Cómo recuperar todos los correos de la papelera:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
+<li class="step">
+<p role="presentation">Utilice uno de los métodos siguientes: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto a la <span class="guibutton"><strong>Papelera</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay encima de la lista.</p></li>
+</ul></p>
+<p role="presentation">Pulse el botón <span class="guibutton"><strong>Mover todos los mensajes</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Seleccione una carpeta de la ventana <span class="guilabel"><strong>Mover</strong></span>. Pulse en <span class="guibutton"><strong>Mover todos</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.recover"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.23.7.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.recover">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.reminder.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.reminder.html
index 1101e4c4f..22f8af9f8 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.reminder.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.reminder.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.reminder">
 <div class="titlepage"><div><div><h3 class="title">Creación de recordatorios de correo</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">Puede activar un recordatorio para un correo. Esta función crea una tarea y le recordará la fecha de vencimiento.</p>
+<a class="indexterm" name="id-1.7.15.15.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">Puede activar un recordatorio para un correo. Esta función crea una tarea y le recordará la fecha de vencimiento.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.email.manage.reminder">
 <p class="title">Cómo crear un recordatorio de correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.reminder"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Creación de nuevas tareas</a></p></li></ul>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.save.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.save.html
index f56623649..874817dfe 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.save.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.save.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.save">
 <div class="titlepage"><div><div><h3 class="title">Almacenamiento de correos</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.16.2"></a><p id="ox.appsuite.user.concept.email.manage.save">Puede guardar un correo como fichero de texto. El fichero de texto tendrá la extensión EML. Si selecciona múltiples correos, se creará un fichero eml por cada correo. Después, los ficheros eml se guardarán como un fichero zip.</p>
+<a class="indexterm" name="id-1.7.15.17.2"></a><p id="ox.appsuite.user.concept.email.manage.save">Puede guardar un correo como fichero de texto. El fichero de texto tendrá la extensión EML. Si selecciona múltiples correos, se creará un fichero eml por cada correo. Después, los ficheros eml se guardarán como un fichero zip.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.save">
 <p class="title">Cómo guardar un correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.save"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -57,7 +60,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importación de correos</a></p>
 <p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exportación de correos como PDF</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.7.15.16.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.7.15.17.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.save">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.source.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.source.html
index f458af5cb..079c16e4d 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.source.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.source.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.source">
 <div class="titlepage"><div><div><h3 class="title">Mostrar código fuente del correo</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.12.2"></a><p id="ox.appsuite.user.concept.email.manage.source">El código fuente del correo contiene el contenido completo de un correo, es decir, los datos de la cabecera del correo completos.</p>
+<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.source">El código fuente del correo contiene el contenido completo de un correo, es decir, los datos de la cabecera del correo completos.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.source">
 <p class="title">Cómo mostrar el código fuente de un correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.source"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.undelete.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.undelete.html
new file mode 100644
index 000000000..49e4384d4
--- /dev/null
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.undelete.html
@@ -0,0 +1,75 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Recuperar correos borrados permanentemente</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Borrado de correos">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Limpieza de carpetas de correo">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Correo electrónico</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de correos</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.undelete">
+<div class="titlepage"><div><div><h3 class="title">Recuperar correos borrados permanentemente</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.25.2"></a><a class="indexterm" name="id-1.7.15.25.3"></a><p id="ox.appsuite.user.concept.email.manage.undelete.html">Puede recuperar correos borrados permanentemente en un período de de 14 días. Una vez transcurrido este tiempo, los correos borrados permanentemente se perderán irreversiblemente.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
+<p class="title">Cómo recuperar correos borrados permanentemente:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
+<li class="step">
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto a la <span class="guibutton"><strong>Papelera</strong></span>.</p>
+<p role="presentation">Pulse en <span class="guibutton"><strong>Recuperar elementos borrados</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Seleccione los correos que desea recuperar en la ventana <span class="guilabel"><strong>Recuperar elementos borrados</strong></span>.</p>
+<p role="presentation">Pulse en <span class="guibutton"><strong>Mover elementos seleccionados</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">En la ventana <span class="guilabel"><strong>Mover</strong></span>, especifique la carpeta que debería contener los correos  recuperados.</p>
+<p role="presentation">Pulse en <span class="guibutton"><strong>Mover</strong></span>.</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.undelete"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<p> </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.undelete">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.unifiedmail.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.unifiedmail.html
index cc0be9820..d5ccd49bb 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.unifiedmail.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.manage.unifiedmail.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.unifiedmail">
 <div class="titlepage"><div><div><h3 class="title">Utilización del correo unificado</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">Con Correo unificado se pueden mostrar correos de varias cuentas de correo en una única carpeta centralizada. Esto proporciona una rápida vista general de las bandejas de entrada de varias cuentas. Correo unificado puede describirse así: </p>
+<a class="indexterm" name="id-1.7.15.27.2"></a><a class="indexterm" name="id-1.7.15.27.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">Con Correo unificado se pueden mostrar correos de varias cuentas de correo en una única carpeta centralizada. Esto proporciona una rápida vista general de las bandejas de entrada de varias cuentas. Correo unificado puede describirse así: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Además de la bandeja de entrada de una cuenta de correo, la carpeta <span class="guibutton"><strong>Correo unificado</strong></span> muestra una panorámica de los correos de la cuenta. En realidad, los correos solo existen una vez.</p></li>
 <li class="listitem"><p role="presentation">Los correos de subcarpetas de la Bandeja de entrada no se muestran en la carpeta <span class="guibutton"><strong>Correo unificado</strong></span>.</p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.openai.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.openai.html
index 5a95730b8..d973762f6 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.openai.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.openai.html
@@ -42,7 +42,7 @@
 <li class="listitem"><p role="presentation">edite el contenido de correos ya existentes o consiga sugerencias al texto creadas para responderlos</p></li>
 <li class="listitem"><p role="presentation">consiga sugerencias al texto creadas para enviar correos nuevos</p></li>
 </ul>
-<p> Nota: Cuando se usa la integración con AI, el contenido del correo correspondiente se enviará al Servicio OpenAI de Microsoft Azure </p>
+<p> Nota: Cuando se usa la integración con AI, el contenido del correo correspondiente se enviará al Servicio OpenAI. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">La primera vez que use una función de AI se abre un cuadro de diálogo en el que puede dar su consentimiento para el envío de estos datos. Sólo se pueden usar las funciones de AI tras haber dado su consentimiento al envío de los datos.</p></li>
 <li class="listitem"><p role="presentation">Se puede cambiar su consentimiento al envío de los datos en cualquier momento. Para ello, pulse en <span class="guibutton"><strong>Cambiar consentimiento</strong></span> debajo de <span class="guibutton"><strong>Integración con AI</strong></span> en la configuración del correo.</p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.openai.send.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.openai.send.html
index a6491dfa1..a8209f891 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.openai.send.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.openai.send.html
@@ -64,7 +64,7 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Uso de funciones de AI al responder a correos</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.email.openai.send">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Uso de la integración con AI</a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.search.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.search.html
index 45514d3a3..b8c473b73 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.search.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.search.html
@@ -101,9 +101,14 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a>
           </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a>
-          </p></li>
+          </p>
+<p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
+          </p>
+</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attachmentexisting.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attachmentexisting.html
index cab6587c8..b1c3ac0bc 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attachmentexisting.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attachmentexisting.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="Adición de adjuntos">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Envío de adjuntos como enlace">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="añadir adjuntos">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="enviar adjuntos como enlace">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentexisting">
 <div class="titlepage"><div><div><h3 class="title">Añadir adjuntos de correos ya existentes</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.9.2"></a><a class="indexterm" name="id-1.7.11.9.3"></a><p id="ox.appsuite.user.concept.email.send.attachmentexisting">Dependiendo de la configuración, puede añadir adjuntos de correos ya existentes a un nuevo correo.</p>
@@ -59,14 +59,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachmentexisting"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envío de adjuntos como enlace</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">enviar adjuntos como enlace</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attachmentlink.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attachmentlink.html
index 51ddc86bf..dc4f331a4 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attachmentlink.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attachmentlink.html
@@ -1,11 +1,11 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Envío de adjuntos como enlace</title>
+<title>enviar adjuntos como enlace</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Añadir adjuntos de correos ya existentes">
 <link rel="next" href="ox.appsuite.user.sect.email.send.templates.html" title="Uso de plantillas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentlink">
-<div class="titlepage"><div><div><h3 class="title">Envío de adjuntos como enlace</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">enviar adjuntos como enlace</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.10.2"></a><p id="ox.appsuite.user.concept.email.send.attachmentlink">Esta función permite enviar grandes adjuntos por correo. Funciona así: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Los adjuntos se subirán a una nueva carpeta situada en <span class="guibutton"><strong>Correo de Drive</strong></span> en la aplicación <span class="phrase">Ficheros</span>. El nombre de esta carpeta se corresponde con el asunto del correo. La carpeta se compartirá mediante un enlace público.</p></li>
@@ -89,14 +89,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.attachmentlink"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachmentlink">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachmentlink">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attachments.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attachments.html
index 96f3a25e4..364ed492c 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attachments.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attachments.html
@@ -1,11 +1,11 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Adición de adjuntos</title>
+<title>añadir adjuntos</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.replyto.html" title="Configuración de la dirección de respuesta">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Añadir adjuntos de correos ya existentes">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachments">
-<div class="titlepage"><div><div><h3 class="title">Adición de adjuntos</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">añadir adjuntos</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.8.2"></a><a class="indexterm" name="id-1.7.11.8.3"></a><p id="ox.appsuite.user.concept.emal.add.attachments">Dependiendo de la configuración, se pueden adjuntar ficheros guardados en su ordenador o en la aplicación <span class="phrase">Ficheros</span>.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.attachments">
 <p class="title">Cómo añadir adjuntos en la ventana de edición de correo:</p>
@@ -62,14 +62,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachments"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envío de adjuntos como enlace</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">enviar adjuntos como enlace</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachments">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachments">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attendees.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attendees.html
index 1967401a8..8dcce4184 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attendees.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Reenvío automático de correos">
 <link rel="next" href="ox.appsuite.user.sect.email.send.vacationnotice.html" title="Envío de un aviso de ausencia automático">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attendees">
 <div class="titlepage"><div><div><h3 class="title">Envío de un correo a participantes de citas</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.16.2"></a><div class="task" id="ox.appsuite.user.task.email.send.attendees">
@@ -51,25 +51,16 @@
 <li class="step"><p role="presentation">Rellene los datos para el envío del correo.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.send.attendees">
-        </p>
+<p id="ox.appsuite.user.related.email.send.attendees"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a>
-            </p>
-</li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
-            </p></li>
-</ul>
-<p>
-      </p>
-<p id="ox.appsuite.user.parent.email.send.attendees">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
+<p id="ox.appsuite.user.parent.email.send.attendees">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.autoforward.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.autoforward.html
index fff0d9ecb..69b38bab3 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.autoforward.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.autoforward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.forward.html" title="Reenvío de correos">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attendees.html" title="Envío de un correo a participantes de citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.autoforward">
 <div class="titlepage"><div><div><h3 class="title">Reenvío automático de correos</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.15.2"></a><p id="ox.appsuite.user.concept.email.send.autoforward">Puede hacer que los correos se reenvíen automáticamente a otras direcciones.</p>
@@ -67,7 +67,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
+              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a>
@@ -90,7 +90,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.email.send.autoforward">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.autoforward">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.forward.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.forward.html
index 575fe2bc2..09ae35cf4 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.forward.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.forward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.reply.html" title="Respuesta a correos">
 <link rel="next" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Reenvío automático de correos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.forward">
 <div class="titlepage"><div><div><h3 class="title">Reenvío de correos</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.14.2"></a><p id="ox.appsuite.user.concept.email.send.forward">Si se reenvía un correo, algunos de los campos del correo aparecen ya rellenos: </p>
@@ -74,11 +74,11 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Reenvío automático de correos</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.forward">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.forward">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.html
index 198f9c4d0..bcf02cdb9 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.html
@@ -1,13 +1,13 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Envío de correos</title>
+<title>enviar correos</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="Correo electrónico">
 <link rel="prev" href="ox.appsuite.user.sect.email.attachments.html" title="Visualización y guardado de adjuntos de correo">
-<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Envío de un nuevo correo">
+<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Envío de nuevos correos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -36,15 +36,15 @@
     
   </h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.send">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Envío de correos</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">enviar correos</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.email.send">Aprenda cómo enviar un correo y sobre las funciones disponibles para personalizar el contenido del correo: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Configuración de la dirección de respuesta</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a></p></li>
-<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envío de adjuntos como enlace</a></p></li>
+<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">enviar adjuntos como enlace</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.11.2.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.new.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.new.html
index a129b986e..ab809a68e 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.new.html
@@ -1,13 +1,13 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Envío de un nuevo correo</title>
+<title>Envío de nuevos correos</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
-<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="Selección de una dirección de remite">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
+<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="seleccionar una dirección de remite">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.new">
-<div class="titlepage"><div><div><h3 class="title">Envío de un nuevo correo</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Envío de nuevos correos</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.5.2"></a><a class="indexterm" name="id-1.7.11.5.3"></a><a class="indexterm" name="id-1.7.11.5.4"></a><div class="task" id="ox.appsuite.user.task.email.send.new">
 <p class="title">Cómo enviar un nuevo correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -93,37 +93,26 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">El botón Nuevo correo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">La ventana de edición de correo</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Acciones subordinadas:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Adición automática de Contactos o Recursos desde una libreta de direcciones</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Adición automática de Contactos o Recursos desde el Directorio de Direcciones</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Configuración de la dirección de respuesta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a></p>
-<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envío de adjuntos como enlace</a></p>
+<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">enviar adjuntos como enlace</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Reenvío de correos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Reenvío automático de correos</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Envío de un correo a participantes de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Envío de un aviso de ausencia automático</a></p>
-<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envío de contactos como vCard</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envío de correos desde una libreta de direcciones</a></p>
-</li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Uso de funciones de AI al redactar correos</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Uso de funciones de AI al redactar correos</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.new">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.new">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.reply.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.reply.html
index 12b560fee..7c4838381 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.reply.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.reply.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.signatures.html" title="Uso de firmas">
 <link rel="next" href="ox.appsuite.user.sect.email.send.forward.html" title="Reenvío de correos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.reply">
 <div class="titlepage"><div><div><h3 class="title">Respuesta a correos</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.13.2"></a><p id="ox.appsuite.user.concept.email.send.reply">Al responder a un correo, algunos de los campos del correo aparecen ya rellenados: </p>
@@ -70,13 +70,13 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Reenvío de correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Envío de un aviso de ausencia automático</a></p>
 </li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.11.13.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Uso de funciones de AI al responder a correos</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.reply">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.reply">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.replyto.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.replyto.html
index b1ece0d93..2b020fa70 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.replyto.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.replyto.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="Selección de una dirección de remite">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="Adición de adjuntos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="seleccionar una dirección de remite">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="añadir adjuntos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.replyto">
 <div class="titlepage"><div><div><h3 class="title">Configuración de la dirección de respuesta</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.7.2"></a><p id="ox.appsuite.user.concept.email.send.replyto">De manera predeterminada, cuando un destinatario responde a su correo, la respuesta se envía a la cuenta de correo desde la que usted envió el correo. Alternativamente, puede usar la ventana de edición de correo para especificar las direcciones de correo a las que se enviará la respuesta al correo enviado.</p>
@@ -43,11 +43,11 @@
 <p class="title">Cómo seleccionar una dirección de respuesta en la ventana de edición de correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">En la ventana de edición de correo, pulse en <span class="guibutton"><strong>RE</strong></span> junto a la dirección del remitente. Se mostrará el campo <span class="guibutton"><strong>Responder a</strong></span>.</p>
+<p role="presentation">En la ventana de edición de correo, pulse en <span class="guibutton"><strong>Re</strong></span> junto a la dirección del remitente. Se mostrará el campo <span class="guibutton"><strong>Responder a</strong></span>.</p>
 <p role="presentation">Si ha especificado direcciones de respuesta predeterminadas al editar su cuenta de correo principal, el campo <span class="guibutton"><strong>Responder a</strong></span> se muestra automáticamente. El campo incluye las direcciones de respuesta predeterminadas.</p>
 </li>
 <li class="step">
-<p role="presentation">En <span class="guibutton"><strong>Responder a</strong></span>, introduzca las direcciones de correo a las que desea que se envíe la respuesta a su correo. <ul class="itemizedlist" style="list-style-type: disc; ">
+<p role="presentation">En <span class="guibutton"><strong>Responder a</strong></span>, introduzca las direcciones de correo a las que se debería enviar la respuesta a su correo. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Mientras se escriben los destinatarios se mostrarán varias sugerencias relacionadas. Para aceptar una sugerencia, pulse en ella.</p></li>
 <li class="listitem"><p role="presentation">Para seleccionar contactos de una libreta de direcciones, pulse el icono <span class="guibutton"><strong>Seleccionar contacto</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.replyto.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span> de la parte derecha del campo.</p></li>
 </ul></p>
@@ -57,11 +57,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.replyto"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">Edición de la cuenta de correo principal</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.replyto">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.replyto">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.sender.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.sender.html
index 3c0c6ecfe..467847cef 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.sender.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.sender.html
@@ -1,12 +1,12 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Selección de una dirección de remite</title>
+<title>seleccionar una dirección de remite</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Envío de un nuevo correo">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Envío de nuevos correos">
 <link rel="next" href="ox.appsuite.user.sect.email.send.replyto.html" title="Configuración de la dirección de respuesta">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.sender">
-<div class="titlepage"><div><div><h3 class="title">Selección de una dirección de remite</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">seleccionar una dirección de remite</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.6.2"></a><p id="ox.appsuite.user.concept.email.send.sender">Al enviar un correo se puede establecer la dirección de remite a mostrar al destinatario, en la ventana de edición del correo:</p>
 <div class="task" id="ox.appsuite.user.task.email.send.sender">
 <p class="title">Cómo seleccionar su dirección de remite en la ventana de edición de correo:</p>
@@ -59,11 +59,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.sender"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.sender">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.sender">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.signatures.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.signatures.html
index 5e0b29e92..c741549ed 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.signatures.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.signatures.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.templates.html" title="Uso de plantillas">
 <link rel="next" href="ox.appsuite.user.sect.email.send.reply.html" title="Respuesta a correos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.signatures">
 <div class="titlepage"><div><div><h3 class="title">Uso de firmas</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.12.2"></a><a class="indexterm" name="id-1.7.11.12.3"></a><p id="ox.appsuite.user.concept.email.send.signatures">Una firma de correo es texto que se insertará automáticamente en el correo mientras se redacta, se responde o se reenvía. Se usa típicamente para insertar el nombre, empresa y dirección de contacto al final del texto del correo. Se pueden crear firmas en texto sencillo o en formato html. Están disponibles las siguientes funciones: </p>
@@ -91,7 +91,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.signatures"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -99,7 +99,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.signatures">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.signatures">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.templates.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.templates.html
index 5bb4b8a89..ea3dd8503 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.templates.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.templates.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Envío de adjuntos como enlace">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="enviar adjuntos como enlace">
 <link rel="next" href="ox.appsuite.user.sect.email.send.signatures.html" title="Uso de firmas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.templates">
 <div class="titlepage"><div><div><h3 class="title">Uso de plantillas</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.11.2"></a><a class="indexterm" name="id-1.7.11.11.3"></a><p id="ox.appsuite.user.concept.email.send.templates">Las plantillas son bloques de texto que se pueden escribir una vez e insertarse en sus correos tan a menudo como se desee. Como resultado, frases usadas con frecuencia solo hay que escribirlas una vez. Las plantillas, las firmas y los borradores de correo se diferencian en lo siguiente: </p>
@@ -88,7 +88,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.templates"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -96,7 +96,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Uso de borradores de correo</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.templates">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.templates">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.vacationnotice.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.vacationnotice.html
index 7c355b22e..47d77fb02 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.send.vacationnotice.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.send.vacationnotice.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attendees.html" title="Envío de un correo a participantes de citas">
 <link rel="next" href="ox.appsuite.user.sect.email.openai.html" title="Uso de la integración con AI">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.vacationnotice">
 <div class="titlepage"><div><div><h3 class="title">Envío de un aviso de ausencia automático</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.17.2"></a><a class="indexterm" name="id-1.7.11.17.3"></a><p id="ox.appsuite.user.concept.email.send.vacationnotice">Un aviso de ausencia informa al remitente de un correo de que usted no descargará sus correos durante un período de tiempo determinado. Puede configurar lo siguiente: </p>
@@ -81,14 +81,14 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Reenvío de correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Reenvío automático de correos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">Uso de filtros de correo</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.vacationnotice">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.vacationnotice">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.settings.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.settings.html
index 56b175dfa..38163a7c3 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.settings.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.settings.html
@@ -55,8 +55,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.composereply">Redactar y Responder</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.20.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">Plantillas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.rules">Reglas</a></p></li>
-<li class="listitem feat-zoom" id="id-1.7.20.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">Integración con AI</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.7.20.5.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Ajustes avanzados</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">Integración con AI</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Ajustes avanzados</a></p></li>
 </ul>
 <p>Vea también: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Búsqueda de configuraciones</a></p>
 <p id="ox.appsuite.user.reference.email.settings.reading"></p>
@@ -64,31 +64,32 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>disposición. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Determina el diseño de la vista de lista y de la vista de detalle en el área de visualización.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>Disposición. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Determina el diseño de la vista de lista y de la vista de detalle en el área de visualización.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>lista de mensajes. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a>
+<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>Lista de mensajes. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.list"><b>Imágenes de contacto, casillas de verificación, simple. </b>Determina si se mostrarán las imágenes de contactos, las casillas de verificación o ninguno de dichos elementos, en la vista de lista.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.preview"><b>Mostrar vista previa del texto. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.2.1.2"></a>Determina si las primeras palabras del contenido del correo se mostrarán en la vista de lista de correos.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Mostrar siempre la fecha y hora completas. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Determina si no solo se mostrará a fecha de recepción sino también la hora de recepción en la vista de lista de correos.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Mostrar tamaño del mensaje. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Determina si el tamaño de un correo se mostrará en la vista de lista de correos.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.20.6.2.1.2.1.3.1.3"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>Mostrar categorías. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Define si las categorías asignadas al correo se mostrarán en la vista de lista de correo.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Mostrar siempre la fecha y hora completas. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Determina si no solo se mostrará a fecha de recepción sino también la hora de recepción en la vista de lista de correos.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Mostrar tamaño del mensaje. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.5.1.2"></a>Determina si el tamaño de un correo se mostrará en la vista de lista de correos.</p></li>
 </ul>
 <p>
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>panel de lectura. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a>
+<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>Panel de lectura. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>mostrar el texto citado en color diferente. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Indica si los mensajes originales se resaltan y se preceden con una línea vertical. Esta opción asume que el texto del correo original no se ha adjuntado al correo sino que se le ha añadido.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>Mostrar el texto citado en color diferente. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Indica si los mensajes originales se resaltan y se preceden con una línea vertical. Esta opción asume que el texto del correo original no se ha adjuntado al correo sino que se le ha añadido.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.fixedfont"><b>Usar fuentes de ancho fijo para correos de texto sencillo. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.2.1.2"></a>Especifica si se usará una fuente de ancho fijo al redactar un correo de texto sencillo.</p></li>
 </ul>
 <p>
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>marcar como leído. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Determina el período después del cual un correo se marcará automáticamente como leído al seleccionar el correo. </p>
+<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>Marcar como leído. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Determina el período después del cual un correo se marcará automáticamente como leído al seleccionar el correo. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.immediately"><b>Inmediatamente. </b>El correo se marcará inmediatamente como leído.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.seconds"><b>Después de 5 segundos, después de 20 segundos. </b>El correo se marcará como leído después del período establecido.</p></li>
@@ -126,7 +127,7 @@
 <p role="presentation">Nota: El nombre del remitente se muestra delante de la dirección de remite. Si introduce un nombre en el campo <span class="guibutton"><strong>Su nombre</strong></span> en los Ajustes de la cuenta, dicho nombre sobreescribirá el nombre de remitente predeterminado.</p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>formato del mensaje. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Especifica el formato en el que se envían los correos: </p>
+<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>Formato de mensaje. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Especifica el formato en el que se envían los correos: </p>
 <ul class="itemizedlist" style="list-style-type: square; ">
 <li class="listitem"><p><b>HTML. </b>El correo se enviará con etiquetas html. Puede dar formato al texto del correo.</p></li>
 <li class="listitem"><p><b>Texto sencillo. </b>El texto del correo se enviará como texto sencillo sin formato.</p></li>
@@ -173,10 +174,10 @@
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.html"><b>Permitir mostrar correos con formato HTML. </b><a class="indexterm" name="id-1.7.20.12.2.1.1.1.2"></a>Especifica si se permite o no la visualización de mensajes HTML.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>mostrar solicitudes de confirmación de lectura. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Define si se muestra una confirmación de entrega si un correo recibido incluye una solicitud de confirmación de recepción.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>Mostrar solicitudes de confirmación de lectura. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Define si se muestra una confirmación de entrega si un correo recibido incluye una solicitud de confirmación de recepción.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>eliminar permanentemente los correos borrados. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Determina si los correos eliminados se eliminarán permanentemente o si irán a la carpeta de la papelera.</p>
-<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Los mensajes de correo eliminados permanentemente no se pueden restaurar.</p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>Eliminar permanentemente los correos borrados. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Determina si los correos eliminados se eliminarán permanentemente o si irán a la carpeta de la papelera.</p>
+<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Dependiendo de la configuración, los correos borrados permanentemente <span class="bold">no</span> se pueden recuperar.</p>
 <p role="presentation">Vea <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.selectrecent"><b>Seleccionar automáticamente el mensaje leído más reciente al comienzo. </b><a class="indexterm" name="id-1.7.20.12.2.1.4.1.2"></a>Determina si el mensaje leído más reciente se seleccionará automáticamente al iniciar la aplicación.</p></li>
@@ -187,7 +188,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.mailinglist"><b>Preguntar antes de responder a una lista de correo. </b><a class="indexterm" name="id-1.7.20.12.2.1.9.1.2"></a>Determina si hay que confirmar el destinatario cuando se responde a una lista de correo.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.appendvcard"><b>Adjuntar siempre mis datos de contacto detallados como vCard. </b><a class="indexterm" name="id-1.7.20.12.2.1.10.1.2"></a>Especifica si sus datos de contacto se adjuntarán a un nuevo correo en formato vCard.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>reenviar correos como. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Especifica cómo se envía el texto de un correo cuando el correo se reenvía. </p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>Reenviar correos como. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Especifica cómo se envía el texto de un correo cuando el correo se reenvía. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p><b>Incrustado. </b>El texto se envía dentro del texto del nuevo correo.</p></li>
 <li class="listitem"><p><b>Adjunto. </b>El texto se envía como una adjunto del nuevo correo.</p></li>
@@ -204,7 +205,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
@@ -224,7 +225,7 @@
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.email.view.html b/help/l10n/es_ES/ox.appsuite.user.sect.email.view.html
index 47f1d435d..690cdaf5d 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.email.view.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.email.view.html
@@ -82,11 +82,10 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Mostrar código fuente del correo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.firststeps.gui.notificationarea.html b/help/l10n/es_ES/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
index 1ad4c1faf..2258db035 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
@@ -83,7 +83,7 @@
               <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuste de la Configuración general</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a>
+              <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a>
             </p>
 <p role="presentation" class="cap-calendar">
               <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.guard.email.send.html b/help/l10n/es_ES/ox.appsuite.user.sect.guard.email.send.html
index 0bdb91de5..74def50f3 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.guard.email.send.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.guard.email.send.html
@@ -49,7 +49,7 @@
 <p role="presentation">También se puede pulsar en <span class="guibutton"><strong>Configuración</strong></span> en el Lanzador de aplicaciones.</p>
 <p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configuración</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo.</p></li>
+<li class="step"><p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>S/MIME</strong></span> en el panel derecho.</p></li>
 <li class="step">
 <p role="presentation">Marque <span class="guibutton"><strong>Activar S/MIME</strong></span>.</p>
 <p role="presentation">Si se debe establecer el cifrado S/MIME como predeterminado, marque <span class="guibutton"><strong>Usar S/MIME de manera predeterminada para firma y cifrado</strong></span> debajo de <span class="guibutton"><strong>Predeterminados</strong></span>.</p>
@@ -75,7 +75,7 @@
 <li class="listitem"><p role="presentation">Para permitir al destinatario del correo enviar una respuesta cifrada, el destinatario debe tener su clave pública. Puede enviársela como adjunto. Para ello, marque <span class="guibutton"><strong>Adjuntar mi clave pública</strong></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Al usar PGP, se aplica la siguiente opción:</p>
-<p role="presentation">Si <span class="guibutton"><strong>Mostrar ajustes avanzados</strong></span> está activado en los ajustes de <span class="phrase">Guard</span>, puede configurar el formato PGP.</p>
+<p role="presentation">Puede configurar el formato PGP si la opción <span class="guibutton"><strong>Mostrar configuración avanzada al redactar correo</strong></span> ha sido habilitada en los ajustes de <span class="phrase">Guard</span> en <span class="guibutton"><strong>Avanzado</strong></span>.</p>
 <p role="presentation">De manera predeterminada, los correos cifrados se envían en formato <span class="guibutton"><strong>Mime</strong></span>. Algunos clientes obsoletos solo admiten PGP/Incrustado. Si el destinatario usa uno de esos clientes, marque <span class="guibutton"><strong>Incrustado</strong></span>.</p>
 <p role="presentation">Nota: Si usted usa <span class="guibutton"><strong>Incrustado</strong></span>, no puede enviar correos en formato html.</p>
 </li>
@@ -98,7 +98,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.read.html">Lectura de correos cifrados</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.external.html">¿Cómo pueden leer un correo cifrado los destinatarios externos?</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Configuración de <span class="phrase">Guard</span></a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.email.send">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.email.html">Cifrado de conversaciones de correo</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.html b/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.html
index 35688a165..13b0ac880 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Cifrado de datos con Guard">
-<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Gestión de contraseñas">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Eliminación de la función de restablecimiento de contraseña">
 <link rel="next" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Gestión de claves PGP propias">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Siguiente</a></li>
@@ -44,9 +44,24 @@
 <p id="ox.appsuite.user.possibilities.guard.keys">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a></p></li>
-<li class="listitem cap-smime" id="id-1.14.13.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves públicas</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves PGP de destinatarios</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Gestionar claves S/MIME de destinatarios</a></p></li>
 </ul>
+<p id="ox.appsuite.user.related.guard.keys">
+      </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Configuración de <span class="phrase">Guard</span></a>
+          </p></li>
+</ul>
+<p>
+    </p>
+<p id="ox.appsuite.user.parent.guard.keys">Tema superior: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Cifrado de datos con <span class="phrase">Guard</span></i></a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.pgppublickeys.html b/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
index 86d2f39df..8ca42961d 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
@@ -1,13 +1,13 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Gestión de claves públicas</title>
+<title>Gestión de claves PGP de destinatarios</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestión de claves">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gestión de claves propias S/MIME">
-<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Configuración de Guard">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Gestión de claves PGP propias">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gestión de claves propias S/MIME">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,55 +33,36 @@
 </h1>
 <h2 class="sr-only">Gestión de claves</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.pgppublickeys">
-<div class="titlepage"><div><div><h3 class="title">Gestión de claves públicas</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">En la página de <span class="phrase"><span class="guilabel"><strong>Ajustes de seguridad de Guard</strong></span></span>, puede: </p>
+<div class="titlepage"><div><div><h3 class="title">Gestión de claves PGP de destinatarios</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.8.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">visualizar claves públicas</p></li>
+<li class="listitem"><p role="presentation">ver o borrar claves públicas</p></li>
 <li class="listitem"><p role="presentation">subir claves públicas</p></li>
-<li class="listitem"><p role="presentation">borrar una clave pública propia</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.guard.pgppublickeys">
-<p class="title">Cómo usar las funciones de gestión de claves:</p>
+<p class="title">Cómo mostrar las claves PGP de los destinatarios:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
-<p role="presentation">También se puede pulsar en <span class="guibutton"><strong>Configuración</strong></span> en el Lanzador de aplicaciones.</p>
-<p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configuración</strong></span>.</p>
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>Claves PGP del destinatario</strong></span> en el panel derecho.</p>
+<p role="presentation">Se mostrarán las claves PGP públicas de los destinatarios.</p>
 </li>
 <li class="step">
-<p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo.</p>
-<p role="presentation">Se mostrará la página de <span class="phrase"><span class="guilabel"><strong>ajustes de seguridad de Guard</strong></span></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Marque <span class="guibutton"><strong>Mostrar ajustes avanzados</strong></span>.</p>
-<p role="presentation">Se mostrarán las funciones de gestión de claves.</p>
+<p role="presentation">Para mostrar los detalles de una clave, pulse en el ID de la clave.</p>
+<p role="presentation">Para borrar una clave, pulse en el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> que hay junto a la clave.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.display">
-<p class="title">Cómo mostrar claves públicas:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
+<p class="title">Cómo subir la clave pública de un destinatario:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Pulse <span class="guibutton"><strong>Claves públicas de destinatarios</strong></span>. Se abre la ventana <span class="guilabel"><strong>Claves públicas</strong></span>.</p>
-<p role="presentation">Se muestran las claves públicas compartidas por usted con otros usuarios. Si se muestra en esta lista la clave pública de un usuario, podrá enviarle un correo cifrado a dicho usuario y verificar los correos firmados que él le envíe.</p>
-</li>
-<li class="step">
-<p role="presentation">Para visualizar los detalles de una clave, pulse el icono <span class="guibutton"><strong>Detalles</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Detalle de claves públicas</strong></span>.</p>
-<p role="presentation">Puede compartir claves públicas marcando <span class="guibutton"><strong>Compartir clave</strong></span>. Otros usuarios pueden ver y descargar sus claves compartidas. Las claves públicas solo están disponibles para usuarios del software colaborativo.</p>
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>Claves PGP del destinatario</strong></span> en el panel derecho.</p>
 </li>
+<li class="step"><p role="presentation">Pulse en <span class="guibutton"><strong>Subir clave de destinatario</strong></span>. Seleccione un fichero que contenga una clave pública.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
-<p class="title">Cómo subir la clave pública de un destinatario en la ventana <span class="guilabel"><strong>Claves públicas</strong></span>:</p>
-<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Añadir</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.upload.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> que hay junto a <span class="guilabel"><strong>Lista de claves públicas PGP</strong></span>. Seleccione un fichero que contenga una clave pública.</p></li></ul></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.delete">
-<p class="title">Cómo borrar una clave pública en la ventana <span class="guilabel"><strong>Claves públicas</strong></span>:</p>
-<div class="procedure"><ul class="procedure"><li class="step">
-<p role="presentation">Pulse el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> que hay junto a una clave pública.</p>
-<p role="presentation">Confirme que quiere borrar la clave pública.</p>
-</li></ul></div>
-</div>
 <p id="ox.appsuite.user.related.guard.keys.pgppublickeys">
         </p>
 <p class="title">Temas relacionados:</p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.smimepublickeys.html b/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
new file mode 100644
index 000000000..58c317f21
--- /dev/null
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
@@ -0,0 +1,85 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Gestionar claves S/MIME de destinatarios</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestión de claves">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gestión de claves propias S/MIME">
+<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Configuración de Guard">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Cifrado de datos con <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Gestión de claves</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.keys.smimepublickeys">
+<div class="titlepage"><div><div><h3 class="title">Gestionar claves S/MIME de destinatarios</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.10.2"></a><p id="ox.appsuite.user.concept.guard.keys.smimepublickeys">Existen las siguientes opciones: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">visualizar claves públicas</p></li>
+<li class="listitem"><p role="presentation">subir claves públicas</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.smimepublickeys">
+<p class="title">Cómo mostrar la clave SMIME de un destinatario:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Pulse en <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>Destinatarios S/MIME</strong></span> en el panel derecho.</p>
+</li>
+<li class="step">
+<p role="presentation">Introduzca una dirección de correo en <span class="guibutton"><strong>Buscar certificado</strong></span>. Pulse en <span class="guibutton"><strong>Buscar</strong></span>.</p>
+<p role="presentation">Si se ha encontrado un certificado, se mostrarán sus datos.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.guard.keys.smimepublickeys.upload">
+<p class="title">Cómo subir la clave pública de un destinatario:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Pulse en <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>Destinatarios S/MIME</strong></span> en el panel derecho.</p>
+</li>
+<li class="step"><p role="presentation">Pulse en <span class="guibutton"><strong>Subir certificado de destinatario</strong></span>. Seleccione un fichero que contenga una clave pública.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.keys.smimepublickeys">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a>
+            </p>
+<p role="presentation" class="cap-smime">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
+            </p>
+</li></ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.keys.smimepublickeys">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html b/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
index 592c39af4..19fa9ec30 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestión de claves">
 <link rel="prev" href="ox.appsuite.user.sect.guard.keys.html" title="Gestión de claves">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gestión de claves propias S/MIME">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gestión de claves PGP de destinatarios">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,121 +34,93 @@
 <h2 class="sr-only">Gestión de claves</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yourpgpkeys">
 <div class="titlepage"><div><div><h3 class="title">Gestión de claves PGP propias</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.5.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">En la página de <span class="phrase"><span class="guilabel"><strong>Ajustes de seguridad de Guard</strong></span></span>, puede: </p>
+<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">añadir nuevas claves PGP</p></li>
 <li class="listitem"><p role="presentation">mostrar claves PGP propias, mostrar detalles</p></li>
-<li class="listitem">
-<p role="presentation">añadir nuevas claves PGP</p>
-<p role="presentation">Si posee varias claves, puede decidir cuál de ellas debería ser la actual. La clave actual se usa para cifrar datos.</p>
-</li>
-<li class="listitem">
-<p role="presentation">añadir IDs de usuario</p>
-<p role="presentation">Añadiendo IDs de usuario adicionales a una clave, se puede usar dicha clave para varias cuentas de correo.</p>
-</li>
-<li class="listitem"><p role="presentation">descargar claves</p></li>
-<li class="listitem"><p role="presentation">borrar claves</p></li>
+<li class="listitem"><p role="presentation">gestionar claves PGP propias: hacerlas actuales, editar IDs, revocar, descargar, borrar </p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys">
-<p class="title">Cómo usar las funciones de gestión de claves PGP:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.add">
+<p class="title">Cómo añadir una nueva clave PGP:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
-<p role="presentation">También se puede pulsar en <span class="guibutton"><strong>Configuración</strong></span> en el Lanzador de aplicaciones.</p>
-<p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configuración</strong></span>.</p>
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.addkey"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Pulse en <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>Sus claves PGP</strong></span> en el panel derecho.</p>
 </li>
 <li class="step">
-<p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo.</p>
-<p role="presentation">Se mostrará la página de <span class="phrase"><span class="guilabel"><strong>ajustes de seguridad de Guard</strong></span></span>.</p>
+<p role="presentation">Tiene las siguientes opciones: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">Para crear un nuevo par de claves, pulse en <span class="guibutton"><strong>Crear nuevo</strong></span>. Se abre la ventana <span class="phrase"><span class="guilabel"><strong>Crear claves de seguridad de Guard</strong></span></span>.</p>
+<p role="presentation">Introduzca una contraseña para la nueva clave. Confirme la contraseña.</p>
+<p role="presentation">La nueva clave consta de una clave maestra y una subclave acorde a ella.</p>
 </li>
-<li class="step">
-<p role="presentation">Marque <span class="guibutton"><strong>Mostrar ajustes avanzados</strong></span>.</p>
-<p role="presentation">Se mostrarán las funciones de gestión de claves.</p>
+<li class="listitem">
+<p role="presentation">Para añadir una clave privada existente, pulse <span class="guibutton"><strong>Subir clave privada</strong></span>. Seleccione un fichero que contenga una clave privada. Se abre la ventana <span class="guilabel"><strong>Subir claves privadas</strong></span>.</p>
+<p role="presentation">Para subir una nueva clave, introduzca su contraseña de seguridad de <span class="phrase">Guard</span>. Indique una nueva contraseña para la nueva clave.</p>
+</li>
+<li class="listitem"><p role="presentation">Para añadir una clave pública existente, pulse <span class="guibutton"><strong>Subir clave pública</strong></span>. Seleccione un fichero que contenga una clave pública.</p></li>
+</ul></p>
+<p role="presentation">La nueva clave se insertará al principio de lista de claves, y se convertirá en la clave actual.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.display">
-<p class="title">Cómo visualizar sus propias claves PGP o convertir una clave PGP en la actual:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.display">
+<p class="title">Cómo ver sus claves PGP existentes:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Pulse en <span class="guibutton"><strong>Sus claves</strong></span> debajo de <span class="guilabel"><strong>Claves</strong></span>. </p>
-<p role="presentation" class="cap-smime">Dependiendo de la configuración, se abre la ventana <span class="guilabel"><strong>Seleccione el tipo de claves a modificar</strong></span>. Seleccione <span class="guibutton"><strong>PGP</strong></span>.</p>
-<p role="presentation">Se abre la ventana <span class="guilabel"><strong>Sus claves</strong></span>.</p>
-<p role="presentation">
-              <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Se mostrarán sus claves PGP. Cada clave PGP consta de una clave maestra y una subclave. <ul class="itemizedlist" style="list-style-type: circle; ">
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Pulse en <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>Sus claves PGP</strong></span> en el panel derecho.</p>
+<p role="presentation">Se mostrarán sus claves PGP. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Cada clave PGP consta de una clave maestra y una subclave. <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Entre otras cosas, la clave maestra se usa para firmar sus correos.</p></li>
 <li class="listitem"><p role="presentation">La subclave se usará para cifrar y descifrar.</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">Dependiendo de las necesidades, <span class="phrase">Guard</span> usa automáticamente la clave maestra o la subclave.</p></li>
-</ul>
-            </p>
+</ul></p>
 </li>
-<li class="step"><p role="presentation">Si su lista de claves contiene más de una, puede definir cuál es la clave actual. Para ello, marque la casilla de verificación <span class="guibutton"><strong>Actual</strong></span> ubicada junto a la clave principal. Desde ese momento, la clave actual se utilizará para cifrar.</p></li>
-<li class="step"><p role="presentation">Para visualizar detalles de una clave, pulse el icono <span class="guibutton"><strong>Detalles</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Detalles de la clave</strong></span>. Para ver las firmas de la clave, pulse en <span class="guibutton"><strong>Firmas</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addkey">
-<p class="title">Cómo añadir una nueva clave PGP en la ventana <span class="guilabel"><strong>Sus claves</strong></span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Añadir clave de usuario</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> que hay junto a <span class="guibutton"><strong>Su lista de claves</strong></span>. Se abre la ventana <span class="guilabel"><strong>Adición de claves</strong></span>.</p></li>
 <li class="step">
-<p role="presentation">Tiene las siguientes opciones: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-<p role="presentation">Para añadir una clave privada, pulse <span class="guibutton"><strong>Subir clave privada</strong></span>. Seleccione un fichero que contenga una clave privada. Se abre la ventana <span class="guilabel"><strong>Subir claves privadas</strong></span>.</p>
-<p role="presentation">Para subir una nueva clave, introduzca su contraseña de seguridad de <span class="phrase">Guard</span>. Indique una nueva contraseña para la nueva clave.</p>
-</li>
-<li class="listitem"><p role="presentation">Para añadir una clave pública, pulse <span class="guibutton"><strong>Subir solo clave pública</strong></span>. Seleccione un fichero que contenga una clave pública.</p></li>
-<li class="listitem">
-<p role="presentation">Para crear un nuevo par de claves, pulse <span class="guibutton"><strong>Crear claves nuevas</strong></span>. Se abre la ventana <span class="phrase"><span class="guilabel"><strong>Crear claves de seguridad de Guard</strong></span></span>.</p>
-<p role="presentation">Introduzca una contraseña para la nueva clave. Confirme la contraseña.</p>
-<p role="presentation">La nueva clave consta de una clave maestra y una subclave acorde a ella.</p>
-</li>
-</ul></p>
-<p role="presentation">La nueva clave se insertará al principio de lista de claves, y se convertirá en la clave actual.</p>
+<p role="presentation">Para mostrar los detalles de una clave, pulse el icono <span class="guibutton"><strong>Gestionar claves</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> que hay junto a una clave maestra. Se abre la ventana <span class="guilabel"><strong>Detalles de la clave</strong></span>.</p>
+<p role="presentation">Para ver las firmas de las claves, pulse en <span class="guibutton"><strong>Firmas</strong></span>.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addaccount">
-<p class="title">Cómo añadir un ID de usuario adicional en la ventana <span class="guilabel"><strong>Sus claves</strong></span>:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.manage">
+<p class="title">Cómo gestionar sus claves PGP existentes:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Editar identificadores</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addaccount.edit"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Añadir identificador de usuario</strong></span>.</p></li>
 <li class="step">
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Pulse en <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>Sus claves PGP</strong></span> en el panel derecho.</p>
+<p role="presentation">Se mostrarán sus claves PGP.</p>
+</li>
+<li class="step"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Gestionar claves</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> que hay junto a una clave maestra. Utilice las siguientes funciones. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Si su lista de claves contiene más de una clave, puede definir la clave actual. Para hacerlo, pulse en <span class="guibutton"><strong>Marcar actual</strong></span>. A partir de ahora, se utilizará la clave actual para el cifrado.</p></li>
+<li class="listitem">
+<p role="presentation">Si desea utilizar la clave para otra cuenta de correo, pulse en <span class="guibutton"><strong>Editar IDs</strong></span>. Se abre la ventana <span class="guilabel"><strong>Añadir ID de usuario</strong></span>.</p>
 <p role="presentation">Introduzca un nombre para el ID de usuario. Introduzca la dirección de correo que quiera usar para esta clave.</p>
 <p role="presentation">Introduzca su contraseña para esta clave.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.download">
-<p class="title">Cómo descargar una clave en la ventana <span class="guilabel"><strong>Sus claves</strong></span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Descargar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> que hay junto a una clave.</p></li>
-<li class="step">
+<li class="listitem">
+<p role="presentation">Para descargar una clave privada, pulse en <span class="guibutton"><strong>Descargar</strong></span>.</p>
 <p role="presentation">Determina si solo se descarga su clave privada, su clave pública o ambas.</p>
 <p role="presentation"><span class="phrase"><strong>Precaución:</strong></span> Su clave privada se descargará cifrada. De todas formas, no debería descargar su clave privada en un sistema accesible públicamente.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.delete">
-<p class="title">Cómo borrar una clave en la ventana <span class="guilabel"><strong>Sus claves</strong></span>:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Advertencia:</strong></span> Si borra una clave privada, ya no podrá descifrar objetos que se hayan cifrado con dicha clave. Si no está seguro no debería borrarla sino revocarla. Una clave revocada no se puede usar para cifrar, pero aún se puede usar para descifrar objetos que se hubiesen cifrado con ella.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Borrar clave privada</strong></span>.</p></li>
-<li class="step"><p role="presentation">Tiene las siguientes opciones:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Para revocar o borrar una clave privada, pulse en <span class="guibutton"><strong>Borrar</strong></span>. Se abre la ventana <span class="guilabel"><strong>Borrar clave privada</strong></span>. Notas: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">si revoca una clave, ya no se utilizará, pero aún puede descifrar objetos que hayan sido cifrados con esta clave. Por este motivo, revocar una clave es mejor que borrarla.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si borra una clave privada, ya no podrá descifrar objetos que hayan sido cifrados con esta clave.</p></li>
+</ul> <p role="presentation">Tiene las siguientes opciones:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
-<p role="presentation">Para revocar una clave privada, pulse <span class="guibutton"><strong>Revocar</strong></span>.</p>
-<p role="presentation">Si revoca una clave, ya no la podrá usar pero aún podrá descifrar objetos cifrados con dicha clave. Por ello, revocar una clave es mejor que borrarla.</p>
-<p role="presentation">Introduzca la contraseña de la clave privada. Si se le pide, seleccione un motivo para la revocación.</p>
-<p role="presentation">Pulse <span class="guibutton"><strong>Revocar</strong></span>.</p>
+<p role="presentation">Para revocar una clave privada pulse en <span class="guibutton"><strong>Revocar</strong></span>.</p>
+<p role="presentation">Introduzca la contraseña de la clave privada. Si es necesario, seleccione un motivo para revocar la clave.</p>
+<p role="presentation">Pulse en <span class="guibutton"><strong>Revocar</strong></span>.</p>
+<p role="presentation">También puede pulsar en <span class="guibutton"><strong>Revocar</strong></span> en el menú.</p>
 </li>
 <li class="listitem">
-<p role="presentation">Para borrar una clave privada, pulse <span class="guibutton"><strong>Borrar</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si borra una clave privada, ya no podrá descifrar objetos cifrados con dicha clave.</p>
-<p role="presentation">Introduzca la contraseña de la clave privada.</p>
-<p role="presentation">Pulse el botón <span class="guibutton"><strong>Borrar</strong></span>.</p>
+<p role="presentation">Para borrar una clave privada, pulse en <span class="guibutton"><strong>Borrar</strong></span>.</p>
+<p role="presentation">Introduzca la contraseña de la clave privada .</p>
+<p role="presentation">Pulse en el botón <span class="guibutton"><strong>Borrar</strong></span>.</p>
 </li>
-</ul>Al borrar una clave maestra, la subclave correspondiente también se borrará.</p></li>
+</ul> Al borrar una clave maestra, la subclave correspondiente también se borrará.</p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yourpgpkeys">
@@ -156,7 +128,7 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves públicas</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves PGP de destinatarios</a>
             </p>
 <p role="presentation" class="cap-smime">
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a>
@@ -167,7 +139,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yourpgpkeys">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yourpgpkeys">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html b/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
index 1ef780cec..20f097a71 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestión de claves">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Gestión de claves PGP propias">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gestión de claves públicas">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gestión de claves PGP de destinatarios">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Gestionar claves S/MIME de destinatarios">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,46 +34,27 @@
 <h2 class="sr-only">Gestión de claves</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yoursmimekeys">
 <div class="titlepage"><div><div><h3 class="title">Gestión de claves propias S/MIME</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.6.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">En la página de <span class="phrase"><span class="guilabel"><strong>Ajustes de seguridad de Guard</strong></span></span>, puede: </p>
+<a class="indexterm" name="id-1.14.13.9.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">añadir nuevas claves S/MIME</p>
 <p role="presentation">Si posee varias claves, puede decidir cuál de ellas debería ser la actual. La clave actual se usa para cifrar datos.</p>
 </li>
 <li class="listitem"><p role="presentation">mostrar claves propias S/MIME, mostrar detalles</p></li>
-<li class="listitem"><p role="presentation">descargar claves</p></li>
-<li class="listitem"><p role="presentation">borrar claves</p></li>
+<li class="listitem"><p role="presentation">gestionar claves S/MIME propias: actualizar, editar ID, revocar, descargar, eliminar</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys">
-<p class="title">Cómo utilizar las funciones de gestión de claves S/MIME:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.add">
+<p class="title">Cómo agregar una nueva clave S/MIME:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
-<p role="presentation">También se puede pulsar en <span class="guibutton"><strong>Configuración</strong></span> en el Lanzador de aplicaciones.</p>
-<p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configuración</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo.</p>
-<p role="presentation">Se mostrará la página de <span class="phrase"><span class="guilabel"><strong>ajustes de seguridad de Guard</strong></span></span>.</p>
-</li>
-<li class="step">
+<p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>S/MIME</strong></span> en el panel derecho.</p>
 <p role="presentation">Marque <span class="guibutton"><strong>Activar S/MIME</strong></span>.</p>
-<p role="presentation">Marque <span class="guibutton"><strong>Mostrar ajustes avanzados</strong></span>.</p>
-<p role="presentation">Se mostrarán las funciones de gestión de claves.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.addkey">
-<p class="title">Cómo agregar una nueva clave S/MIME:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Pulse en <span class="guibutton"><strong>Sus claves</strong></span> debajo de <span class="guibutton"><strong>Claves</strong></span>. Se abre la ventana <span class="guilabel"><strong>Seleccione el tipo de clave a modificar</strong></span>.</p>
-<p role="presentation">Seleccione <span class="guibutton"><strong>S/MIME</strong></span>. Se are la ventana <span class="guilabel"><strong>Sus Certificados</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Añadir</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> que hay junto a <span class="guilabel"><strong>Su lista de claves</strong></span>. Se abre la ventana <span class="guilabel"><strong>Subir claves S/MIME</strong></span>.</p></li>
 <li class="step">
+<p role="presentation">Pulse en <span class="guibutton"><strong>Subir certificado privado</strong></span>. Se abre la ventana <span class="guilabel"><strong>Subir claves S/MIME</strong></span>.</p>
 <p role="presentation">Introduzca las siguientes contraseñas: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Para subir una nueva clave, introduzca su contraseña de seguridad de <span class="phrase">Guard</span>. Indique una nueva contraseña para la nueva clave.</p></li>
+<li class="listitem"><p role="presentation">Su contraseña de seguridad de <span class="phrase">Guard</span> para subir la nueva clave.</p></li>
 <li class="listitem">
 <p role="presentation">Una nueva contraseña para cifrar los correos.</p>
 <p role="presentation">Confirme la nueva contraseña.</p>
@@ -85,48 +66,51 @@
 </ol></div>
 </div>
 <div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.display">
-<p class="title">Cómo mostrar sus propias claves S/MIME o convertir una clave S/MIME en la actual:</p>
+<p class="title">Cómo ver sus propias claves S/MIME:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Pulse en <span class="guibutton"><strong>Sus claves</strong></span> debajo de <span class="guilabel"><strong>Claves</strong></span>. Se abre la ventana <span class="guilabel"><strong>Seleccione el tipo de claves a modificar</strong></span>.</p>
-<p role="presentation">Seleccione <span class="guibutton"><strong>S/MIME</strong></span>.</p>
-<p role="presentation">Se abre la ventana <span class="guilabel"><strong>Sus Certificados</strong></span>. Se mostrarán sus claves S/MIME.</p>
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>S/MIME</strong></span> en el panel derecho.</p>
+<p role="presentation">Marque <span class="guibutton"><strong>Activar S/MIME</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Para mostrar los detalles de una clave,  pulse el icono <span class="guibutton"><strong>Gestionar claves</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Detalles de la clave</strong></span>.</p>
+<p role="presentation">Para ver las firmas de las claves, pulse en <span class="guibutton"><strong>Firmas</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Si su lista de claves contiene más de una, puede definir cuál es la clave actual. Para ello, marque la casilla de verificación <span class="guibutton"><strong>Actual</strong></span> ubicada junto a la clave principal. Desde ese momento, la clave actual se utilizará para cifrar.</p></li>
-<li class="step"><p role="presentation">Para visualizar detalles de una clave, pulse el icono <span class="guibutton"><strong>Detalles</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Detalles de la clave</strong></span>. Para ver las firmas de la clave, pulse en <span class="guibutton"><strong>Firmas</strong></span>.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.download">
-<p class="title">Cómo descargar una clave en la ventana <span class="guilabel"><strong>Sus claves</strong></span>:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.manage">
+<p class="title">Cómo gestionar sus claves S/MIME existentes:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Descargar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> que hay junto a una clave.</p></li>
 <li class="step">
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>S/MIME</strong></span> en el panel derecho.</p>
+<p role="presentation">Marque <span class="guibutton"><strong>Activar S/MIME</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Gestionar claves</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> que hay junto a una clave. Utilice las siguientes funciones. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Si su lista de claves contiene más de una clave, puede definir la clave actual. Para hacerlo, pulse en <span class="guibutton"><strong>Marcar actual</strong></span>. A partir de ahora, se utilizará la clave actual para el cifrado.</p></li>
+<li class="listitem">
+<p role="presentation">Para descargar una clave privada, pulse en <span class="guibutton"><strong>Descargar</strong></span>.</p>
 <p role="presentation">Determina si solo se descarga su clave privada, su clave pública o ambas.</p>
 <p role="presentation"><span class="phrase"><strong>Precaución:</strong></span> Su clave privada se descargará cifrada. De todas formas, no debería descargar su clave privada en un sistema accesible públicamente.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.delete">
-<p class="title">Cómo borrar una clave en la ventana <span class="guilabel"><strong>Sus claves</strong></span>:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Advertencia:</strong></span> Si borra una clave privada, ya no podrá descifrar objetos que se hayan cifrado con dicha clave. Si no está seguro no debería borrarla sino revocarla. Una clave revocada no se puede usar para cifrar, pero aún se puede usar para descifrar objetos que se hubiesen cifrado con ella.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Pulse el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Borrar clave privada</strong></span>.</p></li>
-<li class="step"><p role="presentation">Tiene las siguientes opciones: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Para revocar o borrar una clave privada, pulse en <span class="guibutton"><strong>Borrar</strong></span>. Se abre la ventana <span class="guilabel"><strong>Borrar clave privada</strong></span>. Notas: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">si revoca una clave, ya no se utilizará más. Pero aún puede descifrar objetos que se han cifrado con dicha clave. Por esta razón, es mejor revocar una clave es mejor que eliminarla.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si borra una clave privada, ya no podrá descifrar objetos que se hayan cifrado con dicha clave.</p></li>
+</ul> <p role="presentation">Tiene las siguientes opciones:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">Para revocar una clave privada, pulse en <span class="guibutton"><strong>Revocar</strong></span>.</p>
-<p role="presentation">si revoca una clave, ya no se utilizará más. Pero aún puede descifrar objetos que se han cifrado con dicha clave. Por esta razón, es mejor revocar una clave es mejor que eliminarla.</p>
 <p role="presentation">Introduzca la contraseña de la clave privada. Si es necesario, seleccione un motivo para revocar la clave.</p>
 <p role="presentation">Pulse <span class="guibutton"><strong>Revocar</strong></span>.</p>
+<p role="presentation">También puede pulsar en <span class="guibutton"><strong>Revocar</strong></span> en el menú.</p>
 </li>
 <li class="listitem">
 <p role="presentation">Para borrar una clave privada, pulse <span class="guibutton"><strong>Borrar</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si borra una clave privada, ya no podrá descifrar objetos que se hayan cifrado con dicha clave.</p>
 <p role="presentation">Introduzca su contraseña para la clave privada.</p>
 <p role="presentation">Pulse el botón <span class="guibutton"><strong>Borrar</strong></span>.</p>
 </li>
 </ul></p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yoursmimekeys">
@@ -137,7 +121,7 @@
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves públicas</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves PGP de destinatarios</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
@@ -145,7 +129,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yoursmimekeys">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yoursmimekeys">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.guard.password.change.html b/help/l10n/es_ES/ox.appsuite.user.sect.guard.password.change.html
new file mode 100644
index 000000000..7ae9f9e68
--- /dev/null
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.guard.password.change.html
@@ -0,0 +1,75 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Cambiar la contraseña</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Gestión de contraseñas">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Gestión de contraseñas">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.reset.html" title="restablecer la contraseña">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.reset.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Cifrado de datos con <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Gestión de contraseñas</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.change">
+<div class="titlepage"><div><div><h3 class="title">Cambiar la contraseña</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.6.2"></a><a class="indexterm" name="id-1.14.12.6.3"></a><p role="presentation" class="cap-smime">Dependiendo de la configuración, también puede utilizar S/MIME para el cifrado en lugar de PGP. Para PGP y S/MIME se utilizarán contraseñas independientes.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.change">
+<p class="title">Cómo cambiar la contraseña de <span class="phrase">Guard</span>:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.change"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>Gestión de contraseñas (PGP)</strong></span><span class="cap-smime"> o en <span class="guibutton"><strong>Gestión de contraseñas (S/MIME)</strong></span></span> en el panel derecho.</p>
+</li>
+<li class="step">
+<p role="presentation">En el campo <span class="guibutton"><strong>Contraseña antigua</strong></span>, introduzca la contraseña que utilizó anteriormente para cifrar sus datos.</p>
+<p role="presentation">En el campo <span class="guibutton"><strong>Contraseña nueva</strong></span>, introduzca la contraseña que quiera usar para cifrar sus datos a partir de ahora.</p>
+<p role="presentation">Introduzca la nueva contraseña otra vez en el campo <span class="guibutton"><strong>Confirmar nueva contraseña</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Pulse <span class="guibutton"><strong>Cambiar contraseña</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.change">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">restablecer la contraseña</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Eliminación de la función de restablecimiento de contraseña</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.change">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.guard.password.deleterecovery.html b/help/l10n/es_ES/ox.appsuite.user.sect.guard.password.deleterecovery.html
new file mode 100644
index 000000000..2877ca7cb
--- /dev/null
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.guard.password.deleterecovery.html
@@ -0,0 +1,74 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Eliminación de la función de restablecimiento de contraseña</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Gestión de contraseñas">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.reset.html" title="restablecer la contraseña">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Gestión de claves">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.reset.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Cifrado de datos con <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Gestión de contraseñas</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.deleterecovery">
+<div class="titlepage"><div><div><h3 class="title">Eliminación de la función de restablecimiento de contraseña</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.8.2"></a><p id="ox.appsuite.user.concept.guard.password.deleterecovery">Para poder restablecer su contraseña si es necesario, su contraseña debe guardarse en el servidor en una versión cifrada. Si no desea que su contraseña se guarde en el servidor, puede borrar la recuperación de contraseña.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
+<p class="title">Cómo eliminar la función de restablecimiento de contraseña:</p>
+<div class="taskprerequisites">
+          <p><span class="phrase"><strong>Advertencia:</strong></span> Si elimina la función de restablecimiento de contraseña ya no podrá restablecer su contraseña. Si más adelante olvida su contraseña ya no tendrá la posibilidad de descifrar sus datos cifrados.</p>
+        </div>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.remove"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Pulse  <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>Avanzado</strong></span> en el panel derecho.</p>
+</li>
+<li class="step"><p role="presentation">Debajo de <span class="guibutton"><strong>Opciones de restablecimiento</strong></span>, pulse en <span class="guibutton"><strong>Borrar recuperación de contraseña</strong></span>. Se abre la ventana <span class="guilabel"><strong>Borrar recuperación</strong></span>.</p></li>
+<li class="step"><p role="presentation">Pulse el botón <span class="guibutton"><strong>Borrar</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.deleterecovery">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Cambiar la contraseña</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">restablecer la contraseña</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.deleterecovery">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.guard.password.html b/help/l10n/es_ES/ox.appsuite.user.sect.guard.password.html
index 65400e46a..868287544 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.guard.password.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.guard.password.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Cifrado de datos con Guard">
 <link rel="prev" href="ox.appsuite.user.sect.guard.logout.html" title="Cierre de sesión de Guard">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Gestión de claves">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.change.html" title="Cambiar la contraseña">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.logout.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.change.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,102 +33,24 @@
 </h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.password">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Gestión de contraseñas</h2></div></div></div>
-<a class="indexterm" name="id-1.14.12.2"></a><a class="indexterm" name="id-1.14.12.3"></a><a class="indexterm" name="id-1.14.12.4"></a><a class="indexterm" name="id-1.14.12.5"></a><a class="indexterm" name="id-1.14.12.6"></a><p id="ox.appsuite.user.concept.guard.password">Existen las siguientes opciones: </p>
+<a class="indexterm" name="id-1.14.12.2"></a><p id="ox.appsuite.user.concept.guard.password">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Cambiar la contraseña de seguridad de <span class="phrase">Guard</span></p></li>
-<li class="listitem"><p role="presentation">Cuando ha perdido su contraseña de seguridad de <span class="phrase">Guard</span>, puede solicitar una contraseña de seguridad temporal de <span class="phrase">Guard</span> restableciendo la contraseña de seguridad de <span class="phrase">Guard</span>.</p></li>
-<li class="listitem"><p role="presentation">Definición de una dirección de correo para restablecer la contraseña.</p></li>
-<li class="listitem"><p role="presentation">Para poder restablecer su contraseña si es necesario, su contraseña debe guardarse en el servidor en una versión cifrada. Si no desea que su contraseña se guarde en el servidor, puede eliminar la recuperación de contraseña.</p></li>
-<li class="listitem cap-smime" id="id-1.14.12.7.1.5"><p role="presentation">Dependiendo de la configuración, también puede usar S/MIME para el cifrado en lugar de PGP. En este caso, se utilizarán contraseñas separadas para PGP y S/MIME.</p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Cambiar la contraseña</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">restablecer la contraseña</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Eliminación de la función de restablecimiento de contraseña</a></p></li>
 </ul>
-<p> Nota: Según la configuración, es posible que algunas de esas funciones no estén disponibles.</p>
-<div class="task help-hide-inline" id="ox.appsuite.user.task.guard.password">
-<p class="title">Cómo abrir las funciones de gestión de contraseñas:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
-<p role="presentation">También se puede pulsar en <span class="guibutton"><strong>Configuración</strong></span> en el Lanzador de aplicaciones.</p>
-<p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configuración</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo.</p>
-<p role="presentation">Se mostrará la página de <span class="phrase"><span class="guilabel"><strong>ajustes de seguridad de Guard</strong></span></span>.</p>
-<p role="presentation">Se mostrarán las funciones de gestión de contraseñas.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.change">
-<p class="title">Cómo cambiar la contraseña de <span class="phrase">Guard</span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Pulse <span class="guibutton"><strong>Cambiar contraseña</strong></span>.</p>
-<p role="presentation" class="cap-smime">Dependiendo de la configuración, se abrirá la ventana <span class="guilabel"><strong>Seleccione el tipo de claves a modificar</strong></span>. Según el tipo de cifrado para el que desee restablecer la contraseña, seleccione <span class="guibutton"><strong>PGP</strong></span> o <span class="guibutton"><strong>S/MIME</strong></span>. Se abre la ventana <span class="guilabel"><strong>Restablecer contraseña</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">En el campo <span class="phrase"><span class="guibutton"><strong>Introduzca la contraseña de seguridad actual de Guard</strong></span></span>, indique la contraseña que haya usado hasta ahora para cifrar sus datos.</p>
-<p role="presentation">En el campo <span class="phrase"><span class="guibutton"><strong>Introduzca nueva contraseña de seguridad de Guard</strong></span></span>, indique la contraseña que quiere usar para cifrar sus datos en adelante.</p>
-<p role="presentation">Confirme la contraseña en el campo <span class="phrase"><span class="guibutton"><strong>Verifique nueva contraseña de seguridad de Guard</strong></span></span> introduciéndola nuevamente.</p>
-</li>
-<li class="step"><p role="presentation">Pulse <span class="guibutton"><strong>Cambiar</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.reset">
-<p class="title">Cómo restablecer la contraseña de <span class="phrase">Guard</span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Pulse <span class="guibutton"><strong>Restablecer contraseña</strong></span>.</p>
-<p role="presentation" class="cap-smime">Dependiendo de la configuración, se abrirá la ventana <span class="guilabel"><strong>Seleccione el tipo de claves a modificar</strong></span>. Según el tipo de cifrado para el que desee restablecer la contraseña, seleccione <span class="guibutton"><strong>PGP</strong></span> o <span class="guibutton"><strong>S/MIME</strong></span>. Se abre la ventana <span class="guilabel"><strong>Restablecer contraseña</strong></span>.</p>
-<p role="presentation">Pulse <span class="guibutton"><strong>Restablecer</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Se le enviará una nueva contraseña a su dirección de correo secundaria.</p>
-<p role="presentation">Si no ha indicado una dirección de correo secundaria, la nueva contraseña se enviará a su dirección principal.</p>
-<p role="presentation">Esta nueva contraseña ahora es su contraseña de seguridad de <span class="phrase">Guard</span> actual. Debería <a class="link" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.task.guard.settings">cambiarla</a> inmediatamente.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.secondarymail">
-<p class="title">Cómo cambiar su dirección de correo secundaria para el restablecimiento de contraseña.</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Pulse en <span class="guibutton"><strong>Configurar dirección de correo para restablecer</strong></span>.</p>
-<p role="presentation" class="cap-smime">Dependiendo de la configuración, se abre la ventana <span class="guilabel"><strong>Seleccione el tipo de claves a modificar</strong></span>. Según el tipo de cifrado para el que desee restablecer la contraseña, seleccione <span class="guibutton"><strong>PGP</strong></span> o <span class="guibutton"><strong>S/MIME</strong></span>. Se abre la ventana <span class="guilabel"><strong>Dirección de correo secundaria</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">En el campo <span class="phrase"><span class="guibutton"><strong>Introduzca la contraseña de seguridad actual de Guard</strong></span></span>, indique la contraseña que haya usado hasta ahora para cifrar sus datos.</p>
-<p role="presentation">En el campo <span class="guibutton"><strong>Introduzca nuevo correo secundario</strong></span>, introduzca la dirección de correo que se usará para recibir una contraseña provisional para el restablecimiento de su contraseña de seguridad de <span class="phrase">Guard</span>.</p>
-<p role="presentation">Vuelva a introducir la dirección de correo en <span class="guibutton"><strong>Verifique dirección de correo</strong></span>.</p>
-<p role="presentation">Pulse en <span class="guibutton"><strong>Cambiar dirección de correo</strong></span>.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
-<p class="title">Cómo eliminar la función de restablecimiento de contraseña:</p>
-<div class="taskprerequisites">
-        <p><span class="phrase"><strong>Advertencia:</strong></span> Si elimina la función de restablecimiento de contraseña ya no podrá restablecer su contraseña. Si más adelante olvida su contraseña ya no tendrá la posibilidad de descifrar sus datos cifrados.</p>
-      </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Marque <span class="guibutton"><strong>Mostrar ajustes avanzados</strong></span>.</p>
-<p role="presentation">Pulse en <span class="guibutton"><strong>Borrar recuperación de contraseña</strong></span>. Se abre la ventana <span class="guilabel"><strong>Borrar recuperación</strong></span>.</p>
-</li>
-<li class="step"><p role="presentation">Pulse el botón <span class="guibutton"><strong>Borrar</strong></span>.</p></li>
-</ol></div>
-</div>
+<p> Nota: Dependiendo de la configuración, es posible que algunas de esas funciones no estén disponibles.</p>
 <p id="ox.appsuite.user.related.guard.password">
       </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a>
-          </p>
-<p role="presentation" class="cap-smime">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a>
-          </p>
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves públicas</a>
-          </p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Configuración de <span class="phrase">Guard</span></a>
+          </p></li>
+</ul>
 <p>
     </p>
 <p id="ox.appsuite.user.parent.guard.password">Tema superior: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Cifrado de datos con <span class="phrase">Guard</span></i></a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.guard.password.reset.html b/help/l10n/es_ES/ox.appsuite.user.sect.guard.password.reset.html
new file mode 100644
index 000000000..6433d9c66
--- /dev/null
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.guard.password.reset.html
@@ -0,0 +1,91 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>restablecer la contraseña</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Gestión de contraseñas">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.change.html" title="Cambiar la contraseña">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Eliminación de la función de restablecimiento de contraseña">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.change.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Cifrado de datos con <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Gestión de contraseñas</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.reset">
+<div class="titlepage"><div><div><h3 class="title">restablecer la contraseña</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.7.2"></a><a class="indexterm" name="id-1.14.12.7.3"></a><p id="ox.appsuite.user.concept.guard.password.reset">Existen las siguientes opciones: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Si pierde su contraseña de <span class="phrase">Guard</span>, puede solicitar una contraseña temporal de <span class="phrase">Guard</span> restableciendo la contraseña de <span class="phrase">Guard</span>.</p></li>
+<li class="listitem"><p role="presentation">Puede definir una dirección de correo para restablecer la contraseña.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.password.reset">
+<p class="title">Cómo restablecer la contraseña de <span class="phrase">Guard</span>:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Pulse el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.reset"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Pulse en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Pulse en <span class="guibutton"><strong>Gestión de contraseñas (PGP)</strong></span><span class="cap-smime"> o en <span class="guibutton"><strong>Gestión de contraseñas (S/MIME)</strong></span></span> en el panel derecho.</p>
+</li>
+<li class="step">
+<p role="presentation">Para configurar una dirección de correo secundaria a la que se envíe una contraseña temporal, pulse en <span class="guibutton"><strong>Establecer dirección de correo para restablecimiento</strong></span>. Se abre la ventana <span class="guilabel"><strong>Dirección de correo secundaria</strong></span>.</p>
+<p role="presentation">Introduzca su contraseña actual. Introduzca la dirección de correo que desea utilizar para restablecer la contraseña.</p>
+</li>
+<li class="step">
+<p role="presentation">Pulse en <span class="guibutton"><strong>Restablecer contraseña</strong></span>. Se abre la ventana <span class="guilabel"><strong>Restablecer contraseña</strong></span>.</p>
+<p role="presentation">Pulse <span class="guibutton"><strong>Restablecer</strong></span>.</p>
+</li>
+</ol></div>
+<div class="taskrelated">
+          <p>Resultado: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">Se le enviará una nueva contraseña a su dirección de correo secundaria.</p>
+<p role="presentation">Si no ha indicado una dirección de correo secundaria, la nueva contraseña se enviará a su dirección principal.</p>
+</li>
+<li class="listitem"><p role="presentation">Esta nueva contraseña ahora es su contraseña de seguridad actual de <span class="phrase">Guard</span>. Debería cambiarla inmediatamente.</p></li>
+</ul>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.reset">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Cambiar la contraseña</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Eliminación de la función de restablecimiento de contraseña</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.reset">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.guard.settings.html b/help/l10n/es_ES/ox.appsuite.user.sect.guard.settings.html
index 988b33948..d07c4f6bb 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.guard.settings.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.guard.settings.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Cifrado de datos con Guard">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gestión de claves públicas">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Gestionar claves S/MIME de destinatarios">
 <link rel="next" href="ox.appsuite.user.index.html" title="Índice">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.index.html">Siguiente</a></li>
@@ -44,84 +44,170 @@
 </li>
 <li class="step"><p role="presentation">Pulse <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>Se mostrará la página de <span class="phrase"><span class="guilabel"><strong>ajustes de seguridad de Guard</strong></span></span>.</p>
-      </div>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings">Están disponibles los siguientes ajustes:</p>
+<p id="ox.appsuite.user.reference.guard.settings">Dependiendo de la configuración, están disponibles los siguientes ajustes:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.default">Configuración predeterminada de <span class="phrase">Guard</span></a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.pgppasswords">Gestión de contraseñas (PGP)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.smimepasswords">Gestión de contraseñas (S/MIME)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yourpgpkeys">Sus claves PGP</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientpgpkeys">Claves PGP del destinatario</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yoursmime">S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientsmime">Destinatarios S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.advanced">Avanzados</a></p></li>
+</ul>
+<p>Vea también: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Búsqueda de configuraciones</a></p>
 <p id="ox.appsuite.user.reference.guard.settings.default"></p>
-<h3 class="title">Ajustes predeterminados</h3>
+<h3 class="title">Configuración predeterminada de <span class="phrase">Guard</span>
+</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.encrypt"><b>De manera predeterminada, enviar cifrado al redactar correo. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>Determina si un correo nuevo se cifra de manera predeterminada.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.sign"><b>De manera predeterminada, añadir firma a correos salientes. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Determina si un correo nuevo se cifra de manera predeterminada.</p></li>
-<li class="listitem cap-smime" id="id-1.14.14.7.2.1.3">
-<p id="ox.appsuite.user.task.guard.settings.default.smime"><b>Usar S/MIME de manera predeterminada para firma y cifrado. </b><a class="indexterm" name="id-1.14.14.7.2.1.3.1.2"></a>
+<li class="listitem">
+<p id="ox.appsuite.user.reference.guard.settings.default.create"><b>Opciones de redacción. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>
                 </p>
-<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p role="presentation">Determina si se utiliza S/MIME para el cifrado y firma de forma predeterminada. </p></li></ul>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.encrypt"><b>De manera predeterminada, enviar cifrado al redactar correo. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.1.1.2"></a>Determina si un correo nuevo se cifra de manera predeterminada.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.sign"><b>De manera predeterminada, añadir firma a correos salientes. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.2.1.2"></a>Determina si un correo nuevo se cifra de manera predeterminada.</p></li>
+<li class="listitem cap-smime" id="id-1.14.14.7.2.1.1.1.3.1.3">
+<p id="ox.appsuite.user.task.guard.settings.default.create.smime"><b>Usar S/MIME de manera predeterminada para firma y cifrado. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.3.1.2"></a>
+                        </p>
+<ul class="itemizedlist" style="list-style-type: square; "><li class="listitem"><p role="presentation">Determina si se utiliza S/MIME para el cifrado y firma de forma predeterminada.</p></li></ul>
 <p>
-              </p>
+                      </p>
 </li>
-<li class="listitem">
-<p id="ox.appsuite.user.task.guard.settings.default.inline"><b>De manera predeterminada, usar PGP incrustado en correos nuevos. </b><a class="indexterm" name="id-1.14.14.7.2.1.4.1.2"></a>Nota: Esta opción solo está disponible si la casilla de verificación <span class="guibutton"><strong>Ajustes avanzados</strong></span> está habilitada. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">Determina si se utiliza PGP/Incrustado para el cifrado de forma predeterminada.</p></li>
-<li class="listitem"><p role="presentation">Use esa configuración solo si el cliente de correo de un destinatario no es compatible con PGP. Sin embargo, con PGP/Incrustado, el destinatario puede descifrar el mensaje.</p></li>
-<li class="listitem"><p role="presentation">Si usa esta configuración, no podrá enviar correos en formato html.</p></li>
 </ul>
+<p>
+              </p>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Recordar contraseña de manera predeterminada. </b><a class="indexterm" name="id-1.14.14.7.2.1.5.1.2"></a>Determina el plazo predeterminado de <span class="phrase">Guard</span> para recordar la contraseña. Puede cambiar este valor predeterminado cuando se le pida su contraseña de <span class="phrase">Guard</span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Recordar contraseña de manera predeterminada. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Determina el plazo predeterminado de <span class="phrase">Guard</span> para recordar la contraseña. Puede cambiar este valor predeterminado cuando se le pida su contraseña de <span class="phrase">Guard</span>.</p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.pgppasswords"></p>
+<h3 class="title">Gestión de contraseñas (PGP)</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funciones para cambiar o restablecer la contraseña PGP.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a></p></li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.reference.guard.settings.password"></p>
-<h3 class="title">Gestión de contraseñas</h3>
+<div id="ox.appsuite.user.reference.guard.settings.smimepasswords" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.smimepasswords"></p>
+<h3 class="title">Gestión de contraseñas (S/MIME)</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funciones para cambiar o restablecer la contraseña.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funciones para cambiar o restablecer la contraseña S/MIME.</p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a></p></li>
 </ul>
 <p>
       </p>
-<div id="ox.appsuite.user.reference.guard.settings.smime" class="cap-smime">
-<p id="ox.appsuite.user.reference.guard.settings.smime"></p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.yourpgpkeys"></p>
+<h3 class="title">Sus claves PGP</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funciones para gestionar sus claves PGP.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Consulte <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a></p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.recipientpgpkeys"></p>
+<h3 class="title">Claves PGP del destinatario</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funciones para gestionar claves PGP de los destinatarios.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Consulte <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves PGP de destinatarios</a></p></li>
+</ul>
+<p>
+      </p>
+<div id="ox.appsuite.user.reference.guard.settings.yoursmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.yoursmime"></p>
 <h3 class="title">S/MIME</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.smime.enable"><b>Habilitar S/MIME. </b><a class="indexterm" name="id-1.14.14.9.2.1.1.1.2"></a>Determina si puede enviar y recibir correos con cifrado S/MIME.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">Contiene funciones para gestionar el cifrado de tipo S/MIME.</p>
+<p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a></p>
+</li></ul>
 <p>
       </p>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings.extended"></p>
+<div id="ox.appsuite.user.reference.guard.settings.recipientsmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.recipientsmime"></p>
+<h3 class="title">Destinatarios S/MIME</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funciones para mostrar y añadir certificados de destinatarios de tipo S/MIME. </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a></p></li>
+</ul>
+<p>
+      </p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.advanced"></p>
 <h3 class="title">Avanzados</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<p id="ox.appsuite.user.reference.guard.settings.extended.advanced"><b>Ajustes avanzados. </b><a class="indexterm" name="id-1.14.14.10.2.1.1.1.2"></a>Si <span class="guibutton"><strong>Mostrar ajustes avanzados</strong></span> está activado, estarán disponibles los siguientes ajustes y funciones. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
+<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Caché de correo</strong></span></p>
-<p role="presentation">Determina si un correo descifrado se mantiene en la memoria caché del navegador en un formato legible cuando se muestra otro correo o se cambia a otra aplicación de software colaborativo.</p>
-<p role="presentation">Para eliminar el correo descifrado de la caché del navegador, marque <span class="guibutton"><strong>No mantener los correos descifrados.</strong></span>.</p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.email"><b>Mostrar configuraciones avanzadas para redactar correo. </b>
+                </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<a class="indexterm" name="id-1.14.14.14.2.1.1.1.2.1.1.1"></a><p role="presentation">Si esta opción está habilitada, puede utilizar más opciones al enviar correos cifrados.</p>
+<p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Sección <span class="guibutton"><strong>Claves</strong></span></p>
-<p role="presentation">Gestión de las claves propias, públicas o de Autocrypt.</p>
-<p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a></p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.inline"><b>De manera predeterminada, usar PGP incrustado en correos nuevos. </b><a class="indexterm" name="id-1.14.14.14.2.1.2.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Determina si se utiliza PGP/Incrustado para el cifrado de forma predeterminada.</p></li>
+<li class="listitem"><p role="presentation">Use esa configuración solo si el cliente de correo de un destinatario no es compatible con PGP. Sin embargo, con PGP/Incrustado, el destinatario puede descifrar el mensaje.</p></li>
+<li class="listitem"><p role="presentation">Si usa esta configuración, no podrá enviar correos en formato html.</p></li>
+</ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Sección <span class="guibutton"><strong>Autocrypt</strong></span></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.autocrypt"><b>Configuración de Autocrypt. </b><a class="indexterm" name="id-1.14.14.14.2.1.3.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
 <p role="presentation">Configura el uso de Autocrypt en correos entrantes. Le permite transferir claves de Autocrypt a otros clientes.</p>
 <p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">Cifrado de conversaciones de correo con Autocrypt</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Al enviar correos cifrados hay opciones adicionales.</p>
-<p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.cache"><b>Caché de correo. </b><a class="indexterm" name="id-1.14.14.14.2.1.4.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation">Determina si un correo descifrado se mantiene en la memoria caché del navegador en un formato legible cuando se muestra otro correo o se cambia a otra aplicación de software colaborativo.</p>
+<p role="presentation">Para eliminar el correo descifrado de la caché del navegador, marque <span class="guibutton"><strong>No mantener los correos descifrados.</strong></span>.</p>
+</li></ul>
+<p>
+              </p>
 </li>
-</ul>
+<li class="listitem">
+<p id="ox.appsuite.user.task.guard.settings.advanced.reset"><b>Opciones de reinicio. </b><a class="indexterm" name="id-1.14.14.14.2.1.5.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation"><span class="guibutton"><strong>Borrar recuperación de contraseña</strong></span>. Borra la función de recuperación de una contraseña perdida.</p>
+<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si elimina la función de restablecimiento de contraseña ya no podrá restablecer su contraseña. Si más adelante olvida su contraseña ya no tendrá la posibilidad de descifrar sus datos cifrados.</p>
+<p role="presentation">Consulte <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Eliminación de la función de restablecimiento de contraseña</a></p>
 </li></ul>
+<p>
+              </p>
+</li>
+</ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.guard.settings">Tema superior: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Cifrado de datos con <span class="phrase">Guard</span></i></a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.settings.commonsettings.html b/help/l10n/es_ES/ox.appsuite.user.sect.settings.commonsettings.html
index a9a68b9b4..21750a881 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.settings.commonsettings.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.settings.commonsettings.html
@@ -165,9 +165,9 @@
               </p>
 </li>
 <li class="listitem cap-deputy" id="id-1.4.6.11.2.1.3">
-<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Gestión de representantes. </b>
+<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Gestionar representantes. </b>
                 </p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestionar representantes</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestionar representantes</a></p></li></ul>
 <p>
               </p>
 </li>
@@ -193,7 +193,7 @@
             <a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.settings.countdown.html b/help/l10n/es_ES/ox.appsuite.user.sect.settings.countdown.html
index 5073fcd66..17b1a3861 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.settings.countdown.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.settings.countdown.html
@@ -1,13 +1,13 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Uso de cuentas atrás para Citas</title>
+<title>Uso de cuentas atrás para citas</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Configuración personalizada">
 <link rel="prev" href="ox.appsuite.user.sect.settings.notifications.html" title="Personalización de las notificaciones">
-<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Usar el área de notificación">
+<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="usar el área de notificación">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Configuración personalizada</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.countdown">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Uso de cuentas atrás para Citas</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Uso de cuentas atrás para citas</h2></div></div></div>
 <a class="indexterm" name="id-1.4.8.2"></a><a class="indexterm" name="id-1.4.8.3"></a><a class="indexterm" name="id-1.4.8.4"></a><p id="ox.appsuite.user.concept.settings.countdown">Puede habilitar una cuenta atrás para las próximas citas. Antes del comienzo de la cita, una ventana de cuenta atrás visualmente llamativa le recordará la cita. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.settings.notificationarea.html b/help/l10n/es_ES/ox.appsuite.user.sect.settings.notificationarea.html
index 7173406f5..a3ffb93de 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.settings.notificationarea.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.settings.notificationarea.html
@@ -1,12 +1,12 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Usar el área de notificación</title>
+<title>usar el área de notificación</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Configuración personalizada">
-<link rel="prev" href="ox.appsuite.user.sect.settings.countdown.html" title="Uso de cuentas atrás para Citas">
+<link rel="prev" href="ox.appsuite.user.sect.settings.countdown.html" title="Uso de cuentas atrás para citas">
 <link rel="next" href="ox.appsuite.user.sect.settings.personaldata.html" title="Cambio de datos personales de contacto">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Configuración personalizada</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.notificationarea">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Usar el área de notificación</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">usar el área de notificación</h2></div></div></div>
 <a class="indexterm" name="id-1.4.9.2"></a><a class="indexterm" name="id-1.4.9.3"></a><p id="ox.appsuite.user.concept.settings.notificationarea">Se le notificará en el área de notificaciones para los siguientes eventos: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Recordatorios de citas o tareas próximas</p></li>
@@ -61,10 +61,10 @@
 <li class="listitem"><p role="presentation">Para mostrar sugerencias de invitaciones a citas en el calendario, pulse en la fecha.</p></li>
 <li class="listitem"><p role="presentation">Para aceptar o declinar una invitación, pulse en el botón correspondiente.</p></li>
 </ul></p>
-<p role="presentation" class="feat-io-ox-core-managedResources">Al recibir solicitudes de reserva de recursos gestionados, se pueden usar las siguientes funciones: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Para ver las solicitudes de reserva en el calendario de recursos, pulse en la fecha.</p></li>
-<li class="listitem"><p role="presentation">Para aceptar o rechazar una solicitud de reserva, pulse en el botón correspondiente.</p></li>
-</ul></p>
+<p role="presentation" class="feat-io-ox-core-managedResources">Al recibir solicitudes de reserva para recursos gestionados, puede utilizar las siguientes funciones: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Para ver la solicitud de reserva en el calendario de recursos, pulse en la fecha.</p></li>
+<li class="listitem"><p role="presentation">Para aceptar o rechazar la solicitud de reserva, pulse en el botón correspondiente.</p></li>
+</ul> </p>
 <p role="presentation">Si hay tareas atrasadas se pueden usar las siguientes funciones: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Para mostrar detalles en una ventana emergente, pulse en el recordatorio.</p></li>
 <li class="listitem"><p role="presentation">Para editar la tarea, use las funciones de la ventana emergente.</p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.settings.notifications.html b/help/l10n/es_ES/ox.appsuite.user.sect.settings.notifications.html
index d8b0b6d74..72a54e9de 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.settings.notifications.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.settings.notifications.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Configuración personalizada">
 <link rel="prev" href="ox.appsuite.user.sect.settings.commonsettings.html" title="Ajuste de la Configuración general">
-<link rel="next" href="ox.appsuite.user.sect.settings.countdown.html" title="Uso de cuentas atrás para Citas">
+<link rel="next" href="ox.appsuite.user.sect.settings.countdown.html" title="Uso de cuentas atrás para citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -60,9 +60,9 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>mostrar notificaciones de escritorio. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Determina si se recibirá una notificación de escritorio para los correos entrantes si el software colaborativo está en segundo plano.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>Mostrar notificaciones de escritorio. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Determina si se recibirá una notificación de escritorio para los correos entrantes si el software colaborativo está en segundo plano.</p></li>
 <li class="listitem">
-<p role="presentation">Dependiendo de la configuración del navegador, se muestra el botón <span class="guibutton"><strong>Administrar los permisos del navegador ahora</strong></span>. Pulse el botón. El navegador le preguntará si se debe permitir la recepción de notificaciones. Conceda este permiso.</p>
+<p role="presentation">Dependiendo de la configuración del navegador, se muestra el botón <span class="guibutton"><strong>Gestionar los permisos del navegador ahora</strong></span>. Pulse el botón. El navegador le preguntará si se debe permitir la recepción de notificaciones. Conceda este permiso.</p>
 <p role="presentation">Nota: Dependiendo del navegador, podría tener que permitir la recepción de notificaciones en la configuración del navegador para que el ajuste surta efecto. Se puede encontrar información en las páginas de ayuda del navegador.</p>
 </li>
 </ul>
@@ -74,7 +74,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.show"><b>Abrir automáticamente el área de notificación cuando haya nuevos recordatorios. </b><a class="indexterm" name="id-1.4.7.8.2.1.1.1.2"></a>Determina si el área de notificación se abre automáticamente al recibir un recordatorio para una cita o tarea.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.birthdays"><b>Mostrar cumpleaños en el área de notificación. </b>Determina si el área de notificación también incluye cumpleaños próximos.</p></li>
 </ul>
-<p>Consulte <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a></p>
+<p>Consulte <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a></p>
 <p id="ox.appsuite.user.reference.settings.notifications.email"></p>
 <h3 class="title">correo</h3>
 <p>
@@ -93,14 +93,14 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem feat-io-ox-core-countdown" id="id-1.4.7.10.2.1.1"><p id="ox.appsuite.user.reference.settings.notifications.calendar.countdown"><b>Cuenta atrás. </b><a class="indexterm" name="id-1.4.7.10.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.3"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.4"></a>Determina si se mostrará una ventana de cuenta regresiva para las próximas citas. Consulte <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a></p></li>
+<li class="listitem feat-io-ox-core-countdown" id="id-1.4.7.10.2.1.1"><p id="ox.appsuite.user.reference.settings.notifications.calendar.countdown"><b>Cuenta atrás. </b><a class="indexterm" name="id-1.4.7.10.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.3"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.4"></a>Determina si se mostrará una ventana de cuenta regresiva para las próximas citas. Consulte <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a></p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.settings.notifications.calendar.email"><b>Notificaciones por correo. </b>Determina si recibirá un correo de notificación si se cumple lo siguiente: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.changes"><b>Recibir notificaciones cuando se ha creado, modificado o borrado, una cita en la que participa. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.1.1.2"></a>Una cita en la que participa se ha vuelto a crear, se ha cambiado o se ha borrado.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>recibir notificación como creador de la cita cuando los participantes acepten o rechacen. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Un participante ha aceptado o rechazado una cita creada por usted.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>recibir notificación como participante de la cita cuando otros participantes acepten o rechacen. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>un participante ha aceptado o rechazado una cita en la que usted participa.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>borrar automáticamente el correo de invitación cuando la cita haya sido aceptada o rechazada. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Determina si la notificación por correo para una invitación a una cita se borrará automáticamente cuando se acepte o rechace dicha cita. Consulte <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>Recibir notificación como creador de la cita cuando los participantes acepten o rechacen. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Un participante ha aceptado o rechazado una cita creada por usted.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>Recibir notificación como participante de la cita cuando otros participantes acepten o rechacen. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>un participante ha aceptado o rechazado una cita en la que usted participa.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>Borrar automáticamente el correo de invitación cuando la cita haya sido aceptada o rechazada. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Determina si la notificación por correo para una invitación a una cita se borrará automáticamente cuando se acepte o rechace dicha cita. Consulte <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a></p></li>
 </ul>
 </li>
 </ul>
@@ -141,14 +141,14 @@
             <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Búsqueda de configuraciones</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuste de la Configuración general</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.settings.personaldata.html b/help/l10n/es_ES/ox.appsuite.user.sect.settings.personaldata.html
index 055b1d0d4..6bf1df09a 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.settings.personaldata.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.settings.personaldata.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Configuración personalizada">
-<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Usar el área de notificación">
+<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="usar el área de notificación">
 <link rel="next" href="ox.appsuite.user.sect.settings.wizard.html" title="Uso de un asistente para configurar aplicaciones locales">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.settings.presencestatus.html b/help/l10n/es_ES/ox.appsuite.user.sect.settings.presencestatus.html
index db8b10952..eb317d27c 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.settings.presencestatus.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.settings.presencestatus.html
@@ -56,7 +56,7 @@
             <a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a>
           </p>
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a>
           </p>
 <p role="presentation" class="cap-contacts">
             <a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.settings.search.html b/help/l10n/es_ES/ox.appsuite.user.sect.settings.search.html
index 03400c63c..a94ea65c8 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.settings.search.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.settings.search.html
@@ -64,7 +64,7 @@
             <a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none">
@@ -80,6 +80,9 @@
 <p role="presentation" class="cap-infostore">
             <a class="xref" href="ox.appsuite.user.sect.drive.settings.html">Configuración de <span class="phrase">Ficheros</span></a>
           </p>
+<p role="presentation" class="cap-guard">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Configuración de <span class="phrase">Guard</span></a>
+          </p>
 </li>
 </ul>
 <p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.add.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.add.html
index 9fcc112e6..5b3ad2a7a 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.add.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.add.html
@@ -52,7 +52,7 @@
             <a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importación de tareas</a>
           </p>
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a>
           </p>
 </li></ul>
 <p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.call.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.call.html
index 1c546de9b..342cb1d78 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.call.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.call.html
@@ -66,7 +66,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o vídeo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Establecer el estado de presencia</a></p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.detailview.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.detailview.html
index a868715ae..16650d03e 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.detailview.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.detailview.html
@@ -55,7 +55,7 @@
 <li class="listitem"><p role="presentation">El asunto de la tarea</p></li>
 <li class="listitem"><p role="presentation">La fecha de recordatorio de la tarea, si está configurada</p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.7.10.4.1.5">
-<p role="presentation">Las categorías asignadas</p>
+<p role="presentation">las categorías asignadas</p>
 <p role="presentation">Pulsar en un categoría lanza una búsqueda de tareas a las que se ha asignado dicha categoría.</p>
 </li>
 <li class="listitem"><p role="presentation">Si la tarea es repetitiva, se mostrarán los parámetros de repetición.</p></li>
@@ -70,7 +70,7 @@
 <li class="listitem"><p role="presentation">fecha de comienzo</p></li>
 <li class="listitem"><p role="presentation">definición</p></li>
 <li class="listitem"><p role="presentation">información de facturación</p></li>
-<li class="listitem"><p role="presentation">adjuntos</p></li>
+<li class="listitem"><p role="presentation">Adjuntos</p></li>
 <li class="listitem">
 <p role="presentation">los nombres de los participantes</p>
 <p role="presentation">Si pulsa en un nombre, se abre una ventana emergente. Se muestra la <span class="guibutton"><strong>Vista Halo</strong></span> del participante.</p>
@@ -87,14 +87,11 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.create.html">La ventana de edición</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Visualización de tareas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Visualización o almacenamiento de adjuntos de tareas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">Llamar a los participantes de la tarea</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualización de contactos en la vista halo</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.gui.detailview">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Los componentes de <span class="phrase">Tareas</span></a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.foldertree.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.foldertree.html
index 428082e25..2ce2bb353 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.foldertree.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.foldertree.html
@@ -59,6 +59,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Visualización de tareas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Adición de listas de tareas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.list.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.list.html
index e61877a71..322aea855 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.list.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.list.html
@@ -59,17 +59,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.list.html">La vista de lista</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.settingsmenu.html">El menú de configuración de <span class="phrase">Tareas</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.detailview.html">La vista de detalle de <span class="phrase">Tareas</span></a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Visualización de tareas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Visualización o almacenamiento de adjuntos de tareas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.list">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Los componentes de <span class="phrase">Tareas</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.settingsmenu.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
index dc6b9def5..f3547fd01 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
@@ -53,10 +53,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.menubar.html">La barra de menús</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Suscribirse a listas de tareas públicas y compartidas</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Suscribirse a listas de tareas públicas y compartidas</a></p></li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.settingsmenu">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Los componentes de <span class="phrase">Tareas</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.toolbar.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.toolbar.html
index 7051a5013..fa2ced9fd 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.toolbar.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.gui.toolbar.html
@@ -60,13 +60,7 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Edición de tareas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Cambio de la fecha de vencimiento de una tarea</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marcado de tareas como realizadas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Mover tareas a otra carpeta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Cambiar confirmaciones de tareas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Exportación de tareas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.print.html">Impresión de tareas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.delete.html">Borrado de tareas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.toolbar">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Los componentes de <span class="phrase">Tareas</span></a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.categories.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.categories.html
new file mode 100644
index 000000000..13dfa333a
--- /dev/null
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Uso de categorías para tareas</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Gestión de tareas">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Cambio de la fecha de vencimiento de una tarea">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Mover tareas a otra carpeta">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Tareas</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de tareas</h2>
+<div class="sect2" id="ox.appsuite.user.sect.tasks.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Uso de categorías para tareas</h3></div></div></div>
+<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.categories">Para organizar tareas independientemente de las carpetas, puede utilizar categorías. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Puede marcar tareas con categorías.</p></li>
+<li class="listitem"><p role="presentation">Puede mostrar todas las tareas que se han marcado con una categoría específica.</p></li>
+</ul>
+<p> Puede crear, editar o borrar categorías propias; consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>.</p>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories">
+<p class="title">Cómo marcar tareas con una categoría:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Seleccione una tarea. Pulse el icono <span class="guibutton"><strong>Editar contacto</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.mark.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> de la barra de herramientas.</p>
+<p role="presentation">Se abre la ventana de edición de tareas.</p>
+</li>
+<li class="step">
+<p role="presentation">Para hacerlo, pulse en <span class="guibutton"><strong>Agregar categoría</strong></span> ubicado junto a <span class="guibutton"><strong>Categorías</strong></span>. Seleccione una categoría.</p>
+<p role="presentation">Para eliminar una categoría de la tarea, pulse en el icono <span class="guibutton"><strong>Eliminar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> que hay junto a la categoría.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories.view">
+<p class="title">Cómo mostrar tareas que han sido marcadas con una categoría específica:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione una tarea que haya sido marcada con una categoría.</p></li>
+<li class="step"><p role="presentation">Pulse en la categoría en la vista de detalle.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Resultado: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vista de lista muestra todas las tareas que se han marcado con esta categoría.</p></li>
+<li class="listitem"><p role="presentation">Para mostrar la lista anterior, pulse en el icono <span class="guibutton"><strong>Cancelar búsqueda</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> en el campo de búsqueda.</p></li>
+</ul>
+          <p>Consejo: También puede utilizar la función de búsqueda buscando una categoría mediante las opciones de búsqueda.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.tasks.manage.categories">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Búsqueda de tareas</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.tasks.manage.categories">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.changeduedate.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.changeduedate.html
index 8af71d5f5..ecb4fcc1c 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.changeduedate.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.changeduedate.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Gestión de tareas">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="Marcado de tareas como realizadas">
-<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Mover tareas a otra carpeta">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Uso de categorías para tareas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -48,7 +48,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changeduedate"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.changestatus.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.changestatus.html
index 185e7d5cf..cad44355e 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.changestatus.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.changestatus.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de tareas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.changestatus">
 <div class="titlepage"><div><div><h3 class="title">Cambiar confirmaciones de tareas</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.10.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Si es un participante de la tarea, puede cambiar su confirmación para esta tarea más tarde. Puede agregar un comentario que sea visible para otros participantes de la tarea.</p>
+<a class="indexterm" name="id-1.10.15.11.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Si es un participante de la tarea, puede cambiar su confirmación para esta tarea más tarde. Puede agregar un comentario que sea visible para otros participantes de la tarea.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.changestatus">
 <p class="title">Cómo cambiar su confirmación:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changestatus"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.delete.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.delete.html
index bf340fc93..55c8bf785 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.delete.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de tareas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Borrado de tareas</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Advertencia:</strong></span> Las tareas borradas <span class="phrase"><strong>no</strong></span> se pueden restaurar.</p>
+<a class="indexterm" name="id-1.10.15.15.2"></a><a class="indexterm" name="id-1.10.15.15.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Advertencia:</strong></span> Las tareas borradas <span class="phrase"><strong>no</strong></span> se pueden restaurar.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.delete">
 <p class="title">Cómo borrar tareas:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -50,9 +50,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.delete">
         </p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.delete">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.export.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.export.html
index f61358267..69cbe447a 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.export.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de tareas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exportación de tareas</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">Puede exportar tareas en formato iCal. Puede, por ejemplo, utilizar este formato para intercambiar tareas con otras aplicaciones de calendario. Puede exportar tareas individuales o todas las tareas desde una carpeta.</p>
+<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><a class="indexterm" name="id-1.10.15.13.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">Puede exportar tareas en formato iCal. Puede, por ejemplo, utilizar este formato para intercambiar tareas con otras aplicaciones de calendario. Puede exportar tareas individuales o todas las tareas desde una carpeta.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.export.selected">
 <p class="title">Cómo exportar tareas individuales: </p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -63,12 +63,16 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.export"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista de carpeta de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importación de tareas</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.10.15.12.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.10.15.13.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.manage.export">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
 </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.html
index d1d4e41e6..c2da837bb 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marcado de tareas como realizadas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Cambio de la fecha de vencimiento de una tarea</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Mover tareas a otra carpeta</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Cambiar confirmaciones de tareas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importación de tareas</a></p></li>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.import.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.import.html
index a36037486..b28e1f403 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.import.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de tareas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importación de tareas</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.11.2"></a><a class="indexterm" name="id-1.10.15.11.3"></a><a class="indexterm" name="id-1.10.15.11.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">Puede importar tareas desde ficheros en formato iCal.</p>
+<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">Puede importar tareas desde ficheros en formato iCal.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.import">
 <p class="title">Cómo importar tareas desde un fichero iCal:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,19 +54,15 @@
           <p>Resultado: Las tareas se agregan a la carpeta.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.tasks.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.tasks.manage.import"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista de carpeta de <span class="phrase">Tareas</span></a></p></li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Exportación de tareas</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Creación de tareas</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Exportación de tareas</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Creación de tareas</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.tasks.manage.import">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.markasdone.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.markasdone.html
index 8debfe810..87a3de896 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.markasdone.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.markasdone.html
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.markasdone"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.move.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.move.html
index 204f874ed..4352168f1 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.move.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.move.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Gestión de tareas">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Cambio de la fecha de vencimiento de una tarea">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Uso de categorías para tareas">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.changestatus.html" title="Cambiar confirmaciones de tareas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Siguiente</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de tareas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Mover tareas a otra carpeta</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">Puede mover tareas a otra carpeta.</p>
+<a class="indexterm" name="id-1.10.15.10.2"></a><a class="indexterm" name="id-1.10.15.10.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">Puede mover tareas a otra carpeta.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.move">
 <p class="title">Cómo mover tareas a otra carpeta:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 <p id="ox.appsuite.user.tip.tasks.manage.move">Consejo: también puede mover los objetos seleccionados arrastrando los objetos desde la vista de carpeta a una carpeta.</p>
 <p id="ox.appsuite.user.related.tasks.manage.move"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista de carpeta de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">Adición de lista de tareas personales</a></p></li></ul>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.print.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.print.html
index 3298fa2dd..f55fc0764 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.print.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de tareas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Impresión de tareas</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">Puede imprimir los datos de una sola tarea o de múltiples tareas.</p>
+<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">Puede imprimir los datos de una sola tarea o de múltiples tareas.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.print.data">
 <p class="title">Cómo imprimir los datos de una tarea:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,9 +51,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.print">
         </p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.print">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
diff --git a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.search.html b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.search.html
index d6befbfce..2de4d6206 100644
--- a/help/l10n/es_ES/ox.appsuite.user.sect.tasks.search.html
+++ b/help/l10n/es_ES/ox.appsuite.user.sect.tasks.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Visualización de tareas</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/es_MX/bk01-toc.html b/help/l10n/es_MX/bk01-toc.html
index 084b2176e..62d494e54 100644
--- a/help/l10n/es_MX/bk01-toc.html
+++ b/help/l10n/es_MX/bk01-toc.html
@@ -63,8 +63,8 @@
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.search.html">Búsqueda de configuraciones</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuste de la Configuración general</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a></li>
-<li class="sect1 feat-io-ox-core-countdown"><a href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a></li>
-<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a></li>
+<li class="sect1 feat-io-ox-core-countdown"><a href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a></li>
+<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.personaldata.html">Cambio de datos personales de contacto</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.wizard.html">Uso de un asistente para configurar aplicaciones locales</a></li>
 <li class="sect1 cap-switchboard"><a href="ox.appsuite.user.sect.settings.presencestatus.html">Establecer el estado de presencia</a></li>
@@ -134,7 +134,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.new.html">El botón Nuevo correo</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de pestañas de <span class="phrase">Correo electrónico</span></a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de categorías de la bandeja de entrada</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.popup.html">El elemento emergente de <span class="phrase">Correo electrónico</span></a></li>
@@ -144,13 +144,13 @@
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></li>
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a></li>
 <li class="sect1 cap-webmail">
-<a href="ox.appsuite.user.sect.email.send.html">Envío de correos</a><ul>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a></li>
+<a href="ox.appsuite.user.sect.email.send.html">enviar correos</a><ul>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.replyto.html">Configuración de la dirección de respuesta</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a></li>
-<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envío de adjuntos como enlace</a></li>
+<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">enviar adjuntos como enlace</a></li>
 <li class="sect2 feat-io-ox-core-templates"><a href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></li>
@@ -174,6 +174,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.movecopy.html">Mover o copiar correos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.collectaddress.html">Recopilación de direcciones</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.source.html">Mostrar código fuente del correo</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.draft.html">Uso de borradores de correo</a></li>
@@ -185,6 +186,9 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.archive.html">Archivado de correos</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a></li>
+<li class="sect2 cap-dumpster"><a href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a></li>
 </ul>
@@ -238,10 +242,10 @@
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.attachments.html">Visualización y guardado de adjuntos de citas</a></li>
 <li class="sect1 cap-calendar">
-<a href="ox.appsuite.user.sect.calendar.add.html">crear citas</a><ul>
+<a href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a><ul>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.datepicker.html">Uso del selector de fecha</a></li>
-<li class="sect2 cap-calendar cap-switchboard"><a href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a></li>
+<li class="sect2 cap-calendar cap-switchboard"><a href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.serial.html">Establecer cita periódica</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.display.html">Configuración de la visualización de una cita</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.alarms.html">Uso de recordatorios de citas</a></li>
@@ -249,10 +253,10 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attachments.html">Añadir adjuntos</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.followup.html">Creación de una cita de seguimiento</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.recipients.html">Invitación de destinatarios de correo a nuevas citas</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Crear citas desde adjuntos iCal</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a></li>
 </ul>
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a></li>
@@ -273,6 +277,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modificación de recordatorios de citas</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Cambio del organizador</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.timezones.html">Gestión de zonas horarias favoritas</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.colors.html">Uso de colores del calendario</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.move.html">Mover citas a otro calendario</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.import.html">Importación de citas</a></li>
@@ -360,6 +365,7 @@
 <a href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envío de correos desde una libreta de direcciones</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitar contactos a una cita</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Mover o copiar contactos</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envío de contactos como vCard</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a></li>
@@ -413,6 +419,7 @@
 <a href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marcado de tareas como realizadas</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Cambio de la fecha de vencimiento de una tarea</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.move.html">Mover tareas a otra carpeta</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Cambiar confirmaciones de tareas</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.import.html">Importación de tareas</a></li>
@@ -515,7 +522,7 @@
 </ul>
 </li>
 <li class="sect1 cap-deputy">
-<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">Administrar representantes</a><ul>
+<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">administrar representantes</a><ul>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.add.html">Adición de representantes</a></li>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">Visualización, edición, borrado de representantes</a></li>
 </ul>
@@ -584,12 +591,19 @@
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.logout.html">Cierre de sesión de <span class="phrase">Guard</span></a></li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a></li>
 <li class="sect1 cap-guard">
-<a href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a><ul>
+<a href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a><ul>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.change.html">Cambiar la contraseña</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.reset.html">restablecer la contraseña</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Eliminación de la función de restablecimiento de contraseña</a></li>
+</ul>
+</li>
+<li class="sect1 cap-guard">
+<a href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Administración de claves PGP de destinatarios</a></li>
 <li class="sect2 cap-smime"><a href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a></li>
-<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves públicas</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Administrar claves S/MIME de destinatarios</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html">Configuración de <span class="phrase">Guard</span></a></li>
diff --git a/help/l10n/es_MX/index.html b/help/l10n/es_MX/index.html
index d7cdc4d02..2ccc1771a 100644
--- a/help/l10n/es_MX/index.html
+++ b/help/l10n/es_MX/index.html
@@ -34,7 +34,7 @@
 </h3></div></div>
 <div><p class="copyright">Copyright © 2016-2023 OX Software GmbH </p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">Aviso Legal</a></div>
-<div><p class="pubdate">Martes, 21. Noviembre 2023 Version 8.19.0 </p></div>
+<div><p class="pubdate">Jueves, 21. Diciembre 2023 Version 8.20.0 </p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">Índice temas de ayuda</h2>
@@ -81,10 +81,10 @@
                 <a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
+                <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a>
+                <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Uso de un asistente para configurar aplicaciones locales</a>
@@ -97,6 +97,19 @@
               </p></li>
 </ul>
 </li>
+<li class="listitem" id="ox.appsuite.user.startpage.toc.keyboard" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.chap.keyboard.html"><i>Entrada de teclado</i></a>
+            </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.navigation.html">Uso de la navegación con el teclado</a>
+              </p></li>
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.shortkeys.html">Uso de atajos de teclado</a>
+              </p></li>
+</ul>
+</li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.portal" style="list-style-type: none">
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.chap.portal.html"><i>
@@ -135,12 +148,12 @@
                 <a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a>
+                <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a>
               </p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.5.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.6.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Uso de la integración con AI</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.5.1.6"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -155,13 +168,13 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.search.html">Búsqueda de correos</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.5.1.11"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.11"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a>
               </p></li>
-<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.5.1.13"><p role="presentation">
+<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
               </p></li>
 </ul>
@@ -183,7 +196,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Visualización de citas</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a>
+                <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a>
@@ -191,7 +204,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.7"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -200,25 +213,25 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a>
               </p></li>
-<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.6.1.10"><p role="presentation">
+<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.7.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Uso de calendarios de recursos</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Búsqueda de citas</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.12"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.7.1.12"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creación, edición o gestión de citas como representante</a>
               </p></li>
-<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation">
+<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.7.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">Uso de grupos</a>
               </p></li>
-<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.6.1.14"><p role="presentation">
+<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">Uso de recursos</a>
               </p></li>
-<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.6.1.15"><p role="presentation">
+<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.7.1.15"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">Uso de recursos administrados</a>
               </p></li>
-<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.6.1.16"><p role="presentation">
+<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.7.1.16"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
               </p></li>
 </ul>
@@ -242,7 +255,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Adición automática de Contactos o Recursos desde una libreta de direcciones</a>
               </p></li>
-<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.7.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.8.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Adición automática de Contactos o Recursos desde el Directorio de Direcciones</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -254,7 +267,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Edición de contactos o listas distribución</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.9"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.8.1.9"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -269,7 +282,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Búsqueda de contactos</a>
               </p></li>
-<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation">
+<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.8.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Ajustes de la libreta de direcciones</a>
               </p></li>
 </ul>
@@ -344,7 +357,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Añadir cuentas de almacenamiento</a>
               </p></li>
-<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.9.1.10"><p role="presentation">
+<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.10.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.settings.html">Configuración de <span class="phrase">Ficheros</span></a>
               </p></li>
 </ul>
@@ -357,19 +370,19 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a>
               </p></li>
-<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.10.1.3"><p role="presentation">
+<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.11.1.3"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.10.1.4"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Administrar representantes</a>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.11.1.4"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">administrar representantes</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Administración de cuentas</a>
               </p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.10.1.6"><p role="presentation">
+<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.11.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
               </p></li>
-<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.10.1.7"><p role="presentation">
+<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.11.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a>
               </p></li>
 </ul>
@@ -388,7 +401,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.sessions.html">Visualización o cierre de sesión en clientes activos</a>
               </p></li>
-<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.11.1.5"><p role="presentation">
+<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.12.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Autenticación multifactor</a>
               </p></li>
 </ul>
@@ -420,7 +433,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a>
+                <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Configuración de <span class="phrase">Guard</span></a>
diff --git a/help/l10n/es_MX/ox.appsuite.user.chap.calendar.html b/help/l10n/es_MX/ox.appsuite.user.chap.calendar.html
index 968045b61..8bf9fc5d7 100644
--- a/help/l10n/es_MX/ox.appsuite.user.chap.calendar.html
+++ b/help/l10n/es_MX/ox.appsuite.user.chap.calendar.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="Configuración del correo">
+<link rel="prev" href="ox.appsuite.user.sect.email.mailfilter.apply.html" title="Aplicar una regla a correos ya existentes">
 <link rel="next" href="ox.appsuite.user.sect.calendar.gui.html" title="Los componentes de Calendario">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.mailfilter.apply.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.gui.html">Siguiente</a></li>
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Los componentes de <span class="phrase">Calendario</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Visualización de citas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.attachments.html">Visualización y guardado de adjuntos de citas</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.8.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a></p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/es_MX/ox.appsuite.user.chap.dataorganisation.html
index ea0ee4365..c097e56b8 100644
--- a/help/l10n/es_MX/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/es_MX/ox.appsuite.user.chap.dataorganisation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="Configuración de WebDAV en Windows">
+<link rel="prev" href="ox.appsuite.user.sect.drive.settings.html" title="Configuración de Ficheros">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.folder.html" title="Administración de datos con carpetas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.settings.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.folder.html">Siguiente</a></li>
@@ -35,7 +35,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a></p></li>
 <li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.12.2.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a></p></li>
-<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Administrar representantes</a></p></li>
+<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">administrar representantes</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Administración de cuentas</a></p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.12.2.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a></p></li>
 <li class="listitem cap-dataexport" id="id-1.12.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.chap.drive.html b/help/l10n/es_MX/ox.appsuite.user.chap.drive.html
index 8c86d658d..203e67d34 100644
--- a/help/l10n/es_MX/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/es_MX/ox.appsuite.user.chap.drive.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.search.html" title="Búsqueda de tareas">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.delete.html" title="Borrado de tareas">
 <link rel="next" href="ox.appsuite.user.sect.drive.gui.html" title="Los componentes de Ficheros">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.search.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.delete.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.drive.gui.html">Siguiente</a></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.chap.email.html b/help/l10n/es_MX/ox.appsuite.user.chap.email.html
index 0f184bcac..9e3e67789 100644
--- a/help/l10n/es_MX/ox.appsuite.user.chap.email.html
+++ b/help/l10n/es_MX/ox.appsuite.user.chap.email.html
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">Uso de la integración con AI</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.7.7.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Añadir carpetas de correo</a></p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.chap.guard.html b/help/l10n/es_MX/ox.appsuite.user.chap.guard.html
index 78223deea..4a76f826b 100644
--- a/help/l10n/es_MX/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/es_MX/ox.appsuite.user.chap.guard.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="Administración de métodos de verificación">
+<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="Cerrar sesión automáticamente">
 <link rel="next" href="ox.appsuite.user.sect.guard.setup.html" title="Configuración de Guard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.autologout.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.setup.html">Siguiente</a></li>
@@ -48,7 +48,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Cifrado de documentos de Office</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.logout.html">Cierre de sesión de <span class="phrase">Guard</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Configuración de <span class="phrase">Guard</span></a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.guard">Se puede encontrar información sobre otros temas relacionados con la seguridad en <a class="xref" href="ox.appsuite.user.chap.security.html"><i>Seguridad de los datos</i></a>.</p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.chap.security.html b/help/l10n/es_MX/ox.appsuite.user.chap.security.html
index 1ce3030d6..b461b5d42 100644
--- a/help/l10n/es_MX/ox.appsuite.user.chap.security.html
+++ b/help/l10n/es_MX/ox.appsuite.user.chap.security.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="Visualización, edición, borrado de cuentas">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="Descarga de datos personales">
 <link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="Visualización o cierre de sesión en clientes activos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">Siguiente</a></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.chap.settings.html b/help/l10n/es_MX/ox.appsuite.user.chap.settings.html
index 909e3ef1e..9ff074e0d 100644
--- a/help/l10n/es_MX/ox.appsuite.user.chap.settings.html
+++ b/help/l10n/es_MX/ox.appsuite.user.chap.settings.html
@@ -36,8 +36,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Búsqueda de configuraciones</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuste de la Configuración general</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.personaldata.html">Cambio de datos personales de contacto</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Uso de un asistente para configurar aplicaciones locales</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.4.3.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Establecer el estado de presencia</a></p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.chap.tasks.html b/help/l10n/es_MX/ox.appsuite.user.chap.tasks.html
index 057c6cb41..c4e202ea0 100644
--- a/help/l10n/es_MX/ox.appsuite.user.chap.tasks.html
+++ b/help/l10n/es_MX/ox.appsuite.user.chap.tasks.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="Ajustes de la libreta de direcciones">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.delete.html" title="Borrado de contactos">
 <link rel="next" href="ox.appsuite.user.sect.tasks.gui.html" title="Los componentes de Tareas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.settings.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.delete.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.gui.html">Siguiente</a></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.index.html b/help/l10n/es_MX/ox.appsuite.user.index.html
index d3163282d..899ef738b 100644
--- a/help/l10n/es_MX/ox.appsuite.user.index.html
+++ b/help/l10n/es_MX/ox.appsuite.user.index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="index.html" title="Guía del usuario">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="Configuración de Guard">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Administrar claves S/MIME de destinatarios">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -21,7 +21,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.settings.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 </ul></div>
@@ -53,7 +53,7 @@
 </dt>
 <dt class="cap-portal">Ajustes</dt>
 <dd><dl>
-<dt class="cap-deputy">administrar representantes, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Administrar representantes</a>
+<dt class="cap-deputy">administrar representantes, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">administrar representantes</a>
 </dt>
 <dt class="cap-calendar">calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
@@ -61,16 +61,24 @@
 </dt>
 <dt class="cap-dataexport">descargar datos personales, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a>
 </dt>
-<dt class="cap-guard">
-        Guard
+<dt class="cap-infostore">
+        Ficheros
         
         
         
-      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
 </dt>
 <dt class="cap-portal">Portal, <a class="indexterm" href="ox.appsuite.user.sect.portal.settings.html">Ajustes del portal</a>
 </dt>
 </dl></dd>
+<dt class="cap-guard">ajustes</dt>
+<dd><dl><dt class="cap-guard">
+        Guard
+        
+        
+        
+      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+</dt></dl></dd>
 <dt class="cap-infostore">Ajustes de Ficheros</dt>
 <dd><dl>
 <dt class="cap-infostore">añadir archivos, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
@@ -79,7 +87,7 @@
 </dt>
 <dt class="cap-infostore">mostrar archivos y carpetas ocultos, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
 </dt>
-<dt class="cap-infostore">presentar diapositivas para imágenes, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
+<dt class="cap-infostore">Presentación para imágenes, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
 </dt>
 </dl></dd>
 <dt class="cap-contacts">Ajustes de la libreta de direcciones</dt>
@@ -88,12 +96,12 @@
 </dt>
 <dt class="cap-contacts">enlazar direcciones postales con servicio de mapas, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Ajustes de la libreta de direcciones</a>
 </dt>
-<dt class="cap-contacts">nombres, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Ajustes de la libreta de direcciones</a>
+<dt class="cap-contacts">Nombres, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Ajustes de la libreta de direcciones</a>
 </dt>
 </dl></dd>
 <dt class="cap-guard">ajustes de seguridad de Guard</dt>
 <dd><dl>
-<dt class="cap-guard">ajustes avanzados, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+<dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
 </dt>
 <dt class="cap-guard">De manera predeterminada, añadir firma a correos salientes, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
 </dt>
@@ -103,12 +111,18 @@
 </dt>
 <dt class="cap-guard">Recordar contraseña de manera predeterminada, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
 </dt>
-<dt class="cap-guard">S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
-</dt>
 </dl></dd>
 <dt class="cap-guard">Ajustes de seguridad de Guard</dt>
-<dd><dl><dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="cap-guard">configuración de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+</dt>
+<dt class="cap-guard">configuración de caché de correo, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+</dt>
+<dt class="cap-guard">mostrar configuraciones avanzadas para redactar correo, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+</dt>
+<dt class="cap-guard">opciones de restablecimiento, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+</dt>
+</dl></dd>
 <dt class="cap-calendar">Ajustes del calendario</dt>
 <dd><dl>
 <dt class="cap-calendar">aplicar automáticamente los cambios de citas recibidos por correo a su calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
@@ -129,17 +143,17 @@
 </dt>
 <dt class="cap-calendar">mostrar calendario de cumpleaños, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
-<dt class="cap-calendar">Mostrar citas rechazadas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
+<dt class="cap-calendar">mostrar citas rechazadas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
 <dt class="cap-calendar">mostrar recordatorios de citas pasadas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
-<dt class="cap-calendar">Recordatorios de citas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
+<dt class="cap-calendar">recordatorios de citas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
 <dt class="cap-calendar">Reuniones de Jitsi, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
 <dt class="cap-calendar">Reuniones de Zoom, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
-<dt class="cap-calendar">Semana laboral, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
+<dt class="cap-calendar">semana de trabajo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
 <dt class="cap-calendar">suscribirse a calendarios compartidos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
@@ -156,13 +170,13 @@
 </dt>
 <dt class="cap-webmail">disposición, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
-<dt class="cap-webmail">eliminar permanentemente los correos borrados, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+<dt class="cap-webmail">Eliminar permanentemente los correos borrados, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="cap-webmail">enviar automáticamente correos a CCO, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="cap-webmail">estilo de texto predeterminado, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
-<dt class="cap-webmail">formato del mensaje, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+<dt class="cap-webmail">formato de mensaje, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="cap-webmail">fuente de ancho fijo, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
@@ -176,11 +190,13 @@
 </dt>
 <dt class="cap-webmail">mostrar carpeta con todos los mensajes no leídos, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
+<dt class="cap-webmail">mostrar categorías, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+</dt>
 <dt class="cap-webmail">mostrar el texto citado en color diferente, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="cap-webmail">mostrar fecha y hora, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
-<dt class="cap-webmail">mostrar solicitudes de confirmación de lectura, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+<dt class="cap-webmail">Mostrar solicitudes de confirmación de lectura, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="cap-webmail">mostrar tamaño del mensaje, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
@@ -196,7 +212,7 @@
 </dt>
 <dt class="cap-webmail">recopilar contactos automáticamente al leer, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
-<dt class="cap-webmail">reenviar correos como, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+<dt class="cap-webmail">Reenviar correos como, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="cap-webmail">Seleccionar automáticamente el mensaje leído más reciente al comienzo, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
@@ -233,7 +249,7 @@
 </dt>
 <dt class="cap-contacts">contacto, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.attachments.html">Adición de adjuntos</a>, <a class="indexterm" href="ox.appsuite.user.sect.tasks.add.attachments.html">Añadir adjuntos</a>
 </dt>
-<dt class="cap-webmail">correo electrónico, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a>
 </dt>
 <dt class="cap-webmail">de correo ya existente, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a>
 </dt>
@@ -429,7 +445,7 @@
 </dt>
 <dt class="cap-contacts">contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.delete.html">Borrado de contactos</a>
 </dt>
-<dt class="cap-webmail">Correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a>, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a>
 </dt>
 <dt class="">cuenta, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Visualización, edición, borrado de cuentas</a>
 </dt>
@@ -481,48 +497,49 @@
 </dt>
 <dt class="cap-calendar">Botón Nueva cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.new.html">El botón Nueva cita</a>
 </dt>
+<dt class="cap-share_links cap-share_mail_attachments">compartir, ver compartido, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a>
+</dt>
 <dt class="cap-calendar">componentes, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.html">Los componentes de Calendario</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Creación de citas usando el calendario de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creación de citas usando el calendario de recursos</a>
+<dt class="feat-io-ox-core-resourceCalendars">crear citas usando el calendario de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creación de citas usando el calendario de recursos</a>
 </dt>
 <dt class="cap-calendar">el menú Configuración, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">El menú de configuración de Calendario</a>
 </dt>
-<dt class="cap-calendar">Importar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importación de calendarios desde archivos</a>
+<dt class="cap-calendar">importar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importación de calendarios desde archivos</a>
 </dt>
 <dt class="cap-calendar">mini calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">El mini calendario</a>
 </dt>
 <dt class="cap-calendar">selector de fecha, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">El selector de fecha</a>
 </dt>
-<dt class="cap-calendar_google">Suscribirse a calendarios de Google, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Suscribirse a calendarios de Google</a>
+<dt class="cap-calendar_google">suscribirse a calendarios de Google, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Suscribirse a calendarios de Google</a>
 </dt>
 <dt class="cap-calendar">suscribirse a calendarios iCal, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Suscripción a calendarios externos desde una url iCal</a>
 </dt>
 <dt class="cap-calendar">suscribirse a calendarios públicos y compartidos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Suscripción a calendarios públicos y compartidos</a>
 </dt>
+<dt class="feat-io-ox-core-resourceCalendars">usar calendarios de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Uso de calendarios de recursos</a>
+</dt>
+<dt class="feat-io-ox-core-categories">usar categorías, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
+</dt>
 <dt class="cap-calendar">usar colores del calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Uso de colores del calendario</a>
 </dt>
 <dt class="cap-calendar">usar la vista de planificación, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Uso de calendarios de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Uso de calendarios de recursos</a>
-</dt>
 <dt class="cap-calendar">ventana de edición, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.create.html">La ventana de edición de citas:</a>
 </dt>
 <dt class="cap-calendar">ventana emergente, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de Calendario</a>
 </dt>
 <dt class="cap-calendar">vista de calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.calendarview.html">Vista del calendario Día, Semana laboral, Semana, Mes o Año.</a>
 </dt>
-<dt class="cap-calendar">vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de Calendario</a>
+<dt class="cap-calendar">Vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de Calendario</a>
 </dt>
 <dt class="cap-calendar">vista de detalle, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista de detalle de Calendario</a>
 </dt>
-<dt class="cap-calendar">Vista de lista, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de Calendario</a>
+<dt class="cap-calendar">vista de lista, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de Calendario</a>
 </dt>
 <dt class="cap-calendar">vista de planificación, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.scheduling.html">La vista de planificación</a>
 </dt>
 </dl></dd>
-<dt class="cap-share_links cap-share_mail_attachments">calendario</dt>
-<dd><dl><dt class="cap-share_links cap-share_mail_attachments">compartir, ver compartido, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a>
-</dt></dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Calendario de recursos</dt>
 <dd><dl>
 <dt class="feat-io-ox-core-resourceCalendars">crear, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creación de calendarios de recursos y grupos de calendarios de recursos</a>
@@ -576,7 +593,7 @@
 </dt>
 <dt class="">permisos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">¿Cuál es la finalidad de los permisos?</a>
 </dt>
-<dt class="">Renombrar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Renombrado de carpetas</a>
+<dt class="">renombrar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Renombrado de carpetas</a>
 </dt>
 <dt class="cap-infostore">subir, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Subida de archivos o carpetas</a>
 </dt>
@@ -584,8 +601,18 @@
 </dt>
 </dl></dd>
 <dt class="feat-io-ox-core-categories">Categorías</dt>
-<dd><dl><dt class="feat-io-ox-core-categories">administrar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="feat-io-ox-core-categories">administrar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+</dt>
+<dt class="feat-io-ox-core-categories">usar para citas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
+</dt>
+<dt class="feat-io-ox-core-categories">usar para contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a>
+</dt>
+<dt class="feat-io-ox-core-categories">usar para correos, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
+</dt>
+<dt class="feat-io-ox-core-categories">usar para tareas, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">Categorías de la bandeja de entrada</dt>
 <dd><dl><dt class="cap-webmail">trabajo con, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a>
 </dt></dl></dd>
@@ -616,7 +643,7 @@
 </dt>
 <dt class="cap-calendar">administrar zonas horarias favoritas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Gestión de zonas horarias favoritas</a>
 </dt>
-<dt class="cap-calendar">Añadir adjuntos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Añadir adjuntos</a>
+<dt class="cap-calendar">añadir adjuntos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Añadir adjuntos</a>
 </dt>
 <dt class="cap-calendar">añadir participantes o recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.participants.html">Añadir participantes o recursos</a>
 </dt>
@@ -656,15 +683,15 @@
 </dt>
 <dt class="cap-calendar">guardar adjunto, <a class="indexterm" href="ox.appsuite.user.sect.calendar.attachments.html">Visualización y guardado de adjuntos de citas</a>
 </dt>
-<dt class="cap-calendar">Importar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importación de citas</a>
+<dt class="cap-calendar">importar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importación de citas</a>
 </dt>
 <dt class="cap-calendar">imprimir, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.print.html">Impresión de citas</a>
 </dt>
 <dt class="cap-calendar">invitar a los destinatarios de correo a nuevas citas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.recipients.html">Invitación de destinatarios de correo a nuevas citas</a>
 </dt>
-<dt class="cap-calendar">invitar desde una libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitar contactos a una cita</a>
+<dt class="cap-calendar">invitar a participantes a una nueva cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a>
 </dt>
-<dt class="cap-calendar">Invitar participantes a una nueva cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a>
+<dt class="cap-calendar">invitar desde una libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitar contactos a una cita</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">llamar a los participantes de la cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a>
 </dt>
@@ -674,15 +701,17 @@
 </dt>
 <dt class="cap-calendar">planificar para otro día, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a>
 </dt>
-<dt class="cap-calendar cap-switchboard">programar conferencia de audio/video, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a>
+<dt class="cap-calendar cap-switchboard">programar conferencia de audio/video, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a>
 </dt>
-<dt class="cap-calendar">resolver conflictos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a>
+<dt class="cap-calendar">resolver conflictos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a>
 </dt>
 <dt class="cap-calendar">responder a invitaciones, <a class="indexterm" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a>
 </dt>
+<dt class="feat-io-ox-core-categories">usar categorías, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
+</dt>
 <dt class="cap-calendar">usar colores del calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Uso de colores del calendario</a>
 </dt>
-<dt class="">usar cuenta atrás, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
+<dt class="">usar cuenta atrás, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
 </dt>
 <dt class="cap-calendar">usar el selector de fecha, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.datepicker.html">Uso del selector de fecha</a>
 </dt>
@@ -744,7 +773,7 @@
 </dt>
 <dt class="cap-contacts">contactos, consulte los ajustes de la libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Ajustes de la libreta de direcciones</a>
 </dt>
-<dt class="cap-webmail">correo electrónico, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
 </dt>
 <dt class="">datos de contacto personales, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Cambio de datos personales de contacto</a>
 </dt>
@@ -755,19 +784,14 @@
 <dt class="">notificaciones, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
 </dl></dd>
-<dt class="cap-infostore">configuración</dt>
-<dd><dl><dt class="cap-infostore">
-        Ficheros
-        
-        
-        
-      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
-</dt></dl></dd>
 <dt class="cap-share_links cap-share_mail_attachments">Configuración de Correo</dt>
 <dd><dl><dt class="cap-share_links cap-share_mail_attachments">Suscripción a carpetas IMAP, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Suscripción a carpetas de correo compartidas o personales</a>
 </dt></dl></dd>
+<dt class="cap-guard">Configuración de Guard</dt>
+<dd><dl><dt class="cap-guard">opciones de redacción, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Configuración de Guard</a>
+</dt></dl></dd>
 <dt class="cap-calendar">Configuración de Jitsi</dt>
-<dd><dl><dt class="cap-calendar">Copiar enlace a la ubicación automáticamente, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
+<dd><dl><dt class="cap-calendar">copiar enlace a la ubicación automáticamente, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt></dl></dd>
 <dt class="">Configuración de tareas</dt>
 <dd><dl>
@@ -782,20 +806,20 @@
 <dd><dl>
 <dt class="cap-calendar">añadir siempre una contraseña de reunión aleatoria, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
-<dt class="cap-calendar">Copiar enlace a la ubicación automáticamente, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
+<dt class="cap-calendar">copiar enlace a la ubicación automáticamente, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
-<dt class="cap-calendar">Copiar información de acceso telefónico a la descripción, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
+<dt class="cap-calendar">copiar información de acceso telefónico a la descripción, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ajustes del calendario</a>
 </dt>
 </dl></dd>
 <dt class="">Configuración del calendario</dt>
 <dd><dl>
-<dt class="">borrar automáticamente el correo de invitación cuando la cita haya sido aceptada o rechazada, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
+<dt class="">Borrar automáticamente el correo de invitación cuando la cita haya sido aceptada o rechazada, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
 <dt class="cap-portal">configuración avanzada, <a class="indexterm" href="ox.appsuite.user.sect.portal.settings.html">Ajustes del portal</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Ajustes de la libreta de direcciones</a>
 </dt>
-<dt class="">recibir notificación como creador de la cita cuando los participantes acepten o rechacen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
+<dt class="">Recibir notificación como creador de la cita cuando los participantes acepten o rechacen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
-<dt class="">recibir notificación como participante de la cita cuando otros participantes acepten o rechacen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
+<dt class="">Recibir notificación como participante de la cita cuando otros participantes acepten o rechacen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
 <dt class="">recibir notificaciones cuando se ha creado, modificado o borrado, una cita en la que participa, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
@@ -893,6 +917,8 @@
 </dt>
 <dt class="cap-contacts">suscribirse a libretas de direcciones públicas y compartidas, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Suscribirse a libretas de direcciones públicas y compartidas</a>
 </dt>
+<dt class="feat-io-ox-core-categories">usar categorías, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a>
+</dt>
 <dt class="cap-contacts">ver adjunto, <a class="indexterm" href="ox.appsuite.user.sect.contacts.attachments.html">Visualización o guardado de adjuntos de contactos</a>
 </dt>
 <dt class="cap-contacts">visualizar, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.html">Visualización de contactos</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualización de los contactos de una libreta de direcciones</a>
@@ -904,9 +930,9 @@
 <dd><dl>
 <dt class="">cambiar, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.changepassword.html">Modificación de la contraseña</a>
 </dt>
-<dt class="cap-guard">cambiar contraseña de Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
+<dt class="cap-guard">cambiar contraseña de Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Cambiar la contraseña</a>
 </dt>
-<dt class="cap-guard">restablecer la contraseña de Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
+<dt class="cap-guard">restablecer la contraseña de Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">restablecer la contraseña</a>
 </dt>
 <dt class="">Uso de contraseñas de aplicación, <a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">Uso de contraseñas de aplicación</a>
 </dt>
@@ -922,43 +948,16 @@
 </dl></dd>
 <dt class="">correo</dt>
 <dd><dl>
-<dt class="cap-guard">borrar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
-</dt>
-<dt class="cap-guard">cifrar correos entrantes, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Cifrado de correos entrantes mediante una regla de filtrado</a>
-</dt>
-<dt class="cap-guard">enviar correos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a>
-</dt>
-<dt class="">imágenes externas, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Imágenes vinculadas externamente en correos</a>
-</dt>
-<dt class="cap-guard">leer correos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Lectura de correos cifrados</a>
-</dt>
-<dt class="cap-guard">mostrar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
-</dt>
-<dt class="">sonidos de notificación, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
-</dt>
-<dt class="cap-guard">verificar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
-</dt>
-<dt class="cap-infostore">visualizar adjuntos, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Visualización de adjuntos de correo en Ficheros</a>
-</dt>
-</dl></dd>
-<dt class="cap-webmail">Correo</dt>
-<dd><dl>
 <dt class="cap-webmail">Administrar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a>
 </dt>
-<dt class="cap-webmail">añadir adjuntos, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a>
+<dt class="cap-webmail">añadir adjuntos, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a>
 </dt>
 <dt class="cap-webmail">añadir adjuntos de correos ya existentes, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a>
 </dt>
 <dt class="cap-portal">añadir al portal, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.addportal.html">Añadir un correo al portal</a>
 </dt>
-<dt class="feat-io-ox-core-enterprisePicker">añadir automáticamente desde el directorio de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Adición automática de Contactos o Recursos desde el Directorio de Direcciones</a>
-</dt>
-<dt class="cap-contacts">añadir automáticamente desde libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Adición automática de Contactos o Recursos desde una libreta de direcciones</a>
-</dt>
 <dt class="cap-webmail">añadir carpeta, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Añadir carpetas de correo</a>
 </dt>
-<dt class="cap-webmail">añadir cuenta de correo, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a>
-</dt>
 <dt class="cap-webmail">archivar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">Archivado de correos</a>
 </dt>
 <dt class="cap-webmail">asignar color, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a>
@@ -967,69 +966,59 @@
 </dt>
 <dt class="cap-webmail">borrar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a>
 </dt>
+<dt class="cap-guard">borrar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
+</dt>
 <dt class="cap-webmail">buscar, <a class="indexterm" href="ox.appsuite.user.sect.email.search.html">Búsqueda de correos</a>
 </dt>
 <dt class="cap-webmail">Categorías de la bandeja de entrada, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a>
 </dt>
-<dt class="cap-webmail">clasificar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a>
-</dt>
-<dt class="cap-share_links cap-share_mail_attachments">compartir, ver compartido, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a>
+<dt class="cap-guard">cifrar correos entrantes, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Cifrado de correos entrantes mediante una regla de filtrado</a>
 </dt>
-<dt class="cap-webmail">configuración, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+<dt class="cap-webmail">clasificar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a>
 </dt>
 <dt class="cap-webmail">copiar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Mover o copiar correos</a>
 </dt>
-<dt class="cap-webmail">correo unificado, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a>
+<dt class="cap-webmail">Correo unificado, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a>
 </dt>
 <dt class="cap-tasks">crear recordatorio, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.reminder.html">Creación de recordatorios de correo</a>
 </dt>
-<dt class="cap-webmail">desactivar o activar cuentas de correo instrumentales, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Desactivar o activar de cuentas de correo instrumentales</a>
-</dt>
-<dt class="cap-deputy">editar, administrar como representante, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a>
-</dt>
-<dt class="cap-webmail">enviar, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
+<dt class="cap-webmail">enviar, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a>
 </dt>
 <dt class="cap-calendar">enviar a participantes en citas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attendees.html">Envío de un correo a participantes de citas</a>
 </dt>
-<dt class="cap-deputy">enviar como representante, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a>
+<dt class="cap-infostore">enviar adjuntos como enlace, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">enviar adjuntos como enlace</a>
 </dt>
-<dt class="cap-webmail">enviar desde la libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envío de correos desde una libreta de direcciones</a>
+<dt class="cap-guard">enviar correos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a>
 </dt>
 <dt class="cap-webmail">enviar un aviso de ausencia, <a class="indexterm" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Envío de un aviso de ausencia automático</a>
 </dt>
-<dt class="cap-infostore">Envío de adjuntos como enlace, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envío de adjuntos como enlace</a>
-</dt>
 <dt class="feat-io-ox-core-mailPDFExport">exportar como PDF, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exportación de correos como PDF</a>
 </dt>
 <dt class="cap-webmail">filtros, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Uso de filtros de correo</a>
 </dt>
-<dt class="cap-webmail">guardar adjunto, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a>
-</dt>
 <dt class="cap-webmail">guardar como EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">Almacenamiento de correos</a>
 </dt>
-<dt class="cap-guard">importar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importación de claves de Autocrypt</a>
+<dt class="">imágenes externas, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Imágenes vinculadas externamente en correos</a>
 </dt>
 <dt class="cap-webmail">importar de EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importación de correos</a>
 </dt>
-<dt class="cap-webmail">imprimir, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a>
+<dt class="cap-guard">leer correos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Lectura de correos cifrados</a>
 </dt>
 <dt class="cap-webmail">limpiar carpetas, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a>
 </dt>
-<dt class="cap-webmail cap-switchboard">llamar al remitente o a otro destinatario, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a>
-</dt>
 <dt class="cap-webmail">marcar carpeta como leída, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a>
 </dt>
 <dt class="cap-webmail">marcar como leído, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a>
 </dt>
-<dt class="cap-webmail">marcar como leído, ajuste para, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
-</dt>
 <dt class="cap-webmail">marcar como no leído, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a>
 </dt>
-<dt class="cap-webmail">mostrar código fuente del correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Mostrar código fuente del correo</a>
+<dt class="cap-guard">mostrar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
 </dt>
 <dt class="cap-webmail">mover, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Mover o copiar correos</a>
 </dt>
-<dt class="cap-webmail">recopilar direcciones, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Recopilación de direcciones</a>
+<dt class="cap-webmail">Recuperar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a>
+</dt>
+<dt class="cap-dumpster">recuperar correos borrados permanentemente, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a>
 </dt>
 <dt class="cap-webmail">reenviar automáticamente, <a class="indexterm" href="ox.appsuite.user.sect.email.send.autoforward.html">Reenvío automático de correos</a>
 </dt>
@@ -1037,27 +1026,40 @@
 </dt>
 <dt class="cap-webmail">responder, <a class="indexterm" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a>
 </dt>
-<dt class="cap-webmail">seleccionar una dirección de remite, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a>
+<dt class="cap-webmail">seleccionar una dirección de remite, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a>
 </dt>
-<dt class="cap-guard">transferir claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Transferencia de claves de Autocrypt a otros clientes</a>
+<dt class="">sonidos de notificación, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
 <dt class="cap-webmail">usar borrador, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">Uso de borradores de correo</a>
 </dt>
-<dt class="cap-webmail">usar firmas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a>
-</dt>
-<dt class="feat-io-ox-core-openai">usar funciones de AI al redactar correos, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Uso de funciones de AI al redactar correos</a>
-</dt>
 <dt class="feat-io-ox-core-openai">usar funciones de AI en respuestas, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">Uso de funciones de AI al responder a correos</a>
 </dt>
 <dt class="feat-io-ox-core-openai">usar integración con AI, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Uso de la integración con AI</a>
 </dt>
-<dt class="feat-io-ox-core-templates">usar plantillas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a>
-</dt>
-<dt class="cap-webmail">ver adjunto, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a>
+<dt class="cap-guard">verificar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
 </dt>
 <dt class="cap-webmail">visualizar, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a>
 </dt>
 </dl></dd>
+<dt class="cap-contacts">Correo</dt>
+<dd><dl>
+<dt class="feat-io-ox-core-enterprisePicker">añadir automáticamente desde el directorio de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Adición automática de Contactos o Recursos desde el Directorio de Direcciones</a>
+</dt>
+<dt class="cap-contacts">añadir automáticamente desde libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Adición automática de Contactos o Recursos desde una libreta de direcciones</a>
+</dt>
+<dt class="cap-share_links cap-share_mail_attachments">compartir, ver compartido, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a>
+</dt>
+<dt class="cap-webmail">desactivar o activar cuentas de correo instrumentales, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Desactivar o activar de cuentas de correo instrumentales</a>
+</dt>
+<dt class="cap-webmail">enviar desde la libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envío de correos desde una libreta de direcciones</a>
+</dt>
+<dt class="cap-guard">importar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importación de claves de Autocrypt</a>
+</dt>
+<dt class="cap-guard">transferir claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Transferencia de claves de Autocrypt a otros clientes</a>
+</dt>
+<dt class="cap-infostore">visualizar adjuntos, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Visualización de adjuntos de correo en Ficheros</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">
       Correo electrónico
       
@@ -1071,28 +1073,60 @@
   </a>
 </dt>
 <dd><dl>
+<dt class="cap-webmail">añadir cuenta de correo, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a>
+</dt>
+<dt class="cap-webmail">barra de categorías de la bandeja de entrada, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de categorías de la bandeja de entrada</a>
+</dt>
 <dt class="cap-webmail">barra de herramientas, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de Correo electrónico</a>
 </dt>
-<dt class="cap-webmail">barra de pestañas, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de pestañas de Correo electrónico</a>
+<dt class="cap-webmail">borrar permanentemente, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a>
 </dt>
 <dt class="cap-webmail">Botón Nuevo correo, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.new.html">El botón Nuevo correo</a>
 </dt>
 <dt class="cap-webmail">componentes, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.html">Los componentes de Correo electrónico</a>
 </dt>
+<dt class="cap-webmail">configuración, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+</dt>
+<dt class="cap-deputy">editar, administrar como representante, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a>
+</dt>
 <dt class="cap-webmail">el menú Configuración, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">El menú de configuración de Correo electrónico</a>
 </dt>
+<dt class="cap-deputy">enviar como representante, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a>
+</dt>
+<dt class="cap-webmail">guardar adjunto, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a>
+</dt>
+<dt class="cap-webmail">imprimir, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a>
+</dt>
+<dt class="cap-webmail cap-switchboard">llamar al remitente o a otro destinatario, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a>
+</dt>
+<dt class="cap-webmail">marcar como leído, ajuste para, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
+</dt>
+<dt class="cap-webmail">mostrar código fuente del correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Mostrar código fuente del correo</a>
+</dt>
+<dt class="cap-webmail">recopilar direcciones, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Recopilación de direcciones</a>
+</dt>
+<dt class="cap-webmail">usar firmas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a>
+</dt>
+<dt class="feat-io-ox-core-openai">usar funciones de AI al redactar correos, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Uso de funciones de AI al redactar correos</a>
+</dt>
+<dt class="feat-io-ox-core-templates">usar plantillas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a>
+</dt>
+<dt class="feat-io-ox-core-categories">utilizar categorías, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
+</dt>
 <dt class="cap-webmail">ventana de edición, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.create.html">La ventana de edición de correo</a>
 </dt>
 <dt class="cap-webmail">ventana emergente, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.popup.html">El elemento emergente de Correo electrónico</a>
 </dt>
-<dt class="cap-webmail">vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de Correo electrónico</a>
+<dt class="cap-webmail">ver adjunto, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a>
+</dt>
+<dt class="cap-webmail">Vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de Correo electrónico</a>
 </dt>
 <dt class="cap-webmail">vista de detalle, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de Correo electrónico</a>
 </dt>
 <dt class="cap-webmail">vista de lista, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de Correo electrónico</a>
 </dt>
 </dl></dd>
-<dt class="cap-webmail">correo unificado, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a>
+<dt class="cap-webmail">Correo unificado, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a>
 </dt>
 <dt class="cap-webmail">Correo, consulte Correo electrónico, <a class="indexterm" href="ox.appsuite.user.chap.email.html">
     Correo electrónico
@@ -1150,7 +1184,7 @@
 <div class="indexdiv">
 <h3>D</h3>
 <dl>
-<dt class="">datos de contacto personales, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Cambio de datos personales de contacto</a>
+<dt class="">Datos de contacto personales, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Cambio de datos personales de contacto</a>
 </dt>
 <dt class="">Definiciones, <a class="indexterm" href="ox.appsuite.user.sect.about.glossary.html">Terminología</a>
 </dt>
@@ -1233,14 +1267,14 @@
 <dd><dl>
 <dt class="cap-contacts">contactos como vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envío de contactos como vCard</a>
 </dt>
-<dt class="cap-webmail">correo electrónico, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a>
 </dt>
 </dl></dd>
 <dt class="cap-switchboard">Establece el estado de presencia, <a class="indexterm" href="ox.appsuite.user.sect.settings.presencestatus.html">Establecer el estado de presencia</a>
 </dt>
 <dt class="">Estructura de carpetas</dt>
 <dd><dl>
-<dt class="">Favoritos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Añadir carpetas a favoritos</a>
+<dt class="">favoritos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Añadir carpetas a favoritos</a>
 </dt>
 <dt class="">navegar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Navegación por el árbol de carpetas</a>
 </dt>
@@ -1286,6 +1320,8 @@
   </a>
 </dt>
 <dd><dl>
+<dt class="cap-infostore">ajustes, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
+</dt>
 <dt class="cap-portal">Añadir archivos al portal, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.addportal.html">Añadir archivos al portal</a>
 </dt>
 <dt class="cap-infostore">añadir archivos o carpetas a Favoritos, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.favorite.html">Añadir archivos o carpetas de Ficheros a Favoritos</a>
@@ -1308,8 +1344,6 @@
 </dt>
 <dt class="cap-infostore">componentes, <a class="indexterm" href="ox.appsuite.user.sect.drive.gui.html">Los componentes de Ficheros</a>
 </dt>
-<dt class="cap-infostore">configuración, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Configuración de Ficheros</a>
-</dt>
 <dt class="cap-infostore">Copia de archivos, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.copy.html">Copia de archivos</a>
 </dt>
 <dt class="cap-infostore">Creación o edición de descripciones, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creación o edición de descripciones</a>
@@ -1400,7 +1434,7 @@
 <dl>
 <dt class="feat-io-ox-core-resourceCalendars">Grupo de calendarios de recursos</dt>
 <dd><dl>
-<dt class="feat-io-ox-core-resourceCalendars">Añadir calendarios de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creación de calendarios de recursos y grupos de calendarios de recursos</a>
+<dt class="feat-io-ox-core-resourceCalendars">añadir calendarios de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creación de calendarios de recursos y grupos de calendarios de recursos</a>
 </dt>
 <dt class="feat-io-ox-core-resourceCalendars">crear, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creación de calendarios de recursos y grupos de calendarios de recursos</a>
 </dt>
@@ -1420,19 +1454,21 @@
 </dt>
 <dt class="cap-guard">abrir documentos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.open.html">Apertura de documentos cifrados</a>
 </dt>
-<dt class="cap-guard">administración de claves, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a>
+<dt class="cap-guard">Administración de claves, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a>
 </dt>
 <dt class="cap-guard">administración de contraseñas, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
 </dt>
+<dt class="cap-guard">administrar claves PGP de los destinatarios, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Administración de claves PGP de destinatarios</a>
+</dt>
 <dt class="cap-guard">administrar claves PGP propias, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a>
 </dt>
 <dt class="cap-smime">administrar claves propias S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a>
 </dt>
-<dt class="cap-guard">administrar claves públicas, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves públicas</a>
+<dt class="cap-guard">administrar claves S/MIME de destinatarios, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Administrar claves S/MIME de destinatarios</a>
 </dt>
 <dt class="cap-guard">borrar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
 </dt>
-<dt class="cap-guard">cambiar contraseña, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
+<dt class="cap-guard">cambiar contraseña, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Cambiar la contraseña</a>
 </dt>
 <dt class="cap-guard">cerrar sesión, <a class="indexterm" href="ox.appsuite.user.sect.guard.logout.html">Cierre de sesión de Guard</a>
 </dt>
@@ -1458,17 +1494,19 @@
 </dt>
 <dt class="cap-guard">descifrar archivos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.decrypt.html">Descifrado de archivos</a>
 </dt>
+<dt class="cap-guard">eliminar la función de restablecimiento de contraseña, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Eliminación de la función de restablecimiento de contraseña</a>
+</dt>
 <dt class="cap-guard">enviar correos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a>
 </dt>
 <dt class="cap-guard">guardar documentos seleccionados en un formato cifrado, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Guardar documentos seleccionados en formato cifrado</a>
 </dt>
-<dt class="cap-guard">importación de claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importación de claves de Autocrypt</a>
+<dt class="cap-guard">importar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importación de claves de Autocrypt</a>
 </dt>
 <dt class="cap-guard">leer correos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Lectura de correos cifrados</a>
 </dt>
 <dt class="cap-guard">mostrar claves de Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestión de claves de Autocrypt</a>
 </dt>
-<dt class="cap-guard">restablecer la contraseña, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
+<dt class="cap-guard">restablecer la contraseña, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">restablecer la contraseña</a>
 </dt>
 <dt class="cap-guard">Transferir claves de Autocrypt a otros clientes, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Transferencia de claves de Autocrypt a otros clientes</a>
 </dt>
@@ -1494,20 +1532,18 @@
 </dt>
 </dl></dd>
 <dt class="cap-webmail">importar</dt>
-<dd><dl>
-<dt class="cap-contacts">contactos en formato CSV, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a>
-</dt>
-<dt class="cap-contacts">contactos en formato vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a>
-</dt>
-<dt class="cap-webmail">Correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importación de correos</a>
-</dt>
-</dl></dd>
+<dd><dl><dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importación de correos</a>
+</dt></dl></dd>
 <dt class="cap-calendar">Importar</dt>
 <dd><dl>
-<dt class="cap-calendar">Calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importación de calendarios desde archivos</a>
+<dt class="cap-calendar">calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importación de calendarios desde archivos</a>
 </dt>
 <dt class="cap-calendar">citas, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importación de citas</a>
 </dt>
+<dt class="cap-contacts">contactos en formato CSV, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a>
+</dt>
+<dt class="cap-contacts">contactos en formato vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a>
+</dt>
 <dt class="cap-tasks">tareas, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importación de tareas</a>
 </dt>
 </dl></dd>
@@ -1517,7 +1553,7 @@
 </dt>
 <dt class="cap-contacts">contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.print.html">Impresión de contactos</a>
 </dt>
-<dt class="cap-webmail">correo electrónico, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a>
 </dt>
 <dt class="cap-infostore">documentos, archivos de texto, imágenes, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Impresión de archivos como PDF</a>
 </dt>
@@ -1587,7 +1623,7 @@
 <dl>
 <dt class="cap-webmail cap-switchboard">Jitsi</dt>
 <dd><dl>
-<dt class="cap-contacts cap-switchboard">Llamar a contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
+<dt class="cap-contacts cap-switchboard">llamar a contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">llamar a los participantes de la cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a>
 </dt>
@@ -1595,7 +1631,7 @@
 </dt>
 <dt class="cap-webmail cap-switchboard">llamar al remitente o a otro destinatario, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a>
 </dt>
-<dt class="cap-calendar cap-switchboard">programar conferencias de audio/video, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a>
+<dt class="cap-calendar cap-switchboard">programar conferencias de audio/video, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a>
 </dt>
 </dl></dd>
 </dl>
@@ -1644,7 +1680,7 @@
 </dt>
 <dt class="cap-contacts">ventana de edición de lista de distribución, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.createlist.html">La ventana de edición de lista de distribución</a>
 </dt>
-<dt class="cap-contacts">vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista de carpeta de Libreta de direcciones</a>
+<dt class="cap-contacts">Vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista de carpeta de Libreta de direcciones</a>
 </dt>
 <dt class="cap-contacts">vista de detalle, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista de detalle de Libreta de direcciones</a>
 </dt>
@@ -1713,25 +1749,27 @@
 <dd><dl>
 <dt class="">Abrir área de notificación automáticamente, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
 </dt>
-<dt class="">Usar el área de notificación, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a>
-</dt>
-<dt class="">Uso de cuentas atrás para Citas, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
+<dt class="">usar el área de notificación, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a>
 </dt>
 </dl></dd>
 <dt class="">Notificaciones</dt>
-<dd><dl><dt class="">mostrar notificaciones de escritorio, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="">mostrar notificaciones de escritorio, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
+</dt>
+<dt class="">usar cuentas atrás para citas, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">Nuevo</dt>
 <dd><dl>
 <dt class="cap-tasks">añadir lista de tareas personales, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.personal.html">Adición de lista de tareas personales</a>
 </dt>
 <dt class="cap-infostore">archivos de texto, <a class="indexterm" href="ox.appsuite.user.sect.drive.text.html">Creación o edición de archivos de texto</a>
 </dt>
-<dt class="cap-calendar">Calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Adición de calendarios</a>
+<dt class="cap-calendar">calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Adición de calendarios</a>
 </dt>
 <dt class="cap-calendar">calendarios personales, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.personal.html">Adición de calendarios personales</a>
 </dt>
-<dt class="cap-webmail">Carpetas de correo, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Añadir carpetas de correo</a>
+<dt class="cap-webmail">carpetas de correo, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Añadir carpetas de correo</a>
 </dt>
 <dt class="cap-infostore">Carpetas de Ficheros, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.html">Ficheros: Añadir carpetas</a>, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.personal.html">Ficheros: creación de carpetas</a>
 </dt>
@@ -1739,7 +1777,7 @@
 </dt>
 <dt class="cap-contacts">contacto, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.create.html">Creación de un nuevo contacto</a>
 </dt>
-<dt class="cap-webmail">correo electrónico, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a>
 </dt>
 <dt class="cap-guard">crear archivos cifrados, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.upload.html">Subida de archivos de forma segura mediante cifrado</a>
 </dt>
@@ -1777,20 +1815,23 @@
 <dt class="cap-infostore">PDF, imprimir archivo como, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Impresión de archivos como PDF</a>
 </dt>
 </dl></dd>
-<dt class="">permisos</dt>
+<dt class="">Permisos</dt>
 <dd><dl>
 <dt class="cap-share_links cap-share_mail_attachments">administrador, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">¿Qué permisos se pueden usar?</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">aplicación, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">¿Qué permisos se pueden usar?</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">autor, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">¿Qué permisos se pueden usar?</a>
-</dt>
 <dt class="">definición, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">¿Cuál es la finalidad de los permisos?</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">ejemplos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">Casos de uso de permisos</a>
-</dt>
 <dt class="cap-share_links cap-share_mail_attachments">espectador, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">¿Qué permisos se pueden usar?</a>
 </dt>
+</dl></dd>
+<dt class="cap-share_links cap-share_mail_attachments">permisos</dt>
+<dd><dl>
+<dt class="cap-share_links cap-share_mail_attachments">autor, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">¿Qué permisos se pueden usar?</a>
+</dt>
+<dt class="cap-share_links cap-share_mail_attachments">ejemplos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">Casos de uso de permisos</a>
+</dt>
 <dt class="cap-share_links cap-share_mail_attachments">revisor, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">¿Qué permisos se pueden usar?</a>
 </dt>
 </dl></dd>
@@ -1824,15 +1865,22 @@
 </dt></dl></dd>
 <dt class="">Primeros pasos, <a class="indexterm" href="ox.appsuite.user.chap.firststeps.html">Primeros Pasos</a>
 </dt>
-<dt class="cap-calendar cap-switchboard">Programar conferencia, audio/video, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a>
+<dt class="cap-calendar cap-switchboard">Programación de conferencias de audio/vídeo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a>
 </dt>
-<dt class="cap-calendar cap-switchboard">Programar conferencias de audio/video, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a>
+<dt class="cap-calendar cap-switchboard">Programar conferencia, audio/video, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a>
 </dt>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>R</h3>
 <dl>
+<dt class="cap-webmail">Recuperar</dt>
+<dd><dl>
+<dt class="cap-webmail">correo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a>
+</dt>
+<dt class="cap-dumpster">correos borrados permanentemente, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a>
+</dt>
+</dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Recurso</dt>
 <dd><dl>
 <dt class="feat-io-ox-core-enterprisePicker">añadir automáticamente desde el directorio de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Adición automática de Contactos o Recursos desde el Directorio de Direcciones</a>
@@ -1841,7 +1889,7 @@
 </dt>
 <dt class="cap-edit_resource">usar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resources.html">Uso de recursos</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Uso de calendarios de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Uso de calendarios de recursos</a>
+<dt class="feat-io-ox-core-resourceCalendars">usar calendarios de recursos, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Uso de calendarios de recursos</a>
 </dt>
 <dt class="feat-io-ox-core-managedResources">uso, recursos administrados, <a class="indexterm" href="ox.appsuite.user.sect.calendar.managedresources.html">Uso de recursos administrados</a>
 </dt>
@@ -1871,7 +1919,7 @@
 </dl></dd>
 <dt class="cap-deputy">Representante</dt>
 <dd><dl>
-<dt class="cap-deputy">administrar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Administrar representantes</a>
+<dt class="cap-deputy">administrar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">administrar representantes</a>
 </dt>
 <dt class="cap-deputy">administrar correos, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a>
 </dt>
@@ -1940,7 +1988,7 @@
 </dt>
 <dt class="cap-calendar">calendarios iCal, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Suscripción a calendarios externos desde una url iCal</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">Carpetas de correo, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Suscripción a carpetas de correo compartidas o personales</a>
+<dt class="cap-share_links cap-share_mail_attachments">carpetas de correo, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Suscripción a carpetas de correo compartidas o personales</a>
 </dt>
 <dt class="cap-contacts">libreta de direcciones, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Suscripción a libretas de direcciones externas</a>
 </dt>
@@ -2023,11 +2071,13 @@
 </dt>
 <dt class="cap-contacts">suscribirse a listas de tareas públicas y compartidas, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Suscribirse a listas de tareas públicas y compartidas</a>
 </dt>
+<dt class="feat-io-ox-core-categories">usar categorías, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a>
+</dt>
 <dt class="cap-tasks">ventana de edición, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.create.html">La ventana de edición</a>
 </dt>
 <dt class="cap-tasks">ver adjunto, <a class="indexterm" href="ox.appsuite.user.sect.tasks.attachments.html">Visualización o almacenamiento de adjuntos de tareas</a>
 </dt>
-<dt class="cap-tasks">vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista de carpeta de Tareas</a>
+<dt class="cap-tasks">Vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista de carpeta de Tareas</a>
 </dt>
 <dt class="cap-tasks">vista de detalle, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.detailview.html">La vista de detalle de Tareas</a>
 </dt>
@@ -2036,7 +2086,7 @@
 </dl></dd>
 <dt class="cap-calendar cap-switchboard">Teléfono</dt>
 <dd><dl>
-<dt class="cap-contacts cap-switchboard">Llamar a contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
+<dt class="cap-contacts cap-switchboard">llamar a contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">llamar a los participantes de la cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a>
 </dt>
@@ -2050,7 +2100,9 @@
 <div class="indexdiv">
 <h3>U</h3>
 <dl>
-<dt class="">Usar el área de notificación, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a>
+<dt class="">Usar cuentas atrás para citas, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
+</dt>
+<dt class="">usar el área de notificación, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a>
 </dt>
 <dt class="cap-webmail">Usar firmas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a>
 </dt>
@@ -2060,8 +2112,6 @@
 </dt>
 <dt class="feat-io-ox-core-templates">Usar plantillas, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a>
 </dt>
-<dt class="">Uso de cuentas atrás para Citas, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
-</dt>
 <dt class="">Uso en dispositivos móviles, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.mobile.html">Notas sobre el uso en dispositivos móviles</a>
 </dt>
 </dl>
@@ -2086,12 +2136,13 @@
 </dt>
 <dt class="">vista de carpeta, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.foldertree.html">La vista de carpetas</a>
 </dt>
+<dt class="">Vista de carpeta</dt>
 <dd><dl>
 <dt class="">abrir, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Navegación por el árbol de carpetas</a>
 </dt>
 <dt class="">cambiar el ancho, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Navegación por el árbol de carpetas</a>
 </dt>
-<dt class="">Favoritos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Añadir carpetas a favoritos</a>
+<dt class="">favoritos, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Añadir carpetas a favoritos</a>
 </dt>
 <dt class="">ocultar carpetas, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.hide.html">Ocultar carpetas</a>
 </dt>
@@ -2100,7 +2151,7 @@
 </dt>
 <dt class="">Vista de lista, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.list.html">La vista de lista</a>
 </dt>
-<dt class="cap-webmail cap-calendar cap-tasks">vista halo, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualización de contactos en la vista halo</a>
+<dt class="cap-webmail cap-calendar cap-tasks">Vista halo, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualización de contactos en la vista halo</a>
 </dt>
 <dt class="">Vista halo, consulte elemento emergente, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.popup.html">La ventana emergente</a>
 </dt>
@@ -2194,7 +2245,7 @@
 </dl></dd>
 <dt class="cap-webmail cap-switchboard">Zoom</dt>
 <dd><dl>
-<dt class="cap-contacts cap-switchboard">Llamar a contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
+<dt class="cap-contacts cap-switchboard">llamar a contactos, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">llamar a los participantes de la cita, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a>
 </dt>
@@ -2202,7 +2253,7 @@
 </dt>
 <dt class="cap-webmail cap-switchboard">llamar al remitente o a otro destinatario, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a>
 </dt>
-<dt class="cap-calendar cap-switchboard">programar conferencia de audio/video, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a>
+<dt class="cap-calendar cap-switchboard">programar conferencia de audio/video, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a>
 </dt>
 </dl></dd>
 </dl>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.about.glossary.html b/help/l10n/es_MX/ox.appsuite.user.sect.about.glossary.html
index 472b09222..e87cd00f8 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.about.glossary.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.about.glossary.html
@@ -47,10 +47,17 @@
 </dd>
 <dt class="feat-io-ox-core-categories" id="ox.appsuite.user.reference.about.glossary.categories"><span class="glossterm">Categorías</span></dt>
 <dd class="glossdef feat-io-ox-core-categories">
-<p role="presentation">Las categorías se pueden utilizar para clasificar citas, contactos y tareas. De esa manera, los objetos relacionados semánticamente se pueden identificar y encontrar fácilmente. Dependiendo de la configuración, están predefinidas categorías específicas. Puede establecer sus propias categorías.</p>
-<p role="presentation">Nota: Dichas categorías no se pueden usar para correos. Para los correos hay pestañas de la bandeja de entrada.</p>
+<p role="presentation">Las categorías le permiten clasificar correos, citas, contactos y tareas en las aplicaciones, independientemente de la estructura de carpetas. Esto permite identificar y encontrar más fácilmente objetos relacionados lógicamente, por ejemplo, todos los correos, citas, contactos y tareas que pertenecen a un proyecto o cliente específicos. Dependiendo de la configuración, hay categorías específicas predefinidas. Puede configurar sus propias categorías.</p>
+<p role="presentation">Nota: Para correos, también puede usar pestañas de la bandeja de entrada.</p>
 <p role="presentation">Temas relacionados: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a></p></li></ul></p>
 </dd>
+<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Categorías de la bandeja de entrada</span></dt>
+<dd class="glossdef cap-webmail">
+<p role="presentation">Las pestañas de la bandeja de entrada proporcionan una forma simple y sencilla de mantener ordenada la <span class="guilabel"><strong>Bandeja de entrada</strong></span>. Usando pestañas, los correos entrantes se guardan separados por remitente en la carpeta <span class="guilabel"><strong>Bandeja de entrada</strong></span>. Dependiendo de la configuración, están predefinidas pestañas de bandeja de entrada específicas. Se pueden definir pestañas adicionales de acuerdo a sus necesidades.</p>
+<p role="presentation">Las pestañas de la bandeja de entrada solo se pueden usar en la carpeta <span class="guilabel"><strong>Bandeja de entrada</strong></span>. Si necesita más opciones de almacenamiento, utilice la vista de carpeta para crear carpetas de correo.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Nota: Las categorías de la bandeja de entrada descritas aquí solo se pueden usar para correos. Dependiendo de la configuración, puede usar categorías separadas para correos, citas, contactos y tareas.</p>
+<p role="presentation">Temas relacionados: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a></p></li></ul></p>
+</dd>
 <dt id="ox.appsuite.user.reference.about.glossary.account"><span class="glossterm">Cuenta</span></dt>
 <dd class="glossdef">
 <p role="presentation">Una cuenta, o una cuenta de usuario, es un permiso de acceso a un sistema informático. Ejemplos de cuentas: <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -144,13 +151,6 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.user">Usuario</a></p>
 </li></ul></p>
 </dd>
-<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Pestañas de la bandeja de entrada</span></dt>
-<dd class="glossdef cap-webmail">
-<p role="presentation">Las pestañas de la bandeja de entrada proporcionan una forma simple y sencilla de mantener ordenada la <span class="guilabel"><strong>Bandeja de entrada</strong></span>. Usando pestañas, los correos entrantes se guardan separados por remitente en la carpeta <span class="guilabel"><strong>Bandeja de entrada</strong></span>. Dependiendo de la configuración, están predefinidas pestañas de bandeja de entrada específicas. Se pueden definir pestañas adicionales de acuerdo a sus necesidades.</p>
-<p role="presentation">Las pestañas de la bandeja de entrada solo se pueden usar en la carpeta <span class="guilabel"><strong>Bandeja de entrada</strong></span>. Si necesita más opciones de almacenamiento, utilice la vista de carpeta para crear carpetas de correo.</p>
-<p role="presentation" class="feat-io-ox-core-categories">Nota: Las pestañas de la bandeja de entrada descritas aquí solo se pueden usar para correos. Dependiendo de la configuración, puede usar categorías separadas para citas, contactos y tareas.</p>
-<p role="presentation">Temas relacionados: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a></p></li></ul></p>
-</dd>
 <dt class="cap-calendar" id="ox.appsuite.user.reference.about.glossary.resource"><span class="glossterm">Recurso</span></dt>
 <dd class="glossdef cap-calendar">
 <p role="presentation">Los recursos son salas o dispositivos que se pueden agregar a una cita. Un recurso consta de un nombre de recurso, una dirección de correo y una descripción opcional.</p>
@@ -181,7 +181,7 @@
 <li class="listitem"><p role="presentation">planificar, editar u organizar las citas de otro usuario</p></li>
 </ul></p>
 <p role="presentation">Temas relacionados: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Administrar representantes</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">administrar representantes</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creación, edición o gestión de citas como representante</a></p>
 </li></ul></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.alarms.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.alarms.html
index 199a6fd40..1667dc61a 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.alarms.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.alarms.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.display.html" title="Configuración de la visualización de una cita">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Añadir participantes o recursos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.alarms">
 <div class="titlepage"><div><div><h3 class="title">Uso de recordatorios de citas</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.12.2"></a><p id="ox.appsuite.user.concept.calendar.add.alarms">Al crear o editar una cita, puede configurar que se le recuerde la fecha de vencimiento de la cita. Para hacerlo, puede usar una o varias de las siguientes notificaciones: </p>
@@ -64,7 +64,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modificación de recordatorios de citas</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.alarms">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.alarms">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.attachments.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.attachments.html
index 46c0234f7..07e7bc2aa 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.attachments.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.attachments.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Añadir participantes o recursos">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Uso de la vista de planificación">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attachments">
 <div class="titlepage"><div><div><h3 class="title">Añadir adjuntos</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.14.2"></a><a class="indexterm" name="id-1.8.10.14.3"></a><p id="ox.appsuite.user.concept.calendar.add.attachments">Dependiendo de la configuración, se pueden adjuntar archivos guardados en su computadora o en la aplicación <span class="phrase">Ficheros</span>.</p>
@@ -65,7 +65,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.attachments">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attachments">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.attendees.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.attendees.html
index 8dc7cdf50..eefdc648e 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.attendees.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.attendees.html
@@ -1,11 +1,11 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Invitar participantes a una nueva cita</title>
+<title>Invitación de participantes a una nueva cita</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Creación de una cita de seguimiento">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="Invitación de destinatarios de correo a nuevas citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attendees">
-<div class="titlepage"><div><div><h3 class="title">Invitar participantes a una nueva cita</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Invitación de participantes a una nueva cita</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.17.2"></a><p id="ox.appsuite.user.concept.calendar.add.attendees">Si una cita tiene varios participantes, puede invitar a esos participantes a una nueva cita.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.add.attendees">
 <p class="title">Cómo invitar participantes a una nueva cita:</p>
@@ -67,10 +67,10 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.attendees">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attendees">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.call.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.call.html
index 857c3d2e2..f74c5c957 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.call.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.call.html
@@ -1,11 +1,11 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Programación de conferencias de audio o video</title>
+<title>Programación de conferencias de audio/vídeo</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Uso del selector de fecha">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Establecer cita periódica">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.call">
-<div class="titlepage"><div><div><h3 class="title">Programación de conferencias de audio o video</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Programación de conferencias de audio/vídeo</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.9.2"></a><a class="indexterm" name="id-1.8.10.9.3"></a><a class="indexterm" name="id-1.8.10.9.4"></a><a class="indexterm" name="id-1.8.10.9.5"></a><a class="indexterm" name="id-1.8.10.9.6"></a><p id="ox.appsuite.user.precondition.calendar.add.call">Requisito: Debe tener configurada una cuenta con un proveedor de conferencias de audio o video.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.add.call">
 <p class="title">Cómo programar una conferencia de audio o video en la ventana de edición de citas:</p>
@@ -71,7 +71,7 @@
 <p role="presentation" class="feat-jitsi"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.jitsi">Reuniones de Jitsi</a></p>
 <p role="presentation" class="feat-zoom"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.zoom">Reuniones de Zoom</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.call">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.call">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.conflicthandling.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.conflicthandling.html
index 1e5b09f5b..1069f44b9 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.conflicthandling.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.conflicthandling.html
@@ -1,11 +1,11 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>resolver conflictos</title>
+<title>Resolución de conflictos</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Crear citas desde adjuntos iCal">
 <link rel="next" href="ox.appsuite.user.sect.calendar.invitation.html" title="Responder a invitaciones de cita">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.conflicthandling">
-<div class="titlepage"><div><div><h3 class="title">resolver conflictos</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Resolución de conflictos</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.20.2"></a><p id="ox.appsuite.user.concept.calendar.add.conflicthandling">Se produce un conflicto cuando coinciden las siguientes circunstancias:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
@@ -82,7 +82,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.create.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.create.html
index 01fbd25ef..13ffa56b3 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.create.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.create.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Uso del selector de fecha">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.create">
 <div class="titlepage"><div><div><h3 class="title">Creación de nuevas citas</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.7.2"></a><a class="indexterm" name="id-1.8.10.7.3"></a><div class="task" id="ox.appsuite.user.task.calendar.add.create">
@@ -94,7 +94,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.datepicker.html">Uso del selector de fecha</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.serial.html">Establecer cita periódica</a></p>
-<p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a></p>
+<p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.display.html">Configuración de la visualización de una cita</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.alarms.html">Uso de recordatorios de citas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Añadir participantes o recursos</a></p>
@@ -107,16 +107,16 @@
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creación de citas usando el calendario de recursos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creación de una cita de seguimiento</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Invitación de destinatarios de correo a nuevas citas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Crear citas desde adjuntos iCal</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitar contactos a una cita</a></p>
 <p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.create">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.create">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.datepicker.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.datepicker.html
index ef05b4dcf..1d213e79f 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.datepicker.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.datepicker.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.create.html" title="Creación de nuevas citas">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.call.html" title="Programación de conferencias de audio o video">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.call.html" title="Programación de conferencias de audio/vídeo">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.datepicker">
 <div class="titlepage"><div><div><h3 class="title">Uso del selector de fecha</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.8.2"></a><p id="ox.appsuite.user.concept.calendar.add.datepicker">El selector de fecha permite seleccionar la fecha a introducir en un campo de fecha.</p>
@@ -87,7 +87,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Edición de tareas</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.datepicker">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.datepicker">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.display.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.display.html
index 34d4ecce7..cb7a0bbfe 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.display.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.display.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Establecer cita periódica">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Uso de recordatorios de citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.display">
 <div class="titlepage"><div><div><h3 class="title">Configuración de la visualización de una cita</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.11.2"></a><p id="ox.appsuite.user.concept.calendar.add.display">Existen las siguientes posibilidades: </p>
@@ -75,7 +75,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">¿Cómo se muestran las citas en una vista de calendario? </a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.display">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.display">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.followup.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.followup.html
index d03cdfe61..e1d4386ab 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.followup.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.followup.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Uso de la vista de planificación">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Invitar participantes a una nueva cita">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Invitación de participantes a una nueva cita">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.followup">
 <div class="titlepage"><div><div><h3 class="title">Creación de una cita de seguimiento</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.16.2"></a><a class="indexterm" name="id-1.8.10.16.3"></a><p id="ox.appsuite.user.concept.calendar.add.followup">Se puede crear una cita de seguimiento para una cita ya existente. La cita de seguimiento aparece ya rellenada con los datos fundamentales de la cita existente.</p>
@@ -64,10 +64,10 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.followup">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.followup">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.html
index 02ce27e5e..394e4b4ca 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.html
@@ -1,7 +1,7 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>crear citas</title>
+<title>Creación de citas</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
@@ -36,12 +36,12 @@
     
   </h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.add">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">crear citas</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Creación de citas</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.calendar.add">Aprenda cómo crear una cita y las funciones disponibles para definir sus datos: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.datepicker.html">Uso del selector de fecha</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.8.10.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.8.10.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.serial.html">Establecer cita periódica</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.display.html">Configuración de la visualización de una cita</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.alarms.html">Uso de recordatorios de citas</a></p></li>
@@ -49,10 +49,10 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attachments.html">Añadir adjuntos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creación de una cita de seguimiento</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Invitación de destinatarios de correo a nuevas citas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Crear citas desde adjuntos iCal</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.hint.calendar.add">Notas: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.icalattachment.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.icalattachment.html
index 715fe564f..59a628f3c 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.icalattachment.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.icalattachment.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="Invitación de destinatarios de correo a nuevas citas">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="resolver conflictos">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Resolución de conflictos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.icalattachment">
 <div class="titlepage"><div><div><h3 class="title">Crear citas desde adjuntos iCal</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.19.2"></a><a class="indexterm" name="id-1.8.10.19.3"></a><p id="ox.appsuite.user.concept.calendar.add.icalattachment">Puede crear una cita desde un adjunto de correo iCal. Un adjunto iCal puede identificarse por la extensión .ics.</p>
@@ -54,12 +54,12 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a>
             </p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a>
             </p></li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.participants.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.participants.html
index 520fdd49b..0ccf110ee 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.participants.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.participants.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Uso de recordatorios de citas">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Añadir adjuntos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.participants">
 <div class="titlepage"><div><div><h3 class="title">Añadir participantes o recursos</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.13.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.participants">
@@ -67,6 +67,7 @@
 <li class="listitem"><p role="presentation">Si los participantes aceptan la cita, recibirá un correo.</p></li>
 </ul>
           <p role="presentation" class="feat-io-ox-core-managedResources">Nota: Al agregar un recurso administrado, el delegado de reserva recibe una solicitud de reserva para este recurso. Tan pronto como el delegado de la reserva acepte o rechace su solicitud de reserva del recurso, se le informará.</p>
+          
         </div>
 </div>
 <p id="ox.appsuite.user.tip.calendar.add.participants">Consejo: Para encontrar citas libres de todos los participantes y recursos puede <a class="link" href="ox.appsuite.user.sect.calendar.add.scheduling.html">usar la vista de planificación</a>.</p>
@@ -82,7 +83,7 @@
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Adición automática de Contactos o Recursos desde una libreta de direcciones</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Adición automática de Contactos o Recursos desde el Directorio de Direcciones</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.participants">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.participants">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.recipients.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.recipients.html
index 242b98452..a30d20158 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.recipients.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.recipients.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Invitar participantes a una nueva cita">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Invitación de participantes a una nueva cita">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Crear citas desde adjuntos iCal">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.recipients">
 <div class="titlepage"><div><div><h3 class="title">Invitación de destinatarios de correo a nuevas citas</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.18.2"></a><p id="ox.appsuite.user.concept.calendar.add.recipients">Puede invitar, a los destinatarios de un correo enviado o recibido, a una nueva cita.</p>
@@ -59,7 +59,7 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a>
             </p>
 </li>
 <li class="listitem" style="list-style-type: none">
@@ -67,13 +67,13 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a>
             </p>
 </li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.recipients">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.recipients">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.scheduling.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.scheduling.html
index 0dc365e16..ced1ab213 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.scheduling.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.scheduling.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Añadir adjuntos">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Creación de una cita de seguimiento">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.scheduling">
 <div class="titlepage"><div><div><h3 class="title">Uso de la vista de planificación</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.15.2"></a><a class="indexterm" name="id-1.8.10.15.3"></a><a class="indexterm" name="id-1.8.10.15.4"></a><a class="indexterm" name="id-1.8.10.15.5"></a><p id="ox.appsuite.user.concept.calendar.add.scheduling">Cuando se planifica una cita con varios participantes o recursos, la vista de Planificación muestra los periodos libres y ocupados de los usuarios y recursos.</p>
@@ -91,12 +91,12 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolver conflictos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolución de conflictos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy">Mostrar información de libre/ocupado a otros</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.scheduling">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.scheduling">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.serial.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.serial.html
index 1ff1b9cf3..38296563d 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.serial.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.add.serial.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.call.html" title="Programación de conferencias de audio o video">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.call.html" title="Programación de conferencias de audio/vídeo">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.display.html" title="Configuración de la visualización de una cita">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">crear citas</h2>
+<h2 class="sr-only">Creación de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.serial">
 <div class="titlepage"><div><div><h3 class="title">Establecer cita periódica</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.10.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.serial">
@@ -108,7 +108,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.serial.html">Creación de tareas periódicas</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.serial">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.serial">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.attachments.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.attachments.html
index 9e1a39d59..946283d3b 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.attachments.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Calendario">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.view.appointments.html" title="¿Cómo se muestran las citas en una vista de calendario?">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="crear citas">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="Creación de citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.call.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.call.html
index fa0e78972..7bc8b08cd 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.call.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.call.html
@@ -64,7 +64,7 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">Llamar a los participantes de la tarea</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.deputy.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.deputy.html
index 82132041c..9bbf88eb4 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.deputy.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.deputy.html
@@ -63,12 +63,12 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Administrar representantes</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">administrar representantes</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.deputy">Tema superior: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.edit.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.edit.html
index e4948d51f..725c5d940 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.edit.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.edit.html
@@ -116,7 +116,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.datepicker.html">Uso del selector de fecha</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.serial.html">Establecer cita periódica</a></p>
-<p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a></p>
+<p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.display.html">Configuración de la visualización de una cita</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.alarms.html">Uso de recordatorios de citas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Añadir participantes o recursos</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.create.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.create.html
index 93a70ff14..9bc3ee6d0 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.create.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.create.html
@@ -111,7 +111,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista de detalle de <span class="phrase">Calendario</span></a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
 <p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creación, edición o gestión de citas como representante</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a></p>
 </li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.detailview.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.detailview.html
index cb610406a..e7f968a0a 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.detailview.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.detailview.html
@@ -67,7 +67,7 @@
 <li class="listitem">
 <p role="presentation">Más datos de la cita, si se configura: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">adjuntos</p></li>
+<li class="listitem"><p role="presentation">Adjuntos</p></li>
 <li class="listitem"><p role="presentation">definición</p></li>
 <li class="listitem">
 <p role="presentation">organizador, destinatarios adicionales, recursos</p>
@@ -105,10 +105,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualización de contactos en la vista halo</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Cambio del estado de la cita</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modificación de recordatorios de citas</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.detailview">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Los componentes de <span class="phrase">Calendario</span></a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.foldertree.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.foldertree.html
index 84d707e78..b15b5f143 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.foldertree.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.foldertree.html
@@ -65,7 +65,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Visualización de citas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">Adición de calendarios personales</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Uso de colores del calendario</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creación de calendarios de recursos y grupos de calendarios de recursos</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.edit.html">Edición de calendarios de recursos</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creación de citas usando el calendario de recursos</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.list.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.list.html
index 72a87e72f..fb6893333 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.list.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.list.html
@@ -57,11 +57,11 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista de detalle de <span class="phrase">Calendario</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Visualización de citas en la distintas vistas</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.view.html">Visualización de calendarios de recursos</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.list">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Los componentes de <span class="phrase">Calendario</span></a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.new.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.new.html
index 118d240c8..edaa97c11 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.new.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.new.html
@@ -52,10 +52,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">Suscribirse a calendarios de Google</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Suscripción a calendarios públicos y compartidos</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.popup.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.popup.html
index 479938d9d..c28649fae 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.popup.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.popup.html
@@ -71,7 +71,7 @@
 <li class="listitem">
 <p role="presentation">Más datos de la cita, si se configura: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">adjuntos</p></li>
+<li class="listitem"><p role="presentation">Adjuntos</p></li>
 <li class="listitem"><p role="presentation">definición</p></li>
 <li class="listitem">
 <p role="presentation">organizador, destinatarios adicionales, recursos</p>
@@ -119,15 +119,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creación de una cita de seguimiento</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Cambio del estado de la cita</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modificación de recordatorios de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Cambio del organizador</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Mover citas a otro calendario</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exportación de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Impresión de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Borrado de citas</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Envío de un correo a participantes de citas</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.popup">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Los componentes de <span class="phrase">Calendario</span></a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.toolbar.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.toolbar.html
index b6097828e..95f0055eb 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.toolbar.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.gui.toolbar.html
@@ -72,18 +72,11 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creación de una cita de seguimiento</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Envío de un correo a participantes de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitar participantes a una nueva cita</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitación de participantes a una nueva cita</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modificación de recordatorios de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Cambio del organizador</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Mover citas a otro calendario</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exportación de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Impresión de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Borrado de citas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.toolbar">Tema superior: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Los componentes de <span class="phrase">Calendario</span></a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.invitation.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.invitation.html
index 9e5a35a30..ef72ec9f1 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.invitation.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.invitation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Calendario">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="resolver conflictos">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Resolución de conflictos">
 <link rel="next" href="ox.appsuite.user.sect.calendar.edit.html" title="Edición de citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.categories.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.categories.html
new file mode 100644
index 000000000..01944b0a4
--- /dev/null
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.categories.html
@@ -0,0 +1,106 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Uso de categorías para citas</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Gestión de citas">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Gestión de zonas horarias favoritas">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Uso de colores del calendario">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Calendario</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de citas</h2>
+<div class="sect2" id="ox.appsuite.user.sect.calendar.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Uso de categorías para citas</h3></div></div></div>
+<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><a class="indexterm" name="id-1.8.15.11.4"></a><p id="ox.appsuite.user.concept.calendar.manage.categories">Para organizar citas independientemente de los calendarios, puedes utilizar categorías. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Puede marcar citas con categorías.</p></li>
+<li class="listitem"><p role="presentation">Puede mostrar todas las citas que se han marcado con una categoría específica.</p></li>
+</ul>
+<p> Puede crear, editar o borrar categorías propias; consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>.</p>
+<div class="task" id="ox.appsuite.user.task.calendar.manage.categories">
+<p class="title">Cómo marcar citas con una categoría:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Dependiendo de la vista seleccionada, utilice las siguientes opciones: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Presione una cita en una vista del calendario. Presione el icono <span class="guibutton"><strong>Editar cita</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> en la ventana emergente.</p></li>
+<li class="listitem"><p role="presentation">Seleccione una cita en la vista de lista. Presione el icono <span class="guibutton"><strong>Editar cita</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> de la barra de herramientas.</p></li>
+</ul></p>
+<p role="presentation">Se abre la ventana de edición de citas.</p>
+</li>
+<li class="step">
+<p role="presentation">Para hacerlo, presione en <span class="guibutton"><strong>Añadir categoría</strong></span> ubicado junto a <span class="guibutton"><strong>Categorías</strong></span>. Seleccione una categoría.</p>
+<p role="presentation">Para eliminar una categoría de la cita, presione el icono <span class="guibutton"><strong>Eliminar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> que hay junto a la categoría.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.calendar.categories.view">
+<p class="title">Cómo mostrar citas que han sido marcadas con una categoría específica:</p>
+<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Dependiendo de la vista seleccionada, utilice las siguientes opciones: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">En una vista de calendario, presione en una cita que haya sido marcada con una categoría. En la ventana emergente, presione en la categoría.</p></li>
+<li class="listitem"><p role="presentation">En la vista de lista, seleccione una cita que haya sido marcada con una categoría. Presione en la categoría en la vista de detalle.</p></li>
+</ul></p></li></ul></div>
+<div class="taskrelated">
+          <p>Resultado: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vista de lista muestra todas las citas que se han marcado con esta categoría.</p></li>
+<li class="listitem"><p role="presentation">Para mostrar la vista anterior, presione en el icono <span class="guibutton"><strong>Cancelar búsqueda</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> en el campo de búsqueda.</p></li>
+</ul>
+          <p>Consejo: También puede utilizar la función de búsqueda buscando una categoría mediante las opciones de búsqueda.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.calendar.manage.categories">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Búsqueda de citas</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.calendar.manage.categories">Tema superior <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.changeorganizer.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
index 0d8405e50..6a893bca4 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
@@ -64,8 +64,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changeorganizer"></p>
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.changereminder.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.changereminder.html
index fb7ff7610..f000417b5 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.changereminder.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.changereminder.html
@@ -60,9 +60,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changereminder"></p>
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista de detalle de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.changestatus.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.changestatus.html
index 7d5377ccf..b8d3396f3 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.changestatus.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.changestatus.html
@@ -64,6 +64,7 @@
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista de detalle de <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.colors.html
index 55763dec7..71ea36387 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.colors.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.colors.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Gestión de citas">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Gestión de zonas horarias favoritas">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Uso de categorías para citas">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.move.html" title="Mover citas a otro calendario">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.move.html">Siguiente</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.colors">
 <div class="titlepage"><div><div><h3 class="title">Uso de colores del calendario</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">Se puede definir un color de calendario. De manera predeterminada, todas las citas de dicho calendario se mostrarán en el color del calendario. Si asigna un color individual a una cita al crearla o editarla, la cita se mostrará con el color asignado, no con el del calendario.</p>
+<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">Se puede definir un color de calendario. De manera predeterminada, todas las citas de dicho calendario se mostrarán en el color del calendario. Si asigna un color individual a una cita al crearla o editarla, la cita se mostrará con el color asignado, no con el del calendario.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.colors">
 <p class="title">Cómo seleccionar un color al calendario:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,19 +46,15 @@
 <li class="step"><p role="presentation">Seleccione un color del desplegable de selección de colores.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.colors">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.colors"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a></p></li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">¿Cómo se muestran las citas en una vista de calendario? </a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">¿Cómo se muestran las citas en una vista de calendario? </a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.colors">Tema superior <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.delete.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.delete.html
index 03f3988be..69c454696 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.delete.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Borrado de citas</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Advertencia:</strong></span> Las citas eliminadas <span class="phrase"><strong>no</strong></span> se podrán restaurar. Dependiendo de la configuración, sólo puede borrar una cita de sus calendarios privados si usted es el organizador de la cita.</p>
+<a class="indexterm" name="id-1.8.15.17.2"></a><a class="indexterm" name="id-1.8.15.17.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Advertencia:</strong></span> Las citas eliminadas <span class="phrase"><strong>no</strong></span> se podrán restaurar. Dependiendo de la configuración, sólo puede borrar una cita de sus calendarios privados si usted es el organizador de la cita.</p>
 <p id="ox.appsuite.user.concept.calendar.manage.delete">Puede borrar citas de un calendario si tiene permiso para borrar elementos.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.delete">
 <p class="title">Cómo eliminar citas:</p>
@@ -73,11 +73,14 @@
         </p>
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a>
+            </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a>
             </p>
 </li></ul>
 <p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.export.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.export.html
index fb6ee3f2f..b01e372c3 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.export.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exportación de citas</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">Puede exportar citas en formato iCal. Puede, por ejemplo, usar este formato para intercambiar citas con otras aplicaciones de calendario. Puede exportar citas individuales o todas las citas de un calendario.</p>
+<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">Puede exportar citas en formato iCal. Puede, por ejemplo, usar este formato para intercambiar citas con otras aplicaciones de calendario. Puede exportar citas individuales o todas las citas de un calendario.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.manage.export.selected">
 <p class="title">Cómo exportar citas individuales:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -65,14 +65,16 @@
 <p id="ox.appsuite.user.related.calendar.manage.export"></p>
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importación de citas</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.8.15.14.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.8.15.15.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.manage.export">Tema superior <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.html
index 9cef48973..ccf0d84b3 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.html
@@ -43,6 +43,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modificación de recordatorios de citas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Cambio del organizador</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Gestión de zonas horarias favoritas</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Uso de colores del calendario</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Mover citas a otro calendario</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importación de citas</a></p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.import.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.import.html
index 956293bca..c6e059935 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.import.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importación de citas</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><a class="indexterm" name="id-1.8.15.13.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">Puede importar citas de archivos en formato iCal.</p>
+<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">Puede importar citas de archivos en formato iCal.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.import">
 <p class="title">Cómo importar citas desde un archivo iCal:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -55,22 +55,16 @@
           <p>Nota: Se eliminarán todos los participantes de las citas importadas. En su lugar, se le agregará como participante.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.import"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a></p></li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exportación de citas</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importación de calendarios desde archivos</a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exportación de citas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importación de calendarios desde archivos</a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.import">Tema superior <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestión de citas</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.move.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.move.html
index bc05a5286..c0a4d832a 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.move.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.move.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Mover citas a otro calendario</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">Puede mover citas individuales a otro calendario, pero no citas periódicas.</p>
+<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">Puede mover citas individuales a otro calendario, pero no citas periódicas.</p>
 <p>Requisito: Debe tener los permisos adecuados para crear objetos en el calendario de destino.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.move">
 <p class="title">Cómo mover citas a otro calendario:</p>
@@ -57,8 +57,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.move"></p>
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.print.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.print.html
index 3799c6588..76c0e751e 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.print.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Impresión de citas</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><a class="indexterm" name="id-1.8.15.15.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">Para imprimir calendarios y citas puede: </p>
+<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><a class="indexterm" name="id-1.8.15.16.4"></a><a class="indexterm" name="id-1.8.15.16.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">Para imprimir calendarios y citas puede: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">imprimir una hoja de calendario con citas</p></li>
 <li class="listitem"><p role="presentation">imprimir los datos de una cita</p></li>
@@ -89,14 +89,20 @@
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">El menú de configuración de <span class="phrase">Calendario</span></a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">El menú de configuración de <span class="phrase">Calendario</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a>
             </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista de lista de <span class="phrase">Calendario</span></a>
+            </p>
 </li></ul>
 <p>
       </p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.timezones.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.timezones.html
index 2791e1d73..65665119b 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.timezones.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.manage.timezones.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Gestión de citas">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Cambio del organizador">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Uso de colores del calendario">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Uso de categorías para citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.search.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.search.html
index f501984f8..707873472 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.search.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.search.html
@@ -89,7 +89,7 @@
             <a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Visualización de citas en la distintas vistas</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.settings.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.settings.html
index 05657e266..7fa813498 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.settings.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.settings.html
@@ -74,7 +74,7 @@
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek"><b>Semana laboral. </b><a class="indexterm" name="id-1.8.22.6.2.1.2.1.2"></a></p>
+<p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek"><b>Semana de trabajo. </b><a class="indexterm" name="id-1.8.22.6.2.1.2.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek.start"><b>Primer día. </b>Define el comienzo de una semana laboral.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek.length"><b>Duración. </b>Determina el número de días de una semana laboral.</p></li>
@@ -103,8 +103,8 @@
 <p id="ox.appsuite.user.reference.calendar.settings.jitsi"></p>
 <h3 class="title">Reuniones de Jitsi</h3>
 <p><a class="indexterm" name="id-1.8.22.9.2"></a>Con esas opciones se puede definir el comportamiento si se selecciona <span class="guibutton"><strong>Reunión de Jitsi</strong></span> en el desplegable <span class="guibutton"><strong>Conferencia</strong></span> al crear citas. </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>Copiar enlace a la ubicación automáticamente. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Determina si el enlace para la participación en la reunión de Jitsi se copiará al campo <span class="guibutton"><strong>Ubicación</strong></span>.</p></li></ul>
-<p> Véase <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a></p>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>copiar enlace a la ubicación automáticamente. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Determina si el enlace para la participación en la reunión de Jitsi se copiará al campo <span class="guibutton"><strong>Ubicación</strong></span>.</p></li></ul>
+<p> Véase <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 </div>
 <div id="ox.appsuite.user.reference.calendar.settings.zoom" class="feat-zoom">
 <p id="ox.appsuite.user.reference.calendar.settings.zoom"></p>
@@ -115,21 +115,21 @@
 <p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments"><b>Citas. </b></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.password"><b>Añadir siempre una contraseña de reunión aleatoria. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.1.1.2"></a>Determina si la conferencia quedará asegurada por una contraseña creada automáticamente.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>Copiar enlace a la ubicación automáticamente. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Determina si el enlace para la participación en la reunión de Zoom se copiará al campo <span class="guibutton"><strong>Ubicación</strong></span>.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>Copiar información de acceso telefónico a la descripción. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Determina si el enlace para la participación en la reunión de Zoom se copiará al campo <span class="guibutton"><strong>Ubicación</strong></span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>copiar enlace a la ubicación automáticamente. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Determina si el enlace para la participación en la reunión de Zoom se copiará al campo <span class="guibutton"><strong>Ubicación</strong></span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>copiar información de acceso telefónico a la descripción. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Determina si el enlace para la participación en la reunión de Zoom se copiará al campo <span class="guibutton"><strong>Ubicación</strong></span>.</p></li>
 </ul>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.dialinnumber"><b>Números de acceso telefónico. </b>Si tiene al menos una cuenta de Zoom Pro, Zoom ofrece números de acceso telefónico por país. Para indicar los países a mostrar en las invitaciones a citas, presione en <span class="guibutton"><strong>Abrir perfil de Zoom</strong></span>.</p></li>
 </ul>
-<p>Véase <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a></p>
+<p>Véase <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 </div>
 <p id="ox.appsuite.user.reference.calendar.settings.advanced"></p>
 <h3 class="title">Configuración avanzada</h3>
 <p><a class="indexterm" name="id-1.8.22.11.2"></a>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>mostrar calendario de cumpleaños. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Define si se muestra un calendario de fechas de nacimiento en la vista de carpeta.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>mostrar recordatorios de citas pasadas. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Determina si se muestran los recordatorios de citas pasadas.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>Mostrar calendario de cumpleaños. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Define si se muestra un calendario de fechas de nacimiento en la vista de carpeta.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>Mostrar recordatorios de citas pasadas. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Determina si se muestran los recordatorios de citas pasadas.</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.calendar.settings.advanced.emailchanges"><b>Aplicar automáticamente los cambios de citas recibidos por correo a su calendario. </b><a class="indexterm" name="id-1.8.22.11.3.1.3.1.2"></a>Define en qué casos las invitaciones a citas de contactos externos se agregarán automáticamente a su calendario. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -143,7 +143,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.declined"><b>Mostrar citas rechazadas. </b><a class="indexterm" name="id-1.8.22.11.3.1.6.1.2"></a>Define si se muestran las citas que rechazó. Consulte <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a></p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.participantsedit"><b>Marcar siempre "Los participantes pueden editar citas" al crear o editar citas. </b><a class="indexterm" name="id-1.8.22.11.3.1.7.1.2"></a>Define si los participantes, de manera predeterminada, tienen el permiso para editar una cita.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.wholeday"><b>Marcar automáticamente las citas de todo el día como "libre" al crear o editar citas. </b><a class="indexterm" name="id-1.8.22.11.3.1.8.1.2"></a>Determina si se muestran las citas de día completo como libres de manera predeterminada.</p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>usar color de la primera categoría para citas. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Determina si las citas a las que se ha asignado una categoría se muestran con el color de dicha categoría. Al asignar varias categorías a una cita, se usará el color de la categoría asignada en primer lugar. Vea <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>Usar color de la primera categoría para citas. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Determina si las citas a las que se ha asignado una categoría se muestran con el color de dicha categoría. Al asignar varias categorías a una cita, se usará el color de la categoría asignada en primer lugar. Vea <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a></p></li>
 </ul>
 <p>
       </p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.appointments.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.appointments.html
index 2f56abc9f..35c1dfb61 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.appointments.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.appointments.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Visualización de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.appointments">
 <div class="titlepage"><div><div><h3 class="title">¿Cómo se muestran las citas en una vista de calendario? </h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.9.2"></a><a class="indexterm" name="id-1.8.8.9.3"></a><a class="indexterm" name="id-1.8.8.9.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">Las siguientes propiedades de las citas determinan la visualización de las citas en la vista de calendario: </p>
+<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><a class="indexterm" name="id-1.8.8.8.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">Las siguientes propiedades de las citas determinan la visualización de las citas en la vista de calendario: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">El color de la cita</p>
@@ -67,7 +67,7 @@
 <p role="presentation">Una cita que haya rechazado se mostrará en gris. El asunto estará precedido por el icono <span class="guibutton"><strong>Rechazada</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.declined"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>. El asunto aparece tachado.</p>
 <p role="presentation">En los ajustes del calendario se determina si se mostrarán las citas rechazadas.</p>
 </li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.6.2.1.6"><p role="presentation">Una cita que ha sido rechazada por todos los demás participantes se marcará con el icono <span class="guibutton"><strong>Todos rechazados</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>.</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.6.2.1.6"><p role="presentation">Una cita que ha sido rechazada por todos los demás participantes se marcará con el icono <span class="guibutton"><strong>Todos rechazados</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>.</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.view.appointments.private"></p>
 <h4 class="title">Apariencia de cita privada</h4>
@@ -94,7 +94,7 @@
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.secret"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span>cita secreta</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.unconfirmed"><object type="image/svg+xml" data="../../images/question-circle.svg" height="15"></object></span>cita no confirmada</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.rejected"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>cita rechazada</p></li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>cita rechazada por todos los demás participantes</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>cita rechazada por todos los demás participantes</p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.view.appointments">
         </p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.html
index b732747ce..04a70ccdf 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.html
@@ -43,14 +43,6 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.timezones.html">Visualización de múltiples zonas horarias</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">¿Cómo se muestran las citas en una vista de calendario? </a></p></li>
 </ul>
-<p id="ox.appsuite.user.related.calendar.view">
-      </p>
-<p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista de carpeta de <span class="phrase">Calendario</span></a>
-          </p></li></ul>
-<p>
-    </p>
 <p id="ox.appsuite.user.parent.calendar.view">Tema superior: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
     <span class="phrase">Calendario</span>
     
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.timezones.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.timezones.html
index 0a4a4a666..062353cc8 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.timezones.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.timezones.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Visualización de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.timezones">
 <div class="titlepage"><div><div><h3 class="title">Visualización de múltiples zonas horarias</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">Además de la zona horaria predeterminada, puede visualizar zonas horarias que usted haya añadido a favoritas. La zona horaria predeterminada se puede cambiar en la configuración básica.</p>
+<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">Además de la zona horaria predeterminada, puede visualizar zonas horarias que usted haya añadido a favoritas. La zona horaria predeterminada se puede cambiar en la configuración básica.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.timezones">
 <p class="title">Cómo visualizar múltiples zonas horarias en una vista del calendario:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.views.html b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.views.html
index d19d1fdbc..445ff07b5 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.views.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.calendar.view.views.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Visualización de citas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.views">
 <div class="titlepage"><div><div><h3 class="title">Visualización de citas en la distintas vistas</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><a class="indexterm" name="id-1.8.8.7.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Aprenda a visualizar las citas de uno o varios calendarios de distintas vistas:</p>
+<a class="indexterm" name="id-1.8.8.6.2"></a><a class="indexterm" name="id-1.8.8.6.3"></a><a class="indexterm" name="id-1.8.8.6.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Aprenda a visualizar las citas de uno o varios calendarios de distintas vistas:</p>
 <div class="task" id="ox.appsuite.user.task.calendar.view.views">
 <p class="title">Cómo ver una cita:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.call.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.call.html
index 762274d84..09a572f38 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.call.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.call.html
@@ -71,7 +71,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">Llamar a los participantes de la tarea</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Establecer el estado de presencia</a></p></li>
 </ul>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.create.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.create.html
index 0b681efc2..7838dd302 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.create.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.create.html
@@ -50,8 +50,8 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">Una foto de contacto, si se subió. Presione en la foto de contacto para editarla o cargar una nueva.</p>
-<p role="presentation">Apellido, nombre</p>
-<p role="presentation">Si se introdujo: título, información profesional, residencia</p>
+<p role="presentation">apellidos, nombre</p>
+<p role="presentation">si se introdujo: título, información profesional, lugar de residencia</p>
 </li>
 <li class="listitem">
 <p role="presentation">Información personal </p>
@@ -88,13 +88,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">La ventana de edición</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista de detalle de <span class="phrase">Libreta de direcciones</span></a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creación de un nuevo contacto</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Añadir contactos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Edición de contactos o listas distribución</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.create">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Los componentes de <span class="phrase">Libreta de direcciones</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.detailview.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.detailview.html
index 08ae051aa..790d4fe36 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.detailview.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.detailview.html
@@ -46,17 +46,17 @@
 <p class="title">Contenido</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Una foto de contacto, si se subió</p>
-<p role="presentation">Apellido, nombre</p>
-<p role="presentation">Si se introdujo: título, información profesional, residencia</p>
+<p role="presentation">una foto de contacto, si se subió</p>
+<p role="presentation">apellidos, nombre</p>
+<p role="presentation">si se introdujo: título, información profesional, lugar de residencia</p>
 </li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.7.11.4.1.3">
-<p role="presentation">Las categorías asignadas</p>
+<p role="presentation">las categorías asignadas</p>
 <p role="presentation">Al presionar en una categoría, se buscan contactos asignados a esa categoría.</p>
 </li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.4"><p role="presentation">Dependiendo de la configuración: la disponibilidad actual del contacto para llamadas</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.5">
-<p role="presentation">Dependiendo de la configuración: Iconos para comunicarse con el contacto: </p>
+<p role="presentation">Dependiendo de la configuración: iconos para comunicarse con el contacto: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Correo</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.detailview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>. Abre la ventana para redactar un correo.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Llamar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.detailview.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>. Abre un menú con funciones de llamada.</p></li>
@@ -84,7 +84,7 @@
 </li>
 <li class="listitem"><p role="presentation">Una nota</p></li>
 <li class="listitem"><p role="presentation">Máximo 18 campos de usuario opcionales</p></li>
-<li class="listitem"><p role="presentation">adjuntos</p></li>
+<li class="listitem"><p role="presentation">Adjuntos</p></li>
 </ul>
 </li>
 </ul>
@@ -97,15 +97,11 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.create.html">La ventana de edición de contactos</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualización de los contactos de una libreta de direcciones</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.attachments.html">Visualización o guardado de adjuntos de contactos</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.detailview">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Los componentes de <span class="phrase">Libreta de direcciones</span></a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.foldertree.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.foldertree.html
index 4454f4397..c2c615020 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.foldertree.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.foldertree.html
@@ -62,6 +62,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualización de los contactos de una libreta de direcciones</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Añadir libretas de direcciones</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.list.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.list.html
index ec9772ec2..1ed889623 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.list.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.list.html
@@ -53,8 +53,8 @@
 <p role="presentation">Se muestran los siguientes detalles de cada contacto: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">una foto si se subió</p></li>
-<li class="listitem"><p role="presentation">Apellido, nombre</p></li>
-<li class="listitem"><p role="presentation">Datos profesionales, si se introdujeron</p></li>
+<li class="listitem"><p role="presentation">apellidos, nombre</p></li>
+<li class="listitem"><p role="presentation">datos profesionales, si se introdujeron</p></li>
 </ul>
 <p role="presentation">Los nombres que comienzan con un número o un carácter especial se muestran debajo de <span class="guibutton"><strong>#</strong></span> en la parte superior de la vista de lista. Los nombres que comienzan con un signo especial se muestran debajo de <span class="guibutton"><strong>Ω</strong></span> en la parte inferior de la vista de lista.</p>
 </li>
@@ -66,11 +66,8 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.settingsmenu.html">El menú de configuración de <span class="phrase">Libreta de direcciones</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista de detalle de <span class="phrase">Libreta de direcciones</span></a></p>
-</li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualización de los contactos de una libreta de direcciones</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.list">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Los componentes de <span class="phrase">Libreta de direcciones</span></a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.new.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.new.html
index 406e35c48..1013205dc 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.new.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.new.html
@@ -42,7 +42,7 @@
 <a class="indexterm" name="id-1.9.7.6.2"></a><p id="ox.appsuite.user.concept.contacts.gui.new">Crea un contacto nuevo. Si se presiona el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>, se abre un menú con funciones adicionales: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">nueva lista de distribución</p></li>
-<li class="listitem"><p role="presentation">Suscribirse a libretas de direcciones compartidas o a otras</p></li>
+<li class="listitem"><p role="presentation">suscribirse a libretas de direcciones compartidas o a otras</p></li>
 <li class="listitem"><p role="presentation">nuevo correo, nueva cita, nuevo contacto</p></li>
 </ul>
 <p id="ox.appsuite.user.hint.contacts.gui.new">Nota: si la carpeta está cerrada, el botón se mostrará como icono. En este caso, el icono <span class="guibutton"><strong>Más acciones </strong></span> no se mostrará. Para mostrar la vista de carpeta, presione el icono <span class="guibutton"><strong>Abrir vista de carpeta</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.open"><object type="image/svg+xml" data="../../images/layout-split.svg" height="15"></object></span> de la parte inferior izquierda.</p>
@@ -52,7 +52,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creación de un nuevo contacto</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Añadir contactos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">Creación de nuevas listas de distribución</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Suscripción a libretas de direcciones externas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Suscribirse a libretas de direcciones públicas y compartidas</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.settingsmenu.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
index 62083e7e9..ff585973c 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
@@ -45,7 +45,7 @@
 <li class="listitem"><p role="presentation">Ajustar todas las configuraciones</p></li>
 <li class="listitem"><p role="presentation">Seleccione un tema para la interfaz de usuario</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Opciones de lista</strong></span>. Determina si las imágenes de contacto, las casillas de verificación o ninguno de estos elementos se mostrarán en la vista de lista.</p></li>
-<li class="listitem"><p role="presentation">Suscribirse a libretas de direcciones compartidas o a otras</p></li>
+<li class="listitem"><p role="presentation">suscribirse a libretas de direcciones compartidas o a otras</p></li>
 <li class="listitem"><p role="presentation">Dependiendo de la configuración: <span class="guibutton"><strong>Conectar su dispositivo</strong></span>. Inicia un asistente para configurar aplicaciones locales con las que puede acceder a sus datos del software colaborativo.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.contacts.gui.settingsmenu"></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.toolbar.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.toolbar.html
index aa74ea093..1ce2ffef8 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.toolbar.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.gui.toolbar.html
@@ -64,13 +64,7 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Edición de contactos o listas distribución</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envío de correos desde una libreta de direcciones</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitar contactos a una cita</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Mover o copiar contactos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envío de contactos como vCard</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exportación de contactos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.print.html">Impresión de contactos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.delete.html">Borrado de contactos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.toolbar">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Los componentes de <span class="phrase">Libreta de direcciones</span></a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.categories.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.categories.html
new file mode 100644
index 000000000..979d4fdef
--- /dev/null
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Uso de categorías para los contactos</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Gestión de contactos">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Invitar contactos a una cita">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Mover o copiar contactos">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Libreta de direcciones</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de contactos</h2>
+<div class="sect2" id="ox.appsuite.user.sect.contacts.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Uso de categorías para los contactos</h3></div></div></div>
+<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><p id="ox.appsuite.user.concept.contacts.manage.categories">Para organizar contactos independientemente de las carpetas, puede utilizar categorías. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Puede marcar contactos con categorías.</p></li>
+<li class="listitem"><p role="presentation">Puede mostrar todos los contactos que han sido marcados con una categoría específica.</p></li>
+</ul>
+<p> Puede crear, editar o borrar categorías propias; consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>.</p>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories">
+<p class="title">Cómo marcar contactos con una categoría:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Seleccione un contacto. Presione el icono <span class="guibutton"><strong>Editar contacto</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> de la barra de herramientas.</p>
+<p role="presentation">Se abre la ventana de edición de contactos.</p>
+</li>
+<li class="step">
+<p role="presentation">Para hacerlo, presione en <span class="guibutton"><strong>Añadir categoría</strong></span> ubicado junto a <span class="guibutton"><strong>Categorías</strong></span>. Seleccione una categoría.</p>
+<p role="presentation">Para eliminar una categoría del contacto, presione en el icono <span class="guibutton"><strong>Eliminar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> que hay junto a la categoría.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories.view">
+<p class="title">Cómo mostrar contactos que han sido marcados con una categoría específica:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione un contacto que haya sido marcado con una categoría.</p></li>
+<li class="step"><p role="presentation">Presione en la categoría en la vista de detalle.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Resultado: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vista de lista muestra todos los contactos que se han marcado con esta categoría. </p></li>
+<li class="listitem"><p role="presentation">Para mostrar la lista anterior, presione en el icono <span class="guibutton"><strong>Cancelar búsqueda</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> en el campo de búsqueda.</p></li>
+</ul>
+          <p>Consejo: También puede utilizar la función de búsqueda buscando una categoría mediante las opciones de búsqueda.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.contacts.manage.categories">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Búsqueda de contactos</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.contacts.manage.categories">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.delete.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.delete.html
index aedcf57b6..9fc037aee 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.delete.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de contactos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Borrado de contactos</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Advertencia:</strong></span> Los contactos y listas de distribución borrados <span class="phrase"><strong>no</strong></span> se pueden restaurar.</p>
+<a class="indexterm" name="id-1.9.17.15.2"></a><a class="indexterm" name="id-1.9.17.15.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Advertencia:</strong></span> Los contactos y listas de distribución borrados <span class="phrase"><strong>no</strong></span> se pueden restaurar.</p>
 <p id="ox.appsuite.user.concept.contacts.manage.delete">Puede borrar contactos o listas de distribución de una libreta de direcciones si dispone de permiso para borrar elementos de dicha libreta de direcciones. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">No puede borrar contactos de la libreta de direcciones <span class="guibutton"><strong>Todos los usuarios</strong></span>.</p></li>
@@ -55,9 +55,14 @@
 <p id="ox.appsuite.user.related.contacts.manage.delete">
         </p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.delete">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.export.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.export.html
index 8b634db8d..831f5bc24 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.export.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de contactos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exportación de contactos</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">Puede exportar contactos o listas de distribución a estos formatos: </p>
+<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><a class="indexterm" name="id-1.9.17.13.4"></a><a class="indexterm" name="id-1.9.17.13.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">Puede exportar contactos o listas de distribución a estos formatos: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">vCard. Puede, por ejemplo, utilizar este formato para intercambiar contactos con otras aplicaciones de correo.</p></li>
 <li class="listitem"><p role="presentation">CSV. Puede utilizar este formato para exportar contactos a formatos de hoja de cálculo.</p></li>
@@ -76,7 +76,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.export"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista de carpeta de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -84,7 +88,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envío de contactos como vCard</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.9.17.12.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.9.17.13.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.export">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.html
index 73ea6022b..522d1a2c0 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem cap-webmail" id="id-1.9.17.4.1.1"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envío de correos desde una libreta de direcciones</a></p></li>
 <li class="listitem cap-calendar" id="id-1.9.17.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitar contactos a una cita</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Mover o copiar contactos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envío de contactos como vCard</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importación de contactos</a></p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.import.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.import.html
index adf0712a4..0324205f2 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.import.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de contactos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importación de contactos</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><a class="indexterm" name="id-1.9.17.11.5"></a><a class="indexterm" name="id-1.9.17.11.6"></a><a class="indexterm" name="id-1.9.17.11.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">Puedes importar contactos desde archivos que tengan los siguientes formatos: </p>
+<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><a class="indexterm" name="id-1.9.17.12.6"></a><a class="indexterm" name="id-1.9.17.12.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">Puedes importar contactos desde archivos que tengan los siguientes formatos: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">vCard. Notas: </p>
@@ -71,19 +71,15 @@
 <li class="step"><p role="presentation">Presione en <span class="guibutton"><strong>Importar</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.contacts.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.contacts.manage.import"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista de carpeta de <span class="phrase">Libreta de direcciones</span></a></p></li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exportación de contactos</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Añadir contactos</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exportación de contactos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Añadir contactos</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.contacts.manage.import">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.inviteappointment.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
index 68911306d..f6ac80f53 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Gestión de contactos">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.manage.sendmail.html" title="Envío de correos desde una libreta de direcciones">
-<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Mover o copiar contactos">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Uso de categorías para los contactos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -53,7 +53,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.inviteappointment"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista de detalle de <span class="phrase">Libreta de direcciones</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a></p></li></ul>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.movecopy.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.movecopy.html
index dd219d800..5953fc1d1 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.movecopy.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.movecopy.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Gestión de contactos">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Invitar contactos a una cita">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Uso de categorías para los contactos">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html" title="Envío de contactos como vCard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Siguiente</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de contactos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.movecopy">
 <div class="titlepage"><div><div><h3 class="title">Mover o copiar contactos</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><a class="indexterm" name="id-1.9.17.9.4"></a><a class="indexterm" name="id-1.9.17.9.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">Puede mover o copiar contactos o listas de distribución a otra libreta de direcciones.</p>
+<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><a class="indexterm" name="id-1.9.17.10.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">Puede mover o copiar contactos o listas de distribución a otra libreta de direcciones.</p>
 <p id="ox.appsuite.user.hints.contacts.manage.movecopy">Notas: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">No puede mover o copiar contactos o listas de distribución a la libreta de direcciones <span class="guibutton"><strong>Todos los usuarios</strong></span>.</p></li>
@@ -61,7 +61,10 @@
 <p id="ox.appsuite.user.tip.contacts.manage.movecopy">Consejo: También puede mover los objetos seleccionados arrastrando los objetos desde la vista de carpeta a una libreta de direcciones.</p>
 <p id="ox.appsuite.user.related.contacts.manage.movecopy"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.personal.html">Añadir libretas de direcciones personales</a></p></li></ul>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.print.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.print.html
index ea2337497..5be4aa36a 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.print.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de contactos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Impresión de contactos</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">Puede imprimir los datos de un solo contacto o de varios contactos. Puede seleccionar entre diferentes diseños de impresión.</p>
+<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">Puede imprimir los datos de un solo contacto o de varios contactos. Puede seleccionar entre diferentes diseños de impresión.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.print.list">
 <p class="title">Cómo imprimir los datos de un contacto:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,9 +54,17 @@
 <p id="ox.appsuite.user.related.contacts.manage.print">
         </p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista de carpeta de <span class="phrase">Libreta de direcciones</span></a>
+            </p>
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.print">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.sendmail.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.sendmail.html
index e8577aa82..c23d3ff6a 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.sendmail.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.sendmail.html
@@ -53,10 +53,14 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendmail"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista de detalle de <span class="phrase">Libreta de direcciones</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendmail">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.sendvcard.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.sendvcard.html
index 84130a773..f5071919e 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.sendvcard.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.manage.sendvcard.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de contactos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.sendvcard">
 <div class="titlepage"><div><div><h3 class="title">Envío de contactos como vCard</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">Puede enviar contactos o listas de distribución como vCard adjunto a un correo.</p>
+<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">Puede enviar contactos o listas de distribución como vCard adjunto a un correo.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.sendvcard">
 <p class="title">Cómo enviar un contacto como adjunto vCard:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,12 +49,15 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendvcard"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra de herramientas de <span class="phrase">Libreta de direcciones</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista de lista de <span class="phrase">Libreta de direcciones</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exportación de contactos</a></p></li>
-<li class="listitem cap-webmail" id="id-1.9.17.10.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li>
+<li class="listitem cap-webmail" id="id-1.9.17.11.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendvcard">Tema superior: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestión de contactos</a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.search.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.search.html
index 30c0d194c..659df5834 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.search.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualización de los contactos de una libreta de direcciones</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.settings.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.settings.html
index f739a227a..e8a739a34 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.settings.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.settings.html
@@ -60,7 +60,7 @@
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>nombres. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a>
+<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>Nombres. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Especifica el orden en que el nombre y el apellido de un contacto aparecen en la libreta de direcciones.</p></li></ul>
 <p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.useaddressbook.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.useaddressbook.html
index b715ddfd8..b4f48d40f 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.useaddressbook.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.useaddressbook.html
@@ -70,7 +70,7 @@
 <p> </p>
 <p class="title">Acciones de nivel superior:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Añadir participantes o recursos</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Creación de recursos administrados</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.useaddressdirectory.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.useaddressdirectory.html
index a11accf7a..07e296a2e 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.useaddressdirectory.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.useaddressdirectory.html
@@ -77,7 +77,7 @@
 <p id="ox.appsuite.user.related.contacts.useaddressdirectory"></p>
 <p class="title">Acciones de nivel superior:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Añadir participantes o recursos</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Uso de la vista de planificación</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Creación de recursos administrados</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.view.haloview.html b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.view.haloview.html
index a425ba58f..e6c20c3f5 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.contacts.view.haloview.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.contacts.view.haloview.html
@@ -48,11 +48,11 @@
 <li class="listitem"><p role="presentation">Seleccione una cita o una tarea en las aplicaciones <span class="phrase">Calendario</span> o <span class="phrase">Tareas</span>. Presione en un participante en la vista de detalle o en la ventana emergente.</p></li>
 </ul></p>
 <p role="presentation">Dependiendo de las entradas del contacto en la libreta de direcciones, estos datos se mostrarán en una ventana emergente: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Una foto si se subió</p></li>
-<li class="listitem"><p role="presentation">Apellido, nombre</p></li>
-<li class="listitem"><p role="presentation">Datos profesionales, si se introdujeron</p></li>
+<li class="listitem"><p role="presentation">una foto si se subió</p></li>
+<li class="listitem"><p role="presentation">apellidos, nombre</p></li>
+<li class="listitem"><p role="presentation">datos profesionales, si se introdujeron</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.4"><p role="presentation">Dependiendo de la configuración: la disponibilidad actual del contacto para llamadas</p></li>
-<li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">Dependiendo de la configuración: Iconos para comunicarse con el contacto: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">Dependiendo de la configuración: iconos para comunicarse con el contacto: <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Correo</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>. Abre la ventana para redactar un correo.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Llamar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>. Abre un menú con funciones de llamada.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Invitar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.invite"><object type="image/svg+xml" data="../../images/calendar-plus.svg" height="15"></object></span>. Abre la ventana para crear una cita.</p></li>
@@ -62,7 +62,7 @@
 <li class="listitem"><p role="presentation">Direcciones de correo. Si presiona en una dirección de correo, se muestra la página para enviar un nuevo correo.</p></li>
 <li class="listitem"><p role="presentation">Números de teléfono profesionales y privados. Si presiona en un número, se abre una función para realizar una llamada, si está disponible.</p></li>
 <li class="listitem"><p role="presentation">Direcciones profesionales y privadas. En la configuración de la libreta de direcciones puede definir si se debe utilizar un servicio de mapas al presionar sobre una dirección.</p></li>
-<li class="listitem"><p role="presentation">adjuntos</p></li>
+<li class="listitem"><p role="presentation">Adjuntos</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">La libreta de direcciones en la que se guarda el contacto</p></li>
 <li class="listitem"><p role="presentation">Sus conversaciones recientes con este contacto. Si presiona en un correo, su contenido se mostrará en una ventana emergente.</p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.accounts.edit.html b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
index 70aa62266..7cf2824dc 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
@@ -94,7 +94,7 @@
               <a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a>
             </p>
 <p role="presentation" class="cap-webmail">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a>
+              <a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a>
             </p>
 <p role="presentation" class="cap-infostore">
               <a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Añadir cuentas de almacenamiento</a>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
index e2ec9866c..9e11f1345 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
@@ -64,7 +64,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.accounts.functionalmail">Tema superior: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Administración de cuentas</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.categories.html b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.categories.html
index 2b2b4118d..869ea11fa 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.categories.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.categories.html
@@ -32,15 +32,15 @@
   <h1 class="sr-only">Organización de datos y comparticiones</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.categories">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Gestión de Categorías</h2></div></div></div>
-<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Aprenda a administrar <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categorías</a> que le permiten clasificar citas, contactos y tareas. Las categorías tienen las siguientes propiedades: </p>
+<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Aprenda a administrar <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categorías</a> que le permiten organizar correos, citas, contactos y tareas en todas las aplicaciones, independientemente de la estructura de carpetas. Por ejemplo, puede utilizar una categoría propia para un proyecto o cliente específico. Las categorías tienen las siguientes propiedades: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Una categoría consta de un nombre y un color.</p></li>
 <li class="listitem"><p role="presentation">Al buscar objetos, puede utilizar categorías como términos de búsqueda.</p></li>
-<li class="listitem"><p role="presentation">Dependiendo de la configuración, están predefinidas categorías concretas. Dichas categorías no se pueden editar ni borrar.</p></li>
-<li class="listitem"><p role="presentation">Puede crear, editar y eliminar sus propias categorías.</p></li>
-<li class="listitem"><p role="presentation">Puede asignar una o varias categorías a citas, contactos y tareas, y borrarlas más tarde.</p></li>
+<li class="listitem"><p role="presentation">Dependiendo de la configuración, hay predefinidas categorías específicas. Dichas categorías no se pueden editar ni borrar.</p></li>
+<li class="listitem"><p role="presentation">Puede crear, editar y borrar categorías propias.</p></li>
+<li class="listitem"><p role="presentation">Puede asignar una o varias categorías a correos, citas, contactos y tareas y borrarlas más tarde.</p></li>
 </ul>
-<p> Nota: Esas categorías no se pueden usar para correos. Para los correos existen las categorías de la bandeja de entrada. Consulte <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a>.</p>
+<p> Nota: Para los correos también puede usar las pestañas de la bandeja de entrada. Se puede asignar una categoría de la bandeja de entrada específica a un correo. La categoría depende del remitente; consulte <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a>.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.categories">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">crear una categoría propia</p></li>
@@ -51,9 +51,15 @@
 <p class="title">Cómo administrar sus categorías:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step help-hide-inline">
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la parte derecha de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>. Se abre la ventana <span class="guilabel"><strong>Configuración</strong></span>.</p>
+<p role="presentation">Presione en <span class="guibutton"><strong>Básica</strong></span> en el panel izquierdo. Presione <span class="guibutton"><strong>Administrar categorías</strong></span> debajo de <span class="guibutton"><strong>Configuración avanzada</strong></span></p>
+<p role="presentation">También puede usar uno de los siguientes métodos: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Seleccione un correo. Presione en el icono <span class="guibutton"><strong>Añadir categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> de la barra de herramientas. Seleccione <span class="guibutton"><strong>Administrar categorías</strong></span>.</p></li>
+<li class="listitem">
 <p role="presentation">Abra la ventana de edición de citas, contactos o tareas creando o editando una cita, un contacto o una tarea.</p>
 <p role="presentation">Para ello presione en <span class="guibutton"><strong>Añadir categoría</strong></span> junto a <span class="guibutton"><strong>Categorías</strong></span>. Seleccione <span class="guibutton"><strong>Administrar categorías</strong></span>.</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">También se puede usar el botón <span class="guibutton"><strong>Administrar categorías</strong></span> de la configuración general, debajo de <span class="guibutton"><strong>Configuración avanzada</strong></span>.</p></li></ul>
+</li>
+</ul></p>
 <p role="presentation">Se abre la ventana <span class="guilabel"><strong>Administrar categorías</strong></span>.</p>
 </li>
 <li class="step">
@@ -69,41 +75,22 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creación de nuevas citas</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creación de un nuevo contacto</a>
+<p role="presentation" class="cap-webmail">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
           </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Creación de nuevas tareas</a>
-          </p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edición de citas</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
           </p>
 <p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Edición de contactos o listas distribución</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a>
           </p>
 <p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Edición de tareas</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuste de la Configuración general</a>
           </p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Búsqueda de citas</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Búsqueda de contactos</a>
-          </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Búsqueda de tareas</a>
-          </p>
-</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.deputy.add.html b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.deputy.add.html
index f598f7481..d2c07c2ca 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.deputy.add.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.deputy.add.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Administrar representantes">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Administrar representantes">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="administrar representantes">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="administrar representantes">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html" title="Visualización, edición, borrado de representantes">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Organización de datos y comparticiones</h1>
-<h2 class="sr-only">Administrar representantes</h2>
+<h2 class="sr-only">administrar representantes</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.add">
 <div class="titlepage"><div><div><h3 class="title">Adición de representantes</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.8.2"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.add">Existen las siguientes opciones: </p>
@@ -86,7 +86,7 @@
             </p></li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Tema superior: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Administrar representantes</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Tema superior: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">administrar representantes</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.deputy.edit.html b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
index 1ab837436..1ab9e2190 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Administrar representantes">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="administrar representantes">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.add.html" title="Adición de representantes">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.accounts.html" title="Administración de cuentas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Organización de datos y comparticiones</h1>
-<h2 class="sr-only">Administrar representantes</h2>
+<h2 class="sr-only">administrar representantes</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.edit">
 <div class="titlepage"><div><div><h3 class="title">Visualización, edición, borrado de representantes</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.9.2"></a><a class="indexterm" name="id-1.12.6.9.3"></a><a class="indexterm" name="id-1.12.6.9.4"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.edit">Existen las siguientes opciones: </p>
@@ -81,7 +81,7 @@
             </p></li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Tema superior: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Administrar representantes</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Tema superior: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">administrar representantes</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.deputy.html b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.deputy.html
index 7014381a3..80bcc0ecc 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.deputy.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.deputy.html
@@ -1,7 +1,7 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Administrar representantes</title>
+<title>administrar representantes</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Organización de datos y comparticiones</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.deputy">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Administrar representantes</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">administrar representantes</h2></div></div></div>
 <a class="indexterm" name="id-1.12.6.2"></a><a class="indexterm" name="id-1.12.6.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.deputy">Puede designar a otros usuarios para actuar como su <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">representante</a>. Puede conceder a uno o varios representantes distintos niveles de permisos para administrar la comunicación por correo y la planificación de citas en su nombre.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.deputy">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.sharing.examples.html b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
index 1f4ca6194..a654f49ee 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.dataorganisation.sharing.html" title="Compartición de datos">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html" title="¿Qué permisos se pueden usar?">
-<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Administrar representantes">
+<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="administrar representantes">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.sharing.share.html b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.sharing.share.html
index 2c230963d..10d9489de 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.sharing.share.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.dataorganisation.sharing.share.html
@@ -37,7 +37,7 @@
 <p class="title">Tiene las siguientes posibilidades:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Carpetas de correo </p>
+<p role="presentation">carpetas de correo </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">La carpeta <span class="guibutton"><strong>Bandeja de entrada</strong></span>, como todas las carpetas y subcarpetas que hay en <span class="guibutton"><strong>Mis carpetas</strong></span>, se pueden compartir con usuarios internos con permisos de lectura.</p>
@@ -48,7 +48,7 @@
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">calendario </p>
+<p role="presentation">Calendario </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Las carpetas que hay en <span class="guibutton"><strong>Mis calendarios</strong></span> se pueden compartir con usuarios internos con permisos de lectura o edición.</p></li>
 <li class="listitem"><p role="presentation">La carpeta <span class="guibutton"><strong>Mis calendarios</strong></span> no se puede compartir.</p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.content.html b/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.content.html
index 1534504a4..1e9be0601 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.content.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.content.html
@@ -76,6 +76,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Ver el contenido de la carpeta de <span class="phrase">Ficheros</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Visualización del contenido de un archivo</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizar archivos y carpetas de <span class="phrase">Ficheros</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.foldertree.html b/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.foldertree.html
index 9e8ad589e..06bff5f11 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.foldertree.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.foldertree.html
@@ -73,6 +73,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">Ficheros</span>: creación de carpetas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">Suscribirse a carpetas públicas y compartidas de <span class="phrase">Ficheros</span></a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizar archivos y carpetas de <span class="phrase">Ficheros</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.toolbar.html b/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.toolbar.html
index 878352abc..99a487ba1 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.toolbar.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.toolbar.html
@@ -76,20 +76,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Ver el contenido de la carpeta de <span class="phrase">Ficheros</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Visualización del contenido de un archivo</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.send.html">Envío de archivos como adjuntos de correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Edición de nombres de archivos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creación o edición de descripciones</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.move.html">Mover archivos o carpetas de <span class="phrase">Ficheros</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.copy.html">Copia de archivos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Guardar archivos como PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Impresión de archivos como PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.addportal.html">Añadir archivos al portal</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.favorite.html">Añadir archivos o carpetas de <span class="phrase">Ficheros</span> a Favoritos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.delete.html">Borrado de archivos o carpetas de <span class="phrase">Ficheros</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.lock.html">Bloqueo o desbloqueo de archivos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Trabajo con versiones</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizar archivos y carpetas de <span class="phrase">Ficheros</span></a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Cifrado o descifrado de archivos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.toolbar">Tema superior: <a class="xref" href="ox.appsuite.user.sect.drive.gui.html">Los componentes de <span class="phrase">Ficheros</span></a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.viewer.html b/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.viewer.html
index be17f829d..84454f767 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.viewer.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.drive.gui.viewer.html
@@ -106,23 +106,9 @@
               <a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">Celebración de una presentación</a>
             </p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Edición de nombres de archivos</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creación o edición de descripciones</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Guardar archivos como PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Impresión de archivos como PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Trabajo con versiones</a>
-            </p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizar archivos y carpetas de <span class="phrase">Ficheros</span></a>
+            </p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-share_links cap-share_mail_attachments">
               <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a>
             </p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.drive.settings.html b/help/l10n/es_MX/ox.appsuite.user.sect.drive.settings.html
index d649a54d0..68f39a8ab 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.drive.settings.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.drive.settings.html
@@ -51,13 +51,13 @@
 </div>
 <p id="ox.appsuite.user.reference.drive.settings">Dependiendo de la configuración, están disponibles las siguientes funciones:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">añadir archivos</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">Añadir archivos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.versionhistory">Historial de versiones</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.advanced">Ajustes avanzados</a></p></li>
 </ul>
 <p>Vea también: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Búsqueda de configuraciones</a></p>
 <p id="ox.appsuite.user.reference.drive.settings.adddrive"></p>
-<h3 class="title">añadir archivos</h3>
+<h3 class="title">Añadir archivos</h3>
 <p><a class="indexterm" name="id-1.11.17.6.2"></a>Determina si se debería crear un archivo nuevo o una nueva versión de un archivo que posiblemente exista con el mismo nombre. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><b>Añadir nueva versión. </b>Se creará una nueva versión del archivo.</p></li>
@@ -76,7 +76,7 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.advanced.playdiashow"><b>Presentar diapositivas para imágenes. </b><a class="indexterm" name="id-1.11.17.8.2.1.1.1.2"></a>Determina cómo se presentan las fotos que se muestran en el visor</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.advanced.playdiashow"><b>Presentación para imágenes. </b><a class="indexterm" name="id-1.11.17.8.2.1.1.1.2"></a>Determina cómo se presentan las fotos que se muestran en el visor</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.advanced.showhiddenobjects"><b>mostrar archivos y carpetas ocultos. </b><a class="indexterm" name="id-1.11.17.8.2.1.2.1.2"></a>Determina si se muestran los archivos y carpetas ocultos. Los nombres de archivos y carpetas ocultos van precedidos por un punto. Las aplicaciones locales de <span class="phrase">Ficheros</span> precisan tales archivos y carpetas por motivos internos. Para no poner en riesgo la funcionalidad de las aplicaciones locales de <span class="phrase">Ficheros</span>, dichos archivos y carpetas ocultas no se deben modificar ni borrar.</p></li>
 </ul>
 <p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.accounts.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.accounts.html
index b9d5fc827..e331ec62f 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.accounts.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.accounts.html
@@ -76,7 +76,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Configuración de la dirección de respuesta</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.attachments.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.attachments.html
index a482a9e6a..a62a26ba7 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.attachments.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="Correo electrónico">
 <link rel="prev" href="ox.appsuite.user.sect.email.view.html" title="Visualización de correos">
-<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.call.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.call.html
index ab79b85d3..fed9bbee2 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.call.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.call.html
@@ -58,7 +58,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Establecer el estado de presencia</a></p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.deputy.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.deputy.html
index c2101647f..b96571017 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.deputy.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.deputy.html
@@ -91,12 +91,12 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creación, edición o gestión de citas como representante</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Administrar representantes</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">administrar representantes</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.email.deputy">Tema superior: <a class="xref" href="ox.appsuite.user.chap.email.html"><i>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.create.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.create.html
index 57cdc8454..9013539a5 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.create.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.create.html
@@ -62,7 +62,7 @@
 </li>
 <li class="listitem"><p role="presentation">Botones <span class="guibutton"><strong>CC</strong></span>, <span class="guibutton"><strong>CCO</strong></span>. Se abren los campos <span class="guibutton"><strong>CC</strong></span> o <span class="guibutton"><strong>CCO</strong></span>.</p></li>
 <li class="listitem">
-<p role="presentation">Botón <span class="guibutton"><strong>RE</strong></span>. Abre el campo <span class="guibutton"><strong>Responder a</strong></span>.</p>
+<p role="presentation">Botón <span class="guibutton"><strong>Re</strong></span>. Abre el campo <span class="guibutton"><strong>Responder a</strong></span>.</p>
 <p role="presentation">Su respuesta al correo se enviará a las direcciones de correo introducidas en este campo.</p>
 </li>
 <li class="listitem">
@@ -83,6 +83,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Enviar</strong></span>. Envía el correo a los destinatarios indicados.</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.13.5.1.5"><p role="presentation"><span class="guibutton"><strong>Enviar más tarde</strong></span>. Abre un menú que le permite seleccionar cuándo se debería enviar el correo.</p></li>
 <li class="listitem">
 <p role="presentation">Barra de botones </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -116,17 +117,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">La ventana de edición</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Reenvío de correos</a></p>
-<p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Uso de funciones de AI al redactar correos</a></p>
-<p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Enviando o recibiendo correos como representante</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 <p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.email.gui.create">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.detailview.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.detailview.html
index 0f76e9a24..5092e16b2 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.detailview.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.detailview.html
@@ -63,6 +63,7 @@
 <li class="listitem">
 <p role="presentation">Dependiendo de la configuración, una de las siguientes funciones estará disponible: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Icono <span class="guibutton"><strong>Asignar categoría</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Abre un menú con funciones para asignar una categoría o para administrar categorías.</p></li>
 <li class="listitem"><p role="presentation">Icono <span class="guibutton"><strong>Asignar color</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Abre un menú que le permite asignar una etiqueta coloreada al correo.</p></li>
 <li class="listitem"><p role="presentation">Icono <span class="guibutton"><strong>Marcar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Marca el correo.</p></li>
 </ul>
@@ -80,6 +81,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation">Si se selecciona un correo con un adjunto como enlace en la carpeta <span class="guibutton"><strong>Enviados</strong></span>, se mostrará información sobre el adjunto en la parte superior del texto del correo.</p></li>
+<li class="listitem"><p role="presentation">Dependiendo de la configuración: Si están disponibles, se mostrarán las categorías asignadas.</p></li>
 <li class="listitem">
 <p role="presentation">Texto del correo</p>
 <p role="presentation">Las citas de correos anteriores se marcan al comienzo de la línea.</p>
@@ -95,15 +97,11 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">El elemento emergente de <span class="phrase">Correo electrónico</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">La ventana de edición de correo</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.detailview">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.foldertree.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.foldertree.html
index 33c607f9c..ee27d726b 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.foldertree.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.foldertree.html
@@ -47,14 +47,16 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Bandeja de entrada</strong></span>. De manera predeterminada, todos los correos recibidos se alojan en esta carpeta.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Borradores</strong></span>. Contiene los correos guardados como borrador.</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Enviados</strong></span>. Contiene el correo que ha enviado.</p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Enviados</strong></span>. Contiene los correos que ha enviado.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Papelera</strong></span>. Contiene el correo que ha borrado.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Archivo</strong></span>. Contiene los correos que ha archivado. Esta carpeta se creará automáticamente cuando archive un correo por primera vez.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Mis carpetas</strong></span>. Contiene las carpetas de correo que ha creado. Esta carpeta se creará automáticamente al crear una carpeta de correo por primera vez.</p></li>
 </ul>
 <p>Dependiendo de la configuración y de los ajustes de correo, podrían estar disponibles carpetas adicionales. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Carpetas para correos no leídos, carpetas para mensajes marcados</p></li>
+<li class="listitem"><p role="presentation">Carpeta para mensajes marcados</p></li>
+<li class="listitem"><p role="presentation">Carpeta para mensajes no leídos</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.7.5.2.3"><p role="presentation">Carpeta para mensajes que se enviarán más tarde</p></li>
 <li class="listitem"><p role="presentation">Carpetas de correo compartidas y públicas a las que está suscrito.</p></li>
 <li class="listitem"><p role="presentation">Carpetas de cuentas de correo instrumentales que le ha asignado el administrador.</p></li>
 </ul>
@@ -67,10 +69,10 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Añadir carpetas de correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Desactivar o activar de cuentas de correo instrumentales</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Desactivar o activar de cuentas de correo instrumentales</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Compartición de datos</a></p>
 </li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.html
index a53eb170a..e9d82e612 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">El botón Nuevo correo</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de pestañas de <span class="phrase">Correo electrónico</span></a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de categorías de la bandeja de entrada</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">El elemento emergente de <span class="phrase">Correo electrónico</span></a></p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.list.html
index 8dabe3c35..70acc0abe 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.list.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.list.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="Los componentes de Correo electrónico">
-<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barra de pestañas de Correo electrónico">
+<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barra de categorías de la bandeja de entrada">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.detailview.html" title="La vista de detalle de Correo electrónico">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -52,6 +52,7 @@
 <li class="listitem"><p role="presentation">Se muestran los siguientes detalles por cada correo: Remitente, asunto, fecha de recepción. Los correos no leídos se marcan con el icono <span class="guibutton"><strong>No leído</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span>.</p></li>
 <li class="listitem"><p role="presentation">La información emergente sobre el nombre de un remitente muestra la dirección de correo dicho remitente.</p></li>
 <li class="listitem"><p role="presentation">Si está disponible, se muestra información adicional: iconos de adjuntos, etiqueta o marca coloreadas, número de correos de una <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">conversación</a>, prioridad.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.10.5.1.7"><p role="presentation">Si están disponibles, se mostrarán las categorías asignadas. En la configuración de correo puede especificar si las categorías asignadas se muestran en la vista de lista.</p></li>
 <li class="listitem"><p role="presentation">Los correos cifrados se marcan con el icono Cifrado <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.encrypted"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Si un aviso de ausencia está activo, se muestra una notificación encima de la vista de lista.</p>
@@ -69,12 +70,9 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">El menú de configuración de <span class="phrase">Correo electrónico</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.list">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.new.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.new.html
index 2e160ef4b..067c1bea4 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.new.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.new.html
@@ -52,7 +52,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a></p>
 </li></ul>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.popup.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.popup.html
index ade00c215..462d25c56 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.popup.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.popup.html
@@ -71,8 +71,7 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p></li>
-<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualización de contactos en la vista halo</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.popup">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.settingsmenu.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.settingsmenu.html
index 378b093c3..61e39aaf2 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.settingsmenu.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.settingsmenu.html
@@ -59,7 +59,6 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.tabs.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.tabs.html
index b93626ca1..ad7144cd0 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.tabs.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.tabs.html
@@ -1,7 +1,7 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>La barra de pestañas de Correo electrónico</title>
+<title>La barra de categorías de la bandeja de entrada</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
@@ -38,15 +38,14 @@
 <h2 class="sr-only">Los componentes de <span class="phrase">Correo electrónico</span>
 </h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.tabs">
-<div class="titlepage"><div><div><h3 class="title">La barra de pestañas de <span class="phrase">Correo electrónico</span>
-</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">La barra de categorías de la bandeja de entrada</h3></div></div></div>
 <a class="indexterm" name="id-1.7.8.9.2"></a><p id="ox.appsuite.user.concept.email.gui.tabs">Muestra las pestañas de la bandeja de entrada predefinidas para los correos de la carpeta <span class="guibutton"><strong>Bandeja de entrada</strong></span>. Esto permite asignar los correos entrantes a determinadas pestañas ordenadas por remitentes.</p>
 <p id="ox.appsuite.user.reference.email.gui.tabs">
         </p>
 <p class="title">Notas:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Dependiendo de la configuración, las pestañas de la bandeja de entrada podrían no estar disponibles.</p></li>
-<li class="listitem"><p role="presentation">Si las pestañas de la bandeja de entrada están disponibles, se puede mostrar u ocultar la barra de pestañas. Para ello presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione <span class="guibutton"><strong>Categorías de la Bandeja de entrada</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Si las categorías de la bandeja de entrada están disponibles, puede mostrar u ocultar la barra de categorías de la bandeja de entrada. Para hacerlo, presione en el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Categorías de la bandeja de entrada</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">El número de pestañas de la bandeja de entrada y sus nombres y orden están predefinidos. Dependiendo de la configuración, algunas pestañas de la bandeja de entrada se podrían renombrar o desactivar.</p></li>
 </ul>
 <p>
@@ -54,14 +53,9 @@
 <p id="ox.appsuite.user.related.email.gui.tabs">
         </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a>
-            </p></li>
-</ul>
+            </p></li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.reference.email.gui.tabs.parent">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.toolbar.html
index 259ddd21e..5ee21d699 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.toolbar.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.gui.toolbar.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="Los componentes de Correo electrónico">
 <link rel="prev" href="ox.appsuite.user.sect.email.gui.foldertree.html" title="La vista de carpeta de Correo electrónico">
-<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barra de pestañas de Correo electrónico">
+<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barra de categorías de la bandeja de entrada">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -49,7 +49,8 @@
 <li class="listitem"><p role="presentation">Icono <span class="guibutton"><strong>Archivar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.archive"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span>. Archiva los correos que haya seleccionado.</p></li>
 <li class="listitem"><p role="presentation">Iconos para <span class="guibutton"><strong>responder</strong></span> y <span class="guibutton"><strong>reenviar</strong></span> los correos seleccionados: <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">Dependiendo de la configuración: el icono <span class="guibutton"><strong>Integración con AI</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>. Abre un menú con funciones de AI para la edición del contenido del correo.</p></li>
-<li class="listitem"><p role="presentation">Icono <span class="guibutton"><strong>Asignar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Abre un menú que le permite mover un correo a una categoría. Este icono sólo está disponible si está visible la barra de pestañas de la Bandeja de entrada.</p></li>
+<li class="listitem"><p role="presentation">Dependiendo de la configuración: El icono <span class="guibutton"><strong>Asignar categoría de la bandeja de entrada</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.inboxcategories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Abre un menú que le permite mover un correo a una categoría de la bandeja de entrada. Este icono solo está disponible si se muestra la barra de pestañas de la bandeja de entrada.</p></li>
+<li class="listitem"><p role="presentation">Dependiendo de la configuración: El icono <span class="guibutton"><strong>Asignar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Abre un menú con funciones para asignar una categoría o para administrar categorías.</p></li>
 <li class="listitem"><p role="presentation">Dependiendo de la configuración: el icono <span class="guibutton"><strong>Asignar color</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Abre un menú que le permite asignar una etiqueta coloreada a los correos seleccionados.</p></li>
 <li class="listitem"><p role="presentation">Dependiendo de la configuración: el icono <span class="guibutton"><strong>Marcar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Marca el correo.</p></li>
 <li class="listitem"><p role="presentation">Icono <span class="guibutton"><strong>Mover</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.moveto"><object type="image/svg+xml" data="../../images/folder-symlink.svg" height="15"></object></span>. Mueve los correos seleccionados a otra carpeta.</p></li>
@@ -63,25 +64,12 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de pestañas de <span class="phrase">Correo electrónico</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Reenvío de correos</a></p>
 </li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Uso de funciones de AI al responder a correos</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Mover o copiar correos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Mostrar código fuente del correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Uso de borradores de correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creación de recordatorios de correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Añadir un correo al portal</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Almacenamiento de correos</a></p>
-<p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exportación de correos como PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p>
-</li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Uso de funciones de AI al responder a correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.toolbar">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Los componentes de <span class="phrase">Correo electrónico</span></a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.addportal.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.addportal.html
index 3b6c11fb3..23d0a5471 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.addportal.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.addportal.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.addportal">
 <div class="titlepage"><div><div><h3 class="title">Añadir un correo al portal</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.15.2"></a><a class="indexterm" name="id-1.7.15.15.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">Puede añadir un correo como widget al portal.</p>
+<a class="indexterm" name="id-1.7.15.16.2"></a><a class="indexterm" name="id-1.7.15.16.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">Puede añadir un correo como widget al portal.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.addportal">
 <p class="title">Cómo añadir un correo al portal:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.addportal"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.add.html">Añadir widgets al portal</a></p></li></ul>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.archive.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.archive.html
index 3532c16eb..386df8e71 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.archive.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.archive.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.archive">
 <div class="titlepage"><div><div><h3 class="title">Archivado de correos</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.20.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">Al archivar correos, se mueven a la carpeta <span class="guibutton"><strong>Archivo</strong></span>. La carpeta <span class="guibutton"><strong>Archivo</strong></span> contiene una subcarpeta distinta por cada año del calendario. Los correos archivados se guardan en dichas subcarpetas ordenados por el año de recepción. La carpeta <span class="guibutton"><strong>Archivo</strong></span> se crea en cuanto se usa esta función por primera vez. Existen las siguientes opciones: </p>
+<a class="indexterm" name="id-1.7.15.21.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">Al archivar correos, se mueven a la carpeta <span class="guibutton"><strong>Archivo</strong></span>. La carpeta <span class="guibutton"><strong>Archivo</strong></span> contiene una subcarpeta distinta por cada año del calendario. Los correos archivados se guardan en dichas subcarpetas ordenados por el año de recepción. La carpeta <span class="guibutton"><strong>Archivo</strong></span> se crea en cuanto se usa esta función por primera vez. Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">archivar los correos de una carpeta más antiguos de 90 días</p></li>
 <li class="listitem"><p role="presentation">archivar correos individuales</p></li>
@@ -61,14 +61,16 @@
 </li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.archive">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.archive"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.archive">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.categories.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.categories.html
new file mode 100644
index 000000000..9247a94b4
--- /dev/null
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.categories.html
@@ -0,0 +1,95 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>De forma predeterminada se utiliza PGP incrustado para correos nuevos</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Recopilación de direcciones">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Clasificación de correos">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Correo electrónico</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de correos</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">De forma predeterminada se utiliza PGP incrustado para correos nuevos</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.categories">Para organizar los correos independientemente de las carpetas, puede utilizar categorías. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Puede marcar correos con categorías.</p></li>
+<li class="listitem"><p role="presentation">Puede ver todos los correos que se han marcado con una categoría específica.</p></li>
+</ul>
+<p> Puede crear, editar o borrar categorías propias, consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>.</p>
+<p id="ox.appsuite.user.tip.email.manage.categories">Independientemente de las categorías, puede utilizar las categorías de la bandeja de entrada. Con las categorías de la bandeja de entrada puede organizar los correos relacionados con los remitentes; consulte <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a>.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.mark">
+<p class="title">Cómo marcar correos con una categoría:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione uno o varios correos.</p></li>
+<li class="step">
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Asignar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.mark.add"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> de la barra de herramientas. Seleccione una categoría.</p>
+<p role="presentation">Para eliminar una categoría del correo, presione en la categoría.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.view">
+<p class="title">Cómo mostrar correos que han sido marcados con una categoría específica:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione un correo que haya sido marcado con una categoría.</p></li>
+<li class="step"><p role="presentation">Presione en la categoría en la vista de detalle.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Resultado: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vista de lista muestra todos los correos que se han marcado con esta categoría.</p></li>
+<li class="listitem"><p role="presentation">Para cada correo, se mostrará la carpeta que lo contiene.</p></li>
+<li class="listitem"><p role="presentation">Para mostrar la lista anterior, presione en el icono <span class="guibutton"><strong>Cancelar búsqueda</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> en el campo de búsqueda.</p></li>
+</ul>
+          <p>Consejo: También puede utilizar la función de búsqueda buscando una categoría mediante las opciones de búsqueda.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.categories"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">Búsqueda de correos</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.categories">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.collectaddress.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.collectaddress.html
index e3adf2451..a41bb2e9a 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.collectaddress.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.collectaddress.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.mark.html" title="Marcado de todos los correos como leídos o no leídos">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Clasificación de correos">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="De forma predeterminada se utiliza PGP incrustado para correos nuevos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.mark.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.categories.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -40,7 +40,7 @@
 <div class="titlepage"><div><div><h3 class="title">Recopilación de direcciones</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.10.2"></a><a class="indexterm" name="id-1.7.15.10.3"></a><p id="ox.appsuite.user.concept.email.manage.collectaddress">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Recopilar nuevas direcciones de correo automáticamente al enviar o leer correos activando esta función en los Ajustes de Correo.</p></li>
+<li class="listitem"><p role="presentation">Recopilar nuevas direcciones de correo automáticamente al enviar o leer correos activando esta función en los ajustes avanzados de Correo.</p></li>
 <li class="listitem"><p role="presentation">Añadir manualmente las direcciones de correo a una libreta de direcciones</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.collectaddress">
@@ -56,16 +56,10 @@
           <p>Nota: Esta función sólo está disponible para contactos nuevos.</p>
         </div>
 </div>
-<p role="presentation" class="cap-contacts">
-        <p class="title">Temas relacionados:</p><ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creación de un nuevo contacto</a>
-            </p></li>
-</ul>
-      </p>
+<p role="presentation" class="cap-contacts"><p class="title">Interfaz de usuario:</p><ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p></li></ul> <p class="title">Temas relacionados:</p><ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creación de un nuevo contacto</a></p></li>
+</ul></p>
 <p id="ox.appsuite.user.parent.email.manage.collectaddress">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.delete.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.delete.html
index a1e60f246..19162230a 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.delete.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.delete.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.archive.html" title="Archivado de correos">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Limpieza de carpetas de correo">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.recover.html" title="Recuperar correos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.archive.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.recover.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -38,20 +38,20 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Borrado de correos</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.21.2"></a><a class="indexterm" name="id-1.7.15.21.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">Existen las siguientes opciones: </p>
+<a class="indexterm" name="id-1.7.15.22.2"></a><a class="indexterm" name="id-1.7.15.22.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Indicar si los correos se mueven a la Papelera o se eliminan permanentemente cuando se borran.</p>
-<p role="presentation">Los correos que se mueven a la papelera se pueden recuperar.</p>
+<p role="presentation">Puede definir si los correos se mueven a la Papelera o se eliminan permanentemente cuando se borran. </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Los correos que se mueven a la papelera se pueden recuperar.</p></li>
+<li class="listitem"><p role="presentation"><span class="cap-dumpster">Los correos borrados permanentemente se pueden recuperar en un plazo de 14 días. Una vez transcurrido este tiempo: </span> Los correos borrados permanentemente <span class="phrase"><strong>no</strong></span> se pueden recuperar.</p></li>
+</ul>
 </li>
-<li class="listitem"><p role="presentation">Borrar mensajes de correo individuales o conversaciones completas.</p></li>
-<li class="listitem"><p role="presentation">Borrar todos los correos de una carpeta de correo.</p></li>
-<li class="listitem"><p role="presentation">Recuperar correos de la papelera.</p></li>
-<li class="listitem"><p role="presentation">Borrar correos de la papelera permanentemente.</p></li>
-<li class="listitem"><p role="presentation">Borrar permanentemente todos los correos de la papelera vaciándola.</p></li>
+<li class="listitem"><p role="presentation">Puede borrar mensajes de correo individuales o conversaciones completas.</p></li>
+<li class="listitem"><p role="presentation">Puede borrar todos los correos de una carpeta de correo.</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.delete.setting">
-<p class="title">Cómo definir si los correos se mueven a la papelera o se eliminan permanentemente cuando se borran.</p>
+<p class="title">Cómo definir si los correos se mueven a la papelera o se eliminan permanentemente cuando se borran:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.setting"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
@@ -65,21 +65,21 @@
 <li class="listitem"><p role="presentation">Si los correos se van a mover a la papelera, deshabilite <span class="guibutton"><strong>Eliminar permanentemente los correos borrados</strong></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Si los correos se van a borrar permanentemente, active <span class="guibutton"><strong>Eliminar permanentemente los correos borrados</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Los correos borrados permanentemente <span class="phrase"><strong>no</strong></span> se pueden recuperar.</p>
+<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Dependiendo de la configuración, los correos borrados permanentemente <span class="phrase"><strong>no</strong></span> se pueden recuperar.</p>
 </li>
 </ul></p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.delete">
-<p class="title">Cómo borrar un correo:</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.single">
+<p class="title">Cómo borrar correos individuales:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Seleccione uno o varios correos.</p></li>
 <li class="step">
-<p role="presentation">Presione el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la barra de herramientas.</p>
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la barra de herramientas.</p>
 <p role="presentation">O: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Presione las teclas [Supr] o [Retroceso] del teclado.</p></li>
 <li class="listitem"><p role="presentation">En el menú contextual de un correo, presione en <span class="guibutton"><strong>Borrar</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Si se ha seleccionado un correo individual, use el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> en la vista de detalle.</p></li>
+<li class="listitem"><p role="presentation">Si se ha seleccionado un correo individual, use el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la vista de detalle.</p></li>
 </ul></p>
 </li>
 </ol></div>
@@ -87,7 +87,7 @@
           <p>Resultado: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Si la configuración <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Eliminar permanentemente los correos borrados</strong></span></a> está deshabilitada:</p>
+<p role="presentation">Si la configuración <span class="guibutton"><strong>Eliminar permanentemente los correos borrados</strong></span> está deshabilitada:</p>
 <p role="presentation">Los correos se moverán a la carpeta Papelera.</p>
 </li>
 <li class="listitem">
@@ -97,17 +97,17 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptyfolder">
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.emptyfolder">
 <p class="title">Cómo borrar todos los correos de una carpeta:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">En la vista de carpeta,seleccione la carpeta cuyos correos quiere borrar.</p></li>
 <li class="step">
 <p role="presentation">Utilice uno de los métodos siguientes: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Presione el icono <span class="guibutton"><strong>Acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto al nombre de la carpeta.</p></li>
-<li class="listitem"><p role="presentation">Presione el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> encima de la lista.</p></li>
+<li class="listitem"><p role="presentation">Presione el icono <span class="guibutton"><strong>Acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto al nombre de la carpeta.</p></li>
+<li class="listitem"><p role="presentation">Presione el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay encima de la lista.</p></li>
 </ul></p>
 <p role="presentation">Presione el botón <span class="guibutton"><strong>Borrar todos los mensajes</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si la configuración <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Eliminar permanentemente los correos borrados</strong></span></a> está habilitada, los correos borrados no se podrán recuperar.</p>
+<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si la opción <span class="guibutton"><strong>Eliminar permanentemente correos borrados</strong></span> está habilitada, los correos borrados <span class="phrase"><strong>no</strong></span> se pueden recuperar, dependiendo de la configuración.</p>
 </li>
 <li class="step"><p role="presentation">Confirme que desea borrar el contenido de esta carpeta.</p></li>
 </ol></div>
@@ -115,7 +115,7 @@
           <p>Resultado: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Si la configuración <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Eliminar permanentemente los correos borrados</strong></span></a> está deshabilitada:</p>
+<p role="presentation">Si la configuración <span class="guibutton"><strong>Eliminar permanentemente los correos borrados</strong></span> está deshabilitada:</p>
 <p role="presentation">Los correos se moverán a la carpeta Papelera.</p>
 </li>
 <li class="listitem">
@@ -125,60 +125,22 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
-<p class="title">Cómo recuperar correos eliminados:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Abra la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
-<li class="step"><p role="presentation">Seleccione uno o varios correos.</p></li>
-<li class="step"><p role="presentation">En el menú contextual del correo, presione en <span class="guibutton"><strong>Mover</strong></span>.</p></li>
-<li class="step"><p role="presentation">Seleccione una carpeta de la ventana <span class="guilabel"><strong>Mover</strong></span>. Presione en el botón <span class="guibutton"><strong>Mover</strong></span>.</p></li>
-</ol></div>
-<div class="taskrelated">
-          <p>O: </p>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Para recuperar todos los correos de la papelera, presione en el icono <span class="guibutton"><strong>Más opciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> encima de la lista. Presione en el botón <span class="guibutton"><strong>Mover todos los mensajes</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Si se ha seleccionado un correo individual, use el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> de la vista de detalle. Presione en <span class="guibutton"><strong>Mover</strong></span>.</p></li>
-</ul>
-        </div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever">
-<p class="title">Cómo borrar definitivamente un correo:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Advertencia:</strong></span> Los correos borrados permanentemente <span class="phrase"><strong>no</strong></span> se pueden recuperar.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Abra la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
-<li class="step"><p role="presentation">Seleccione uno o varios correos.</p></li>
-<li class="step">
-<p role="presentation">Presione el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la barra de herramientas.</p>
-<p role="presentation">Si se ha seleccionado un correo individual, también puede usar el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la vista de detalle.</p>
-</li>
-<li class="step"><p role="presentation">Confirme que desea borrar permanentemente los correos seleccionados.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptytrash">
-<p class="title">Cómo borrar permanentemente el contenido de la carpeta Papelera:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Advertencia:</strong></span> Los correos borrados permanentemente <span class="phrase"><strong>no</strong></span> se pueden recuperar.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Seleccione la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
-<li class="step">
-<p role="presentation">Utilice uno de los métodos siguientes: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Presione el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto a la <span class="guibutton"><strong>Papelera</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Presione el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay encima de la lista.</p></li>
-</ul></p>
-<p role="presentation">Presione <span class="guibutton"><strong>Vaciar carpeta</strong></span>.</p>
-</li>
-<li class="step"><p role="presentation">Confirme que desea borrar el contenido de la carpeta.</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.email.manage.delete"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.22.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.email.manage.delete">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.deleteforever.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.deleteforever.html
new file mode 100644
index 000000000..1c274e257
--- /dev/null
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.deleteforever.html
@@ -0,0 +1,92 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Borrado de correos</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.recover.html" title="Recuperar correos">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Recuperar correos borrados permanentemente">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.recover.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Correo electrónico</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de correos</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.deleteforever">
+<div class="titlepage"><div><div><h3 class="title">Borrado de correos</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.24.2"></a><a class="indexterm" name="id-1.7.15.24.3"></a><p id="ox.appsuite.user.concept.email.manage.deleteforever">Existen las siguientes opciones: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Borrar correos individuales de la papelera permanentemente.</p></li>
+<li class="listitem"><p role="presentation">Borrar permanentemente todos los correos de la papelera vaciándola.</p></li>
+</ul>
+<p id="ox.appsuite.user.hint.email.manage.deleteforever.html"><span class="cap-dumpster">Los correos borrados permanentemente se pueden recuperar en un plazo de 14 días. Una vez transcurrido este tiempo: </span>Los correos borrados permanentemente <span class="phrase"><strong>no</strong></span> se pueden recuperar.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.single">
+<p class="title">Cómo borrar permanentemente correos individuales:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Abra la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
+<li class="step"><p role="presentation">Seleccione uno o varios correos.</p></li>
+<li class="step">
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la barra de herramientas.</p>
+<p role="presentation">Si se ha seleccionado un correo individual, también puede usar el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de la vista de detalle.</p>
+</li>
+<li class="step"><p role="presentation">Confirme que desea borrar permanentemente los correos seleccionados.</p></li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.emptytrash">
+<p class="title">Cómo borrar todos los correos de la papelera permanentemente:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
+<li class="step">
+<p role="presentation">Utilice uno de los métodos siguientes: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Presione el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto a la <span class="guibutton"><strong>Papelera</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Presione el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay encima de la lista.</p></li>
+</ul></p>
+<p role="presentation">Presione <span class="guibutton"><strong>Vaciar carpeta</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Confirme que desea borrar el contenido de la carpeta.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.deleteforever"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.24.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.deleteforever">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.draft.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.draft.html
index 607722f5e..af126b5cc 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.draft.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.draft.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.draft">
 <div class="titlepage"><div><div><h3 class="title">Uso de borradores de correo</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">Mientras redacta un correo, se guarda automáticamente como un borrador a intervalos regulares. Existen las siguientes opciones:</p>
+<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">Mientras redacta un correo, se guarda automáticamente como un borrador a intervalos regulares. Existen las siguientes opciones:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Editar o enviar un borrador de correo.</p></li>
 <li class="listitem"><p role="presentation">Editar o enviar una copia de un borrador de correo.</p></li>
@@ -69,11 +69,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.draft"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.manage.draft">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.expungefolder.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.expungefolder.html
index a8bac4eb8..239cb9530 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.expungefolder.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.expungefolder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Borrado de correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Recuperar correos borrados permanentemente">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.unifiedmail.html" title="Utilización del correo unificado">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Siguiente</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.expungefolder">
 <div class="titlepage"><div><div><h3 class="title">Limpieza de carpetas de correo</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.22.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Dependiendo de la configuración del cliente de correo, los correos que borre desde un cliente de correo como Apple Mail, MS Outlook o Mozilla Thunderbird podrían borrarse solo tras desconectarse desde dicho cliente. Mientras tanto, esos correos se mostrarán tachados en el software colaborativo. Para borrar dichos correos, limpie la carpeta de correo.</p>
+<a class="indexterm" name="id-1.7.15.26.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Dependiendo de la configuración del cliente de correo, los correos que borre desde un cliente de correo como Apple Mail, MS Outlook o Mozilla Thunderbird podrían borrarse solo tras desconectarse desde dicho cliente. Mientras tanto, esos correos se mostrarán tachados en el software colaborativo. Para borrar dichos correos, limpie la carpeta de correo.</p>
 <p id="ox.appsuite.user.hint.email.manage.expungefolder">Nota: Dependiendo de la configuración, esta función no está disponible si dichos correos no se muestran.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.expunge">
 <p class="title">Cómo limpiar una carpeta de correo:</p>
@@ -47,14 +47,12 @@
 <li class="step"><p role="presentation">Presione el icono <span class="guibutton"><strong>Acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.expungefolder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto al nombre de la carpeta. Presione en <span class="guibutton"><strong>Limpiar</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.expungefolder">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.expungefolder"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.expungefolder">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.html
index ceaf501db..36b99cf74 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.html
@@ -43,17 +43,21 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Mover o copiar correos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Recopilación de direcciones</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Mostrar código fuente del correo</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Uso de borradores de correo</a></p></li>
-<li class="listitem cap-tasks" id="id-1.7.15.4.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creación de recordatorios de correo</a></p></li>
+<li class="listitem cap-tasks" id="id-1.7.15.4.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creación de recordatorios de correo</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Añadir un correo al portal</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Almacenamiento de correos</a></p></li>
-<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exportación de correos como PDF</a></p></li>
+<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exportación de correos como PDF</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importación de correos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Impresión de correos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archivado de correos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.4.1.19"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilización del correo unificado</a></p></li>
 </ul>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.import.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.import.html
index ae1acd4f1..034720f4a 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.import.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importación de correos</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><p id="ox.appsuite.user.concept.email.manage.import">Puede importar un correo disponible en formato EML.</p>
+<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.import">Puede importar un correo disponible en formato EML.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.import">
 <p class="title">Cómo importar un correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,14 +46,15 @@
 <li class="step"><p role="presentation">Arrastre el archivo eml desde un administrador de archivos o desde el escritorio a la vista de lista de correos.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.import"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Almacenamiento de correos</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Almacenamiento de correos</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.import">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.inboxcategories.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.inboxcategories.html
index b3cf94e5f..d44f18a2e 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.inboxcategories.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.inboxcategories.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation">asignar correos entrantes a una categoría de la bandeja de entrada</p></li>
 <li class="listitem"><p role="presentation">editar la vista de categorías de la bandeja de entrada</p></li>
 </ul>
-<p role="presentation" class="feat-io-ox-core-categories">Nota: Las categorías de la bandeja de entrada descritas aquí solo se pueden usar para correos. Dependiendo de la configuración, puede usar categorías separadas para citas, contactos y tareas. Consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Nota: Las categorías de la bandeja de entrada descritas aquí solo se pueden usar para correos. Dependiendo de la configuración, puede usar categorías separadas para correos, citas, contactos y tareas. Consulte <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.inboxcategories.activate">
 <p class="title">Cómo activar o desactivar pestañas de la bandeja de entrada:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,7 @@
 <p role="presentation">Para activar las pestañas de la bandeja de entrada, presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.activate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Categorías de la Bandeja de entrada</strong></span>.</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">También puede usar el botón <span class="guibutton"><strong>Configurar categorías de la Bandeja de entrada</strong></span> debajo de <span class="guibutton"><strong>Lectura</strong></span> en la configuración del correo.</p></li></ul>
 <p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configurar categorías</strong></span>. Muestra las categorías de la bandeja de entrada disponibles. Presione <span class="guibutton"><strong>Activar categorías</strong></span>.</p>
-<p role="presentation">En la parte derecha, bajo la barra de menús, se mostrará la barra de pestañas.</p>
+<p role="presentation">Debajo de la barra de menús se mostrará la barra de categorías de la bandeja de entrada.</p>
 </li>
 <li class="step">
 <p role="presentation">Para desactivar las pestañas de la bandeja de entrada, presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.deactivate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Categorías de la Bandeja de entrada</strong></span>.</p>
@@ -68,7 +68,7 @@
 <p role="presentation">Los correos que no se hayan asignado aún a ninguna categoría de la bandeja de entrada se muestran en la pestaña <span class="guibutton"><strong>General</strong></span>.</p>
 </li>
 <li class="step">
-<p role="presentation">Arrastre un correo desde la vista de la lista a una pestaña de la barra de pestañas y suéltelo allí.</p>
+<p role="presentation">Arrastre un correo desde la vista de la lista a una categoría de la barra de categorías de la bandeja de entrada y suéltelo allí.</p>
 <p role="presentation">También puede seleccionar un correo. Presione el icono <span class="guibutton"><strong>Asignar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span> de la barra de herramientas. Seleccione una pestaña del menú.</p>
 </li>
 <li class="step"><p role="presentation">Para terminar el proceso, haga una de las operaciones siguientes: <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -82,14 +82,14 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Categorías de la Bandeja de entrada</strong></span>.</p>
-<p role="presentation">También puede presionar el icono <span class="guibutton"><strong>Configurar categorías</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> de la barra de categorías.</p>
+<p role="presentation">También puede presionar el icono <span class="guibutton"><strong>Configurar categorías</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> de la barra de categorías de la bandeja de entrada.</p>
 <p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configurar categorías</strong></span>.</p>
 </li>
 <li class="step">
 <p role="presentation">Para activar o desactivar una categoría de la bandeja de entrada, marque o desmarque la casilla de verificación correspondiente.</p>
 <p role="presentation">Para renombrar una categoría de la bandeja de entrada, edite el texto correspondiente.</p>
 <p role="presentation">Nota: Algunas categorías no se pueden editar.</p>
-<p role="presentation">Para ocultar la barra de categorías, presione en <span class="guibutton"><strong>Desactivar categorías</strong></span>.</p>
+<p role="presentation">Para ocultar la barra de categorías de la bandeja de entrada, presione en <span class="guibutton"><strong>Desactivar categorías</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">Presione en <span class="guibutton"><strong>Guardar</strong></span>.</p></li>
 </ol></div>
@@ -98,14 +98,11 @@
 <p class="title">Interfaz de usuario:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">El menú de configuración de <span class="phrase">Correo electrónico</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de pestañas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra de categorías de la bandeja de entrada</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.inboxcategories">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.label.html
index 596c6f7cf..42b8f88b6 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.label.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.label.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Recopilación de direcciones">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="De forma predeterminada se utiliza PGP incrustado para correos nuevos">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.source.html" title="Mostrar código fuente del correo">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.categories.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.source.html">Siguiente</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.label">
 <div class="titlepage"><div><div><h3 class="title">Clasificación de correos</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Dependiendo de la configuración, puede usar una de las siguientes opciones para organizar correos: </p>
+<a class="indexterm" name="id-1.7.15.12.2"></a><a class="indexterm" name="id-1.7.15.12.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Dependiendo de la configuración, puede usar una de las siguientes opciones para organizar correos: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">una etiqueta coloreada</p></li>
 <li class="listitem"><p role="presentation">una marca</p></li>
@@ -69,7 +69,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.label"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.mark.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.mark.html
index b264ec782..31a1bdbc9 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.mark.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.mark.html
@@ -62,7 +62,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.mark"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a></p></li></ul>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.movecopy.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.movecopy.html
index 756f3395d..35b9417c3 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.movecopy.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.movecopy.html
@@ -67,7 +67,11 @@
 </ul>
 <p id="ox.appsuite.user.related.email.manage.movecopy"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.pdfexport.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.pdfexport.html
index fe4f7847e..e2213b517 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.pdfexport.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.pdfexport.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.pdfexport">
 <div class="titlepage"><div><div><h3 class="title">Exportación de correos como PDF</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.17.2"></a><a class="indexterm" name="id-1.7.15.17.3"></a><a class="indexterm" name="id-1.7.15.17.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Nota: Dependiendo de la configuración, esta función podría no estar disponible.</p>
+<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><a class="indexterm" name="id-1.7.15.18.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Nota: Dependiendo de la configuración, esta función podría no estar disponible.</p>
 <p id="ox.appsuite.user.concept.email.manage.pdfexport">Se puede exportar un correo y sus adjuntos en formato docx como PDF. En cuanto se crea el archivo PDF, se guardará en una carpeta de <span class="phrase">Ficheros</span> que puede definirse. Dependiendo del volumen de datos, la descarga podría tardar un poco. En cuanto el proceso haya finalizado, se recibirá una notificación.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.pdfexport">
 <p class="title">Cómo exportar correos como PDF:</p>
@@ -54,7 +54,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.pdfexport"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Almacenamiento de correos</a></p></li></ul>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.print.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.print.html
index 3ea4a87b6..fc88273f5 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.print.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Impresión de correos</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.print">Puede imprimir el contenido de uno o varios correos.</p>
+<a class="indexterm" name="id-1.7.15.20.2"></a><a class="indexterm" name="id-1.7.15.20.3"></a><p id="ox.appsuite.user.concept.email.manage.print">Puede imprimir el contenido de uno o varios correos.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.print">
 <p class="title">Cómo imprimir el contenido de un correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -56,7 +56,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.print"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archivado de correos</a></p></li></ul>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.recover.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.recover.html
new file mode 100644
index 000000000..845543a01
--- /dev/null
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.recover.html
@@ -0,0 +1,97 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Recuperar correos</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Borrado de correos">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Borrado de correos">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Correo electrónico</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de correos</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.recover">
+<div class="titlepage"><div><div><h3 class="title">Recuperar correos</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.recover">Existen las siguientes opciones: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Recuperar correos individuales de la papelera.</p></li>
+<li class="listitem"><p role="presentation">Recuperar todos los correos de la papelera.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.single">
+<p class="title">Cómo recuperar correos individuales de la papelera:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Abra la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
+<li class="step">
+<p role="presentation">Seleccione uno o varios correos.</p>
+<p role="presentation">En el menú contextual del correo, presione en <span class="guibutton"><strong>Mover</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Seleccione una carpeta de la ventana <span class="guilabel"><strong>Mover</strong></span>. Presione en <span class="guibutton"><strong>Mover</strong></span>.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>O: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Utilice arrastrar y soltar para mover los correos de la papelera a una carpeta en la vista de carpetas.</p></li>
+<li class="listitem"><p role="presentation">Si se ha seleccionado un correo individual, use el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.single.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> de la vista de detalle. Presione en <span class="guibutton"><strong>Mover</strong></span>.</p></li>
+</ul>
+        </div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.all">
+<p class="title">Cómo recuperar todos los correos de la papelera:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
+<li class="step">
+<p role="presentation">Utilice uno de los métodos siguientes: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Presione el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto a la <span class="guibutton"><strong>Papelera</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Presione el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay encima de la lista.</p></li>
+</ul></p>
+<p role="presentation">Presione el botón <span class="guibutton"><strong>Mover todos los mensajes</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Seleccione una carpeta de la ventana <span class="guilabel"><strong>Mover</strong></span>. Presione en <span class="guibutton"><strong>Mover todos</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.recover"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.23.7.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recuperar correos borrados permanentemente</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.recover">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.reminder.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.reminder.html
index 3b8e244c6..20120bb1c 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.reminder.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.reminder.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.reminder">
 <div class="titlepage"><div><div><h3 class="title">Creación de recordatorios de correo</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">Puede activar un recordatorio para un correo. Esta función crea una tarea y le recordará la fecha de vencimiento.</p>
+<a class="indexterm" name="id-1.7.15.15.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">Puede activar un recordatorio para un correo. Esta función crea una tarea y le recordará la fecha de vencimiento.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.email.manage.reminder">
 <p class="title">Cómo crear un recordatorio de correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.reminder"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Creación de nuevas tareas</a></p></li></ul>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.save.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.save.html
index 58d1ac12b..d401ecbb8 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.save.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.save.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.save">
 <div class="titlepage"><div><div><h3 class="title">Almacenamiento de correos</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.16.2"></a><p id="ox.appsuite.user.concept.email.manage.save">Puede guardar un correo como archivo de texto. El archivo de texto tendrá la extensión EML. Si selecciona múltiples correos, se creará un archivo eml por cada correo. Después, los archivos eml se guardarán como un archivo zip.</p>
+<a class="indexterm" name="id-1.7.15.17.2"></a><p id="ox.appsuite.user.concept.email.manage.save">Puede guardar un correo como archivo de texto. El archivo de texto tendrá la extensión EML. Si selecciona múltiples correos, se creará un archivo eml por cada correo. Después, los archivos eml se guardarán como un archivo zip.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.save">
 <p class="title">Cómo guardar un correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.save"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -57,7 +60,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importación de correos</a></p>
 <p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exportación de correos como PDF</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.7.15.16.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.7.15.17.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.save">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.source.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.source.html
index 854408d40..8309e946f 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.source.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.source.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.source">
 <div class="titlepage"><div><div><h3 class="title">Mostrar código fuente del correo</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.12.2"></a><p id="ox.appsuite.user.concept.email.manage.source">El código fuente del correo contiene el contenido completo de un correo, es decir, los datos de la cabecera del correo completos.</p>
+<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.source">El código fuente del correo contiene el contenido completo de un correo, es decir, los datos de la cabecera del correo completos.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.source">
 <p class="title">Cómo mostrar el código fuente de un correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.source"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra de herramientas de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.undelete.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.undelete.html
new file mode 100644
index 000000000..a193ebb90
--- /dev/null
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.undelete.html
@@ -0,0 +1,75 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Recuperar correos borrados permanentemente</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestión de correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Borrado de correos">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Limpieza de carpetas de correo">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Correo electrónico</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de correos</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.undelete">
+<div class="titlepage"><div><div><h3 class="title">Recuperar correos borrados permanentemente</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.25.2"></a><a class="indexterm" name="id-1.7.15.25.3"></a><p id="ox.appsuite.user.concept.email.manage.undelete.html">Puede recuperar correos borrados permanentemente en un período de de 14 días. Una vez transcurrido este tiempo, los correos borrados permanentemente se perderán irreversiblemente.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
+<p class="title">Cómo recuperar correos borrados permanentemente:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione la carpeta <span class="guibutton"><strong>Papelera</strong></span> en la vista de carpeta.</p></li>
+<li class="step">
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Más acciones</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> que hay junto a la <span class="guibutton"><strong>Papelera</strong></span>.</p>
+<p role="presentation">Presione en <span class="guibutton"><strong>Recuperar elementos borrados</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Seleccione los correos que desea recuperar en la ventana <span class="guilabel"><strong>Recuperar elementos borrados</strong></span>.</p>
+<p role="presentation">Presione en <span class="guibutton"><strong>Mover elementos seleccionados</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">En la ventana <span class="guilabel"><strong>Mover</strong></span>, especifique la carpeta que debería contener los correos  recuperados.</p>
+<p role="presentation">Presione en <span class="guibutton"><strong>Mover</strong></span>.</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.undelete"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista de carpeta de <span class="phrase">Correo electrónico</span></a></p></li></ul>
+<p> </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recuperar correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Borrado de correos</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Limpieza de carpetas de correo</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.undelete">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestión de correos</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.unifiedmail.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.unifiedmail.html
index 37fce8b50..a61aad7d2 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.unifiedmail.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.manage.unifiedmail.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.unifiedmail">
 <div class="titlepage"><div><div><h3 class="title">Utilización del correo unificado</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">Con Correo unificado se pueden mostrar correos de varias cuentas de correo en una única carpeta centralizada. Esto proporciona una rápida vista general de las bandejas de entrada de varias cuentas. Correo unificado puede describirse así: </p>
+<a class="indexterm" name="id-1.7.15.27.2"></a><a class="indexterm" name="id-1.7.15.27.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">Con Correo unificado se pueden mostrar correos de varias cuentas de correo en una única carpeta centralizada. Esto proporciona una rápida vista general de las bandejas de entrada de varias cuentas. Correo unificado puede describirse así: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Además de la bandeja de entrada de una cuenta de correo, la carpeta <span class="guibutton"><strong>Correo unificado</strong></span> muestra una panorámica de los correos de la cuenta. En realidad, los correos solo existen una vez.</p></li>
 <li class="listitem"><p role="presentation">Los correos de subcarpetas de la Bandeja de entrada no se muestran en la carpeta <span class="guibutton"><strong>Correo unificado</strong></span>.</p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.openai.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.openai.html
index 343ce923d..0658e997d 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.openai.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.openai.html
@@ -42,7 +42,7 @@
 <li class="listitem"><p role="presentation">edite el contenido de correos ya existentes o consiga sugerencias al texto creadas para responderlos</p></li>
 <li class="listitem"><p role="presentation">consiga sugerencias al texto creadas para enviar correos nuevos</p></li>
 </ul>
-<p> Nota: Cuando se usa la integración con AI, el contenido del correo correspondiente se enviará al Servicio OpenAI de Microsoft Azure </p>
+<p> Nota: Cuando se usa la integración con AI, el contenido del correo correspondiente se enviará al Servicio OpenAI. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">La primera vez que use una función de AI se abre un cuadro de diálogo en el que puede dar su consentimiento para el envío de estos datos. Sólo se pueden usar las funciones de AI tras haber dado su consentimiento al envío de los datos.</p></li>
 <li class="listitem"><p role="presentation">Se puede cambiar su consentimiento al envío de los datos en cualquier momento. Para ello, presione en <span class="guibutton"><strong>Cambiar consentimiento</strong></span> debajo de <span class="guibutton"><strong>Integración con AI</strong></span> en la configuración del correo.</p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.openai.send.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.openai.send.html
index 526c8a6c5..87dc99e0b 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.openai.send.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.openai.send.html
@@ -64,7 +64,7 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Uso de funciones de AI al responder a correos</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.email.openai.send">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Uso de la integración con AI</a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.search.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.search.html
index 42d936f8b..813827ea2 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.search.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.search.html
@@ -101,9 +101,14 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a>
           </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Clasificación de correos</a>
-          </p></li>
+          </p>
+<p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
+          </p>
+</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attachmentexisting.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attachmentexisting.html
index 90d217342..f3c766d70 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attachmentexisting.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attachmentexisting.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="Adición de adjuntos">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Envío de adjuntos como enlace">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="añadir adjuntos">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="enviar adjuntos como enlace">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentexisting">
 <div class="titlepage"><div><div><h3 class="title">Añadir adjuntos de correos ya existentes</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.9.2"></a><a class="indexterm" name="id-1.7.11.9.3"></a><p id="ox.appsuite.user.concept.email.send.attachmentexisting">Dependiendo de la configuración, puede añadir adjuntos de correos ya existentes a un nuevo correo.</p>
@@ -59,14 +59,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachmentexisting"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envío de adjuntos como enlace</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">enviar adjuntos como enlace</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attachmentlink.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attachmentlink.html
index 53255ad79..18a6acf50 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attachmentlink.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attachmentlink.html
@@ -1,11 +1,11 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Envío de adjuntos como enlace</title>
+<title>enviar adjuntos como enlace</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Añadir adjuntos de correos ya existentes">
 <link rel="next" href="ox.appsuite.user.sect.email.send.templates.html" title="Uso de plantillas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentlink">
-<div class="titlepage"><div><div><h3 class="title">Envío de adjuntos como enlace</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">enviar adjuntos como enlace</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.10.2"></a><p id="ox.appsuite.user.concept.email.send.attachmentlink">Esta función permite enviar grandes adjuntos por correo. Funciona así: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Los adjuntos se subirán a una nueva carpeta situada en <span class="guibutton"><strong>Correo de Drive</strong></span> en la aplicación <span class="phrase">Ficheros</span>. El nombre de esta carpeta se corresponde con el asunto del correo. La carpeta se compartirá mediante un enlace público.</p></li>
@@ -89,14 +89,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.attachmentlink"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachmentlink">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachmentlink">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attachments.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attachments.html
index 82c1389a7..00f7e7cc7 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attachments.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attachments.html
@@ -1,11 +1,11 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Adición de adjuntos</title>
+<title>añadir adjuntos</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.replyto.html" title="Configuración de la dirección de respuesta">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Añadir adjuntos de correos ya existentes">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachments">
-<div class="titlepage"><div><div><h3 class="title">Adición de adjuntos</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">añadir adjuntos</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.8.2"></a><a class="indexterm" name="id-1.7.11.8.3"></a><p id="ox.appsuite.user.concept.emal.add.attachments">Dependiendo de la configuración, se pueden adjuntar archivos guardados en su computadora o en la aplicación <span class="phrase">Ficheros</span>.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.attachments">
 <p class="title">Cómo añadir adjuntos en la ventana de edición de correo:</p>
@@ -62,14 +62,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachments"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envío de adjuntos como enlace</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">enviar adjuntos como enlace</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachments">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachments">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attendees.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attendees.html
index efe070691..5e2130f37 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attendees.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Reenvío automático de correos">
 <link rel="next" href="ox.appsuite.user.sect.email.send.vacationnotice.html" title="Envío de un aviso de ausencia automático">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attendees">
 <div class="titlepage"><div><div><h3 class="title">Envío de un correo a participantes de citas</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.16.2"></a><div class="task" id="ox.appsuite.user.task.email.send.attendees">
@@ -51,25 +51,16 @@
 <li class="step"><p role="presentation">Rellene los datos para el envío del correo.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.send.attendees">
-        </p>
+<p id="ox.appsuite.user.related.email.send.attendees"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La ventana emergente de <span class="phrase">Calendario</span></a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra de herramientas de <span class="phrase">Calendario</span></a>
-            </p>
-</li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
-            </p></li>
-</ul>
-<p>
-      </p>
-<p id="ox.appsuite.user.parent.email.send.attendees">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
+<p id="ox.appsuite.user.parent.email.send.attendees">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.autoforward.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.autoforward.html
index dca29b6f6..534d52b39 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.autoforward.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.autoforward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.forward.html" title="Reenvío de correos">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attendees.html" title="Envío de un correo a participantes de citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.autoforward">
 <div class="titlepage"><div><div><h3 class="title">Reenvío automático de correos</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.15.2"></a><p id="ox.appsuite.user.concept.email.send.autoforward">Puede hacer que los correos se reenvíen automáticamente a otras direcciones.</p>
@@ -67,7 +67,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
+              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a>
@@ -90,7 +90,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.email.send.autoforward">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.autoforward">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.forward.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.forward.html
index 96704ca03..5b804f25d 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.forward.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.forward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.reply.html" title="Respuesta a correos">
 <link rel="next" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Reenvío automático de correos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.forward">
 <div class="titlepage"><div><div><h3 class="title">Reenvío de correos</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.14.2"></a><p id="ox.appsuite.user.concept.email.send.forward">Si se reenvía un correo, algunos de los campos del correo aparecen ya rellenos: </p>
@@ -74,11 +74,11 @@
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Reenvío automático de correos</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.forward">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.forward">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.html
index 198f9c4d0..bcf02cdb9 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.html
@@ -1,13 +1,13 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Envío de correos</title>
+<title>enviar correos</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="Correo electrónico">
 <link rel="prev" href="ox.appsuite.user.sect.email.attachments.html" title="Visualización y guardado de adjuntos de correo">
-<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Envío de un nuevo correo">
+<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Envío de nuevos correos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -36,15 +36,15 @@
     
   </h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.send">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Envío de correos</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">enviar correos</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.email.send">Aprenda cómo enviar un correo y sobre las funciones disponibles para personalizar el contenido del correo: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Configuración de la dirección de respuesta</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a></p></li>
-<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envío de adjuntos como enlace</a></p></li>
+<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">enviar adjuntos como enlace</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.11.2.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.new.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.new.html
index 3978999cf..feb6999a6 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.new.html
@@ -1,13 +1,13 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Envío de un nuevo correo</title>
+<title>Envío de nuevos correos</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
-<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="Selección de una dirección de remite">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
+<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="seleccionar una dirección de remite">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.new">
-<div class="titlepage"><div><div><h3 class="title">Envío de un nuevo correo</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Envío de nuevos correos</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.5.2"></a><a class="indexterm" name="id-1.7.11.5.3"></a><a class="indexterm" name="id-1.7.11.5.4"></a><div class="task" id="ox.appsuite.user.task.email.send.new">
 <p class="title">Cómo enviar un nuevo correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -93,37 +93,26 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">El botón Nuevo correo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">La ventana de edición de correo</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Acciones subordinadas:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Adición automática de Contactos o Recursos desde una libreta de direcciones</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Adición automática de Contactos o Recursos desde el Directorio de Direcciones</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selección de una dirección de remite</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">seleccionar una dirección de remite</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Configuración de la dirección de respuesta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adición de adjuntos</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">añadir adjuntos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Añadir adjuntos de correos ya existentes</a></p>
-<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envío de adjuntos como enlace</a></p>
+<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">enviar adjuntos como enlace</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Reenvío de correos</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Reenvío automático de correos</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Envío de un correo a participantes de citas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Envío de un aviso de ausencia automático</a></p>
-<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envío de contactos como vCard</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envío de correos desde una libreta de direcciones</a></p>
-</li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Uso de funciones de AI al redactar correos</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Uso de funciones de AI al redactar correos</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.new">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.new">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.reply.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.reply.html
index 4a644c592..9d425550c 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.reply.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.reply.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.signatures.html" title="Uso de firmas">
 <link rel="next" href="ox.appsuite.user.sect.email.send.forward.html" title="Reenvío de correos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.reply">
 <div class="titlepage"><div><div><h3 class="title">Respuesta a correos</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.13.2"></a><p id="ox.appsuite.user.concept.email.send.reply">Al responder a un correo, algunos de los campos del correo aparecen ya rellenados: </p>
@@ -70,13 +70,13 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Reenvío de correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Envío de un aviso de ausencia automático</a></p>
 </li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.11.13.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Uso de funciones de AI al responder a correos</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.reply">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.reply">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.replyto.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.replyto.html
index d9ab56b13..8a3e331e7 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.replyto.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.replyto.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="Selección de una dirección de remite">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="Adición de adjuntos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="seleccionar una dirección de remite">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="añadir adjuntos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.replyto">
 <div class="titlepage"><div><div><h3 class="title">Configuración de la dirección de respuesta</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.7.2"></a><p id="ox.appsuite.user.concept.email.send.replyto">De manera predeterminada, cuando un destinatario responde a su correo, la respuesta se envía a la cuenta de correo desde la que usted envió el correo. Alternativamente, puede usar la ventana de edición de correo para especificar las direcciones de correo a las que se enviará la respuesta al correo enviado.</p>
@@ -43,11 +43,11 @@
 <p class="title">Cómo seleccionar una dirección de respuesta en la ventana de edición de correo:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">En la ventana de edición de correo, presione en <span class="guibutton"><strong>RE</strong></span> junto a la dirección del remitente. Se mostrará el campo <span class="guibutton"><strong>Responder a</strong></span>.</p>
+<p role="presentation">En la ventana de edición de correo, presione en <span class="guibutton"><strong>Re</strong></span> junto a la dirección del remitente. Se mostrará el campo <span class="guibutton"><strong>Responder a</strong></span>.</p>
 <p role="presentation">Si ha especificado direcciones de respuesta predeterminadas al editar su cuenta de correo principal, el campo <span class="guibutton"><strong>Responder a</strong></span> se muestra automáticamente. El campo incluye las direcciones de respuesta predeterminadas.</p>
 </li>
 <li class="step">
-<p role="presentation">En <span class="guibutton"><strong>Responder a</strong></span>, introduzca las direcciones de correo a las que desea que se envíe la respuesta a su correo. <ul class="itemizedlist" style="list-style-type: disc; ">
+<p role="presentation">En <span class="guibutton"><strong>Responder a</strong></span>, introduzca las direcciones de correo a las que se debería enviar la respuesta a su correo. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Mientras se escriben los destinatarios se mostrarán varias sugerencias relacionadas. Para aceptar una sugerencia, presione en ella.</p></li>
 <li class="listitem"><p role="presentation">Para seleccionar contactos de una libreta de direcciones, presione el icono <span class="guibutton"><strong>Seleccionar contacto</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.replyto.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span> de la parte derecha del campo.</p></li>
 </ul></p>
@@ -57,11 +57,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.replyto"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">Edición de la cuenta de correo principal</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.replyto">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.replyto">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.sender.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.sender.html
index 0f0940719..0166db912 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.sender.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.sender.html
@@ -1,12 +1,12 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Selección de una dirección de remite</title>
+<title>seleccionar una dirección de remite</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Envío de un nuevo correo">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Envío de nuevos correos">
 <link rel="next" href="ox.appsuite.user.sect.email.send.replyto.html" title="Configuración de la dirección de respuesta">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.sender">
-<div class="titlepage"><div><div><h3 class="title">Selección de una dirección de remite</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">seleccionar una dirección de remite</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.6.2"></a><p id="ox.appsuite.user.concept.email.send.sender">Al enviar un correo se puede establecer la dirección de remite a mostrar al destinatario, en la ventana de edición del correo:</p>
 <div class="task" id="ox.appsuite.user.task.email.send.sender">
 <p class="title">Cómo seleccionar su dirección de remite en la ventana de edición de correo:</p>
@@ -59,11 +59,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.sender"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.sender">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.sender">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.signatures.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.signatures.html
index 7e845dc65..79b764465 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.signatures.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.signatures.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.templates.html" title="Uso de plantillas">
 <link rel="next" href="ox.appsuite.user.sect.email.send.reply.html" title="Respuesta a correos">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.signatures">
 <div class="titlepage"><div><div><h3 class="title">Uso de firmas</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.12.2"></a><a class="indexterm" name="id-1.7.11.12.3"></a><p id="ox.appsuite.user.concept.email.send.signatures">Una firma de correo es texto que se insertará automáticamente en el correo mientras se redacta, se responde o se reenvía. Se usa típicamente para insertar el nombre, empresa y dirección de contacto al final del texto del correo. Se pueden crear firmas en texto sencillo o en formato html. Están disponibles las siguientes funciones: </p>
@@ -91,7 +91,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.signatures"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -99,7 +99,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Añadir cuentas de correo</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Uso de plantillas</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.signatures">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.signatures">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.templates.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.templates.html
index c8f386cad..8b8caf77e 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.templates.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.templates.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Envío de adjuntos como enlace">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="enviar adjuntos como enlace">
 <link rel="next" href="ox.appsuite.user.sect.email.send.signatures.html" title="Uso de firmas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.templates">
 <div class="titlepage"><div><div><h3 class="title">Uso de plantillas</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.11.2"></a><a class="indexterm" name="id-1.7.11.11.3"></a><p id="ox.appsuite.user.concept.email.send.templates">Las plantillas son bloques de texto que se pueden escribir una vez e insertarse en sus correos tan a menudo como se desee. Como resultado, frases usadas con frecuencia solo hay que escribirlas una vez. Las plantillas, las firmas y los borradores de correo se diferencian en lo siguiente: </p>
@@ -88,7 +88,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.templates"></p>
 <p class="title">Acción de nivel superior:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -96,7 +96,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Uso de firmas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Uso de borradores de correo</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.templates">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.templates">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.vacationnotice.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.vacationnotice.html
index 9dad4885e..9e3277145 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.send.vacationnotice.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.send.vacationnotice.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envío de correos">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="enviar correos">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attendees.html" title="Envío de un correo a participantes de citas">
 <link rel="next" href="ox.appsuite.user.sect.email.openai.html" title="Uso de la integración con AI">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envío de correos</h2>
+<h2 class="sr-only">enviar correos</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.vacationnotice">
 <div class="titlepage"><div><div><h3 class="title">Envío de un aviso de ausencia automático</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.17.2"></a><a class="indexterm" name="id-1.7.11.17.3"></a><p id="ox.appsuite.user.concept.email.send.vacationnotice">Un aviso de ausencia informa al remitente de un correo de que usted no descargará sus correos durante un período de tiempo determinado. Puede configurar lo siguiente: </p>
@@ -81,14 +81,14 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Respuesta a correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Reenvío de correos</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Reenvío automático de correos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">Uso de filtros de correo</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.vacationnotice">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envío de correos</a></p>
+<p id="ox.appsuite.user.parent.email.send.vacationnotice">Tema superior: <a class="xref" href="ox.appsuite.user.sect.email.send.html">enviar correos</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.settings.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.settings.html
index d17440e38..5a9353872 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.settings.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.settings.html
@@ -55,8 +55,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.composereply">Redactar y Responder</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.20.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">Plantillas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.rules">Reglas</a></p></li>
-<li class="listitem feat-zoom" id="id-1.7.20.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">Integración con AI</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.7.20.5.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Ajustes avanzados</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">Integración con AI</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Ajustes avanzados</a></p></li>
 </ul>
 <p>Vea también: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Búsqueda de configuraciones</a></p>
 <p id="ox.appsuite.user.reference.email.settings.reading"></p>
@@ -64,31 +64,32 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>disposición. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Determina el diseño de la vista de lista y de la vista de detalle en el área de visualización.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>Disposición. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Determina el diseño de la vista de lista y de la vista de detalle en el área de visualización.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>lista de mensajes. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a>
+<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>Lista de mensajes. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.list"><b>Imágenes de contacto, casillas de verificación, simple. </b>Determina si se mostrarán las imágenes de contactos, las casillas de verificación o ninguno de dichos elementos, en la vista de lista.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.preview"><b>Mostrar vista previa del texto. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.2.1.2"></a>Determina si las primeras palabras del contenido del correo se mostrarán en la vista de lista de correos.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Mostrar siempre la fecha y hora completas. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Determina si no solo se mostrará a fecha de recepción sino también la hora de recepción en la vista de lista de correos.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Mostrar tamaño del mensaje. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Determina si el tamaño de un correo se mostrará en la vista de lista de correos.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.20.6.2.1.2.1.3.1.3"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>Mostrar categorías. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Define si las categorías asignadas al correo se mostrarán en la vista de lista de correo.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Mostrar siempre la fecha y hora completas. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Determina si no solo se mostrará a fecha de recepción sino también la hora de recepción en la vista de lista de correos.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Mostrar tamaño del mensaje. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.5.1.2"></a>Determina si el tamaño de un correo se mostrará en la vista de lista de correos.</p></li>
 </ul>
 <p>
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>panel de lectura. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a>
+<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>Panel de lectura. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>mostrar el texto citado en color diferente. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Indica si los mensajes originales se resaltan y se preceden con una línea vertical. Esta opción asume que el texto del correo original no se ha adjuntado al correo sino que se le ha añadido.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>Mostrar el texto citado en color diferente. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Indica si los mensajes originales se resaltan y se preceden con una línea vertical. Esta opción asume que el texto del correo original no se ha adjuntado al correo sino que se le ha añadido.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.fixedfont"><b>Usar fuentes de ancho fijo para correos de texto sencillo. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.2.1.2"></a>Especifica si se usará una fuente de ancho fijo al redactar un correo de texto sencillo.</p></li>
 </ul>
 <p>
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>marcar como leído. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Determina el período después del cual un correo se marcará automáticamente como leído al seleccionar el correo. </p>
+<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>Marcar como leído. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Determina el período después del cual un correo se marcará automáticamente como leído al seleccionar el correo. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.immediately"><b>Inmediatamente. </b>El correo se marcará inmediatamente como leído.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.seconds"><b>Después de 5 segundos, después de 20 segundos. </b>El correo se marcará como leído después del período establecido.</p></li>
@@ -126,7 +127,7 @@
 <p role="presentation">Nota: El nombre del remitente se muestra delante de la dirección de remite. Si introduce un nombre en el campo <span class="guibutton"><strong>Su nombre</strong></span> en los Ajustes de la cuenta, dicho nombre sobreescribirá el nombre de remitente predeterminado.</p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>formato del mensaje. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Especifica el formato en el que se envían los correos: </p>
+<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>Formato de mensaje. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Especifica el formato en el que se envían los correos: </p>
 <ul class="itemizedlist" style="list-style-type: square; ">
 <li class="listitem"><p><b>HTML. </b>El correo se enviará con etiquetas html. Puede dar formato al texto del correo.</p></li>
 <li class="listitem"><p><b>Texto sencillo. </b>El texto del correo se enviará como texto sencillo sin formato.</p></li>
@@ -173,10 +174,10 @@
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.html"><b>Permitir mostrar correos con formato HTML. </b><a class="indexterm" name="id-1.7.20.12.2.1.1.1.2"></a>Especifica si se permite o no la visualización de mensajes HTML.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>mostrar solicitudes de confirmación de lectura. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Define si se muestra una confirmación de entrega si un correo recibido incluye una solicitud de confirmación de recepción.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>Mostrar solicitudes de confirmación de lectura. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Define si se muestra una confirmación de entrega si un correo recibido incluye una solicitud de confirmación de recepción.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>eliminar permanentemente los correos borrados. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Determina si los correos eliminados se eliminarán permanentemente o si irán a la carpeta de la papelera.</p>
-<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Los mensajes de correo eliminados permanentemente no se pueden restaurar.</p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>Eliminar permanentemente los correos borrados. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Determina si los correos eliminados se eliminarán permanentemente o si irán a la carpeta de la papelera.</p>
+<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Dependiendo de la configuración, los correos borrados permanentemente <span class="bold">no</span> se pueden recuperar.</p>
 <p role="presentation">Vea <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Borrado de correos</a></p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.selectrecent"><b>Seleccionar automáticamente el mensaje leído más reciente al comienzo. </b><a class="indexterm" name="id-1.7.20.12.2.1.4.1.2"></a>Determina si el mensaje leído más reciente se seleccionará automáticamente al iniciar la aplicación.</p></li>
@@ -187,7 +188,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.mailinglist"><b>Preguntar antes de responder a una lista de correo. </b><a class="indexterm" name="id-1.7.20.12.2.1.9.1.2"></a>Determina si hay que confirmar el destinatario cuando se responde a una lista de correo.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.appendvcard"><b>Adjuntar siempre mis datos de contacto detallados como vCard. </b><a class="indexterm" name="id-1.7.20.12.2.1.10.1.2"></a>Especifica si sus datos de contacto se adjuntarán a un nuevo correo en formato vCard.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>reenviar correos como. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Especifica cómo se envía el texto de un correo cuando el correo se reenvía. </p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>Reenviar correos como. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Especifica cómo se envía el texto de un correo cuando el correo se reenvía. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p><b>Incrustado. </b>El texto se envía dentro del texto del nuevo correo.</p></li>
 <li class="listitem"><p><b>Adjunto. </b>El texto se envía como una adjunto del nuevo correo.</p></li>
@@ -204,7 +205,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
@@ -224,7 +225,7 @@
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Configuración del correo</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualización de correos</a>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.email.view.html b/help/l10n/es_MX/ox.appsuite.user.sect.email.view.html
index 6659a3498..fc9ab150f 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.email.view.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.email.view.html
@@ -82,11 +82,10 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista de lista de <span class="phrase">Correo electrónico</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista de detalle de <span class="phrase">Correo electrónico</span></a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Trabajo con categorías de la bandeja de entrada</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualización y guardado de adjuntos de correo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Mostrar código fuente del correo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marcado de todos los correos como leídos o no leídos</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.firststeps.gui.notificationarea.html b/help/l10n/es_MX/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
index c30f4b605..1e7237256 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
@@ -83,7 +83,7 @@
               <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuste de la Configuración general</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a>
+              <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a>
             </p>
 <p role="presentation" class="cap-calendar">
               <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.guard.email.send.html b/help/l10n/es_MX/ox.appsuite.user.sect.guard.email.send.html
index e14d3006d..a4d33cefb 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.guard.email.send.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.guard.email.send.html
@@ -49,7 +49,7 @@
 <p role="presentation">También se puede presionar en <span class="guibutton"><strong>Configuración</strong></span> en el Lanzador de aplicaciones.</p>
 <p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configuración</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo.</p></li>
+<li class="step"><p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>S/MIME</strong></span> en el panel derecho.</p></li>
 <li class="step">
 <p role="presentation">Marque <span class="guibutton"><strong>Activar S/MIME</strong></span>.</p>
 <p role="presentation">Si se debe establecer el cifrado S/MIME como predeterminado, marque <span class="guibutton"><strong>Usar S/MIME de manera predeterminada para firma y cifrado</strong></span> debajo de <span class="guibutton"><strong>Predeterminados</strong></span>.</p>
@@ -75,7 +75,7 @@
 <li class="listitem"><p role="presentation">Para permitir al destinatario del correo enviar una respuesta cifrada, el destinatario debe tener su clave pública. Puede enviársela como adjunto. Para ello, marque <span class="guibutton"><strong>Adjuntar mi clave pública</strong></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Al usar PGP, se aplica la siguiente opción:</p>
-<p role="presentation">Si <span class="guibutton"><strong>Mostrar ajustes avanzados</strong></span> está activado en los ajustes de <span class="phrase">Guard</span>, puede configurar el formato PGP.</p>
+<p role="presentation">Puede configurar el formato PGP si la opción <span class="guibutton"><strong>Mostrar configuración avanzada al redactar correo</strong></span> ha sido habilitada en los ajustes de <span class="phrase">Guard</span> en <span class="guibutton"><strong>Avanzado</strong></span>.</p>
 <p role="presentation">De manera predeterminada, los correos cifrados se envían en formato <span class="guibutton"><strong>Mime</strong></span>. Algunos clientes obsoletos solo admiten PGP/Incrustado. Si el destinatario usa uno de esos clientes, marque <span class="guibutton"><strong>Incrustado</strong></span>.</p>
 <p role="presentation">Nota: Si usted usa <span class="guibutton"><strong>Incrustado</strong></span>, no puede enviar correos en formato html.</p>
 </li>
@@ -98,7 +98,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.read.html">Lectura de correos cifrados</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.external.html">¿Cómo pueden leer un correo cifrado los destinatarios externos?</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de un nuevo correo</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envío de nuevos correos</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Configuración de <span class="phrase">Guard</span></a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.email.send">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.email.html">Cifrado de conversaciones de correo</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.html b/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.html
index 35688a165..0de31f649 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.html
@@ -1,12 +1,12 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Gestión de claves</title>
+<title>Administración de claves</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Cifrado de datos con Guard">
-<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Gestión de contraseñas">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Eliminación de la función de restablecimiento de contraseña">
 <link rel="next" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Gestión de claves PGP propias">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Siguiente</a></li>
@@ -32,7 +32,7 @@
   <h1 class="sr-only">Cifrado de datos con <span class="phrase">Guard</span>
 </h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.keys">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Gestión de claves</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Administración de claves</h2></div></div></div>
 <a class="indexterm" name="id-1.14.13.2"></a><p id="ox.appsuite.user.concept.guard.keys">Puede utilizar las funciones de gestión de claves para los siguientes fines: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Desea usar sus claves PGP de <span class="phrase">Guard</span> en otros clientes de correo, por ejemplo en clientes de correo local.</p></li>
@@ -44,9 +44,24 @@
 <p id="ox.appsuite.user.possibilities.guard.keys">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a></p></li>
-<li class="listitem cap-smime" id="id-1.14.13.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves públicas</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Administración de claves PGP de destinatarios</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Administrar claves S/MIME de destinatarios</a></p></li>
 </ul>
+<p id="ox.appsuite.user.related.guard.keys">
+      </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Configuración de <span class="phrase">Guard</span></a>
+          </p></li>
+</ul>
+<p>
+    </p>
+<p id="ox.appsuite.user.parent.guard.keys">Tema superior: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Cifrado de datos con <span class="phrase">Guard</span></i></a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.pgppublickeys.html b/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
index b4eb72b2c..71660f37d 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
@@ -1,13 +1,13 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Gestión de claves públicas</title>
+<title>Administración de claves PGP de destinatarios</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestión de claves">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gestión de claves propias S/MIME">
-<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Configuración de Guard">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Administración de claves">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Gestión de claves PGP propias">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gestión de claves propias S/MIME">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,66 +22,47 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Cifrado de datos con <span class="phrase">Guard</span>
 </h1>
-<h2 class="sr-only">Gestión de claves</h2>
+<h2 class="sr-only">Administración de claves</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.pgppublickeys">
-<div class="titlepage"><div><div><h3 class="title">Gestión de claves públicas</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">En la página de <span class="phrase"><span class="guilabel"><strong>Ajustes de seguridad de Guard</strong></span></span>, puede: </p>
+<div class="titlepage"><div><div><h3 class="title">Administración de claves PGP de destinatarios</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.8.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">visualizar claves públicas</p></li>
+<li class="listitem"><p role="presentation">ver o borrar claves públicas</p></li>
 <li class="listitem"><p role="presentation">subir claves públicas</p></li>
-<li class="listitem"><p role="presentation">borrar una clave pública propia</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.guard.pgppublickeys">
-<p class="title">Cómo usar las funciones de gestión de claves:</p>
+<p class="title">Cómo mostrar las claves PGP de los destinatarios:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
-<p role="presentation">También se puede presionar en <span class="guibutton"><strong>Configuración</strong></span> en el Lanzador de aplicaciones.</p>
-<p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configuración</strong></span>.</p>
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>Claves PGP del destinatario</strong></span> en el panel derecho.</p>
+<p role="presentation">Se mostrarán las claves PGP públicas de los destinatarios.</p>
 </li>
 <li class="step">
-<p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo.</p>
-<p role="presentation">Se mostrará la página de <span class="phrase"><span class="guilabel"><strong>ajustes de seguridad de Guard</strong></span></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Marque <span class="guibutton"><strong>Mostrar ajustes avanzados</strong></span>.</p>
-<p role="presentation">Se mostrarán las funciones de gestión de claves.</p>
+<p role="presentation">Para mostrar los detalles de una clave, presione en el ID de la clave.</p>
+<p role="presentation">Para borrar una clave, presione en el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> que hay junto a la clave.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.display">
-<p class="title">Cómo mostrar claves públicas:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
+<p class="title">Cómo subir la clave pública de un destinatario:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Presione <span class="guibutton"><strong>Claves públicas de destinatarios</strong></span>. Se abre la ventana <span class="guilabel"><strong>Claves públicas</strong></span>.</p>
-<p role="presentation">Se muestran las claves públicas compartidas por usted con otros usuarios. Si se muestra en esta lista la clave pública de un usuario, podrá enviarle un correo cifrado a dicho usuario y verificar los correos firmados que él le envíe.</p>
-</li>
-<li class="step">
-<p role="presentation">Para visualizar los detalles de una clave, presione el icono <span class="guibutton"><strong>Detalles</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Detalle de claves públicas</strong></span>.</p>
-<p role="presentation">Puede compartir claves públicas marcando <span class="guibutton"><strong>Compartir clave</strong></span>. Otros usuarios pueden ver y descargar sus claves compartidas. Las claves públicas solo están disponibles para usuarios del software colaborativo.</p>
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>Claves PGP del destinatario</strong></span> en el panel derecho.</p>
 </li>
+<li class="step"><p role="presentation">Presione en <span class="guibutton"><strong>Subir clave de destinatario</strong></span>. Seleccione un archivo que contenga una clave pública.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
-<p class="title">Cómo subir la clave pública de un destinatario en la ventana <span class="guilabel"><strong>Claves públicas</strong></span>:</p>
-<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Presione el icono <span class="guibutton"><strong>Añadir</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.upload.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> que hay junto a <span class="guilabel"><strong>Lista de claves públicas PGP</strong></span>. Seleccione un archivo que contenga una clave pública.</p></li></ul></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.delete">
-<p class="title">Cómo borrar una clave pública en la ventana <span class="guilabel"><strong>Claves públicas</strong></span>:</p>
-<div class="procedure"><ul class="procedure"><li class="step">
-<p role="presentation">Presione el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> que hay junto a una clave pública.</p>
-<p role="presentation">Confirme que quiere borrar la clave pública.</p>
-</li></ul></div>
-</div>
 <p id="ox.appsuite.user.related.guard.keys.pgppublickeys">
         </p>
 <p class="title">Temas relacionados:</p>
@@ -98,7 +79,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.guard.keys.pgppublickeys">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.pgppublickeys">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.smimepublickeys.html b/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
new file mode 100644
index 000000000..3fcef30e8
--- /dev/null
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
@@ -0,0 +1,85 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Administrar claves S/MIME de destinatarios</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Administración de claves">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gestión de claves propias S/MIME">
+<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Configuración de Guard">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Cifrado de datos con <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Administración de claves</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.keys.smimepublickeys">
+<div class="titlepage"><div><div><h3 class="title">Administrar claves S/MIME de destinatarios</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.10.2"></a><p id="ox.appsuite.user.concept.guard.keys.smimepublickeys">Existen las siguientes opciones: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">visualizar claves públicas</p></li>
+<li class="listitem"><p role="presentation">subir claves públicas</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.smimepublickeys">
+<p class="title">Cómo mostrar la clave SMIME de un destinatario:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Presione en <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>Destinatarios S/MIME</strong></span> en el panel derecho.</p>
+</li>
+<li class="step">
+<p role="presentation">Introduzca una dirección de correo en <span class="guibutton"><strong>Buscar certificado</strong></span>. Presione en <span class="guibutton"><strong>Buscar</strong></span>.</p>
+<p role="presentation">Si se ha encontrado un certificado, se mostrarán sus datos.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.guard.keys.smimepublickeys.upload">
+<p class="title">Cómo subir la clave pública de un destinatario:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Presione en <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>Destinatarios S/MIME</strong></span> en el panel derecho.</p>
+</li>
+<li class="step"><p role="presentation">Presione en <span class="guibutton"><strong>Subir certificado de destinatario</strong></span>. Seleccione un archivo que contenga una clave pública.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.keys.smimepublickeys">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a>
+            </p>
+<p role="presentation" class="cap-smime">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
+            </p>
+</li></ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.keys.smimepublickeys">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html b/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
index c658e99db..87baf7243 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestión de claves">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.html" title="Gestión de claves">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gestión de claves propias S/MIME">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Administración de claves">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.html" title="Administración de claves">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Administración de claves PGP de destinatarios">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,130 +25,102 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Cifrado de datos con <span class="phrase">Guard</span>
 </h1>
-<h2 class="sr-only">Gestión de claves</h2>
+<h2 class="sr-only">Administración de claves</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yourpgpkeys">
 <div class="titlepage"><div><div><h3 class="title">Gestión de claves PGP propias</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.5.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">En la página de <span class="phrase"><span class="guilabel"><strong>Ajustes de seguridad de Guard</strong></span></span>, puede: </p>
+<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">añadir nuevas claves PGP</p></li>
 <li class="listitem"><p role="presentation">mostrar claves PGP propias, mostrar detalles</p></li>
-<li class="listitem">
-<p role="presentation">añadir nuevas claves PGP</p>
-<p role="presentation">Si posee varias claves, puede decidir cuál de ellas debería ser la actual. La clave actual se usa para cifrar datos.</p>
-</li>
-<li class="listitem">
-<p role="presentation">añadir IDs de usuario</p>
-<p role="presentation">Añadiendo IDs de usuario adicionales a una clave, se puede usar dicha clave para varias cuentas de correo.</p>
-</li>
-<li class="listitem"><p role="presentation">descargar claves</p></li>
-<li class="listitem"><p role="presentation">borrar claves</p></li>
+<li class="listitem"><p role="presentation">administrar claves PGP propias: hacerlas actuales, editar IDs, revocar, descargar, borrar </p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys">
-<p class="title">Cómo usar las funciones de gestión de claves PGP:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.add">
+<p class="title">Cómo añadir una nueva clave PGP:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
-<p role="presentation">También se puede presionar en <span class="guibutton"><strong>Configuración</strong></span> en el Lanzador de aplicaciones.</p>
-<p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configuración</strong></span>.</p>
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.addkey"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Presione en <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>Sus claves PGP</strong></span> en el panel derecho.</p>
 </li>
 <li class="step">
-<p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo.</p>
-<p role="presentation">Se mostrará la página de <span class="phrase"><span class="guilabel"><strong>ajustes de seguridad de Guard</strong></span></span>.</p>
+<p role="presentation">Tiene las siguientes opciones: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">Para crear un nuevo par de claves, presione en <span class="guibutton"><strong>Crear nuevo</strong></span>. Se abre la ventana <span class="phrase"><span class="guilabel"><strong>Crear claves de seguridad de Guard</strong></span></span>.</p>
+<p role="presentation">Introduzca una contraseña para la nueva clave. Confirme la contraseña.</p>
+<p role="presentation">La nueva clave consta de una clave maestra y una subclave acorde a ella.</p>
 </li>
-<li class="step">
-<p role="presentation">Marque <span class="guibutton"><strong>Mostrar ajustes avanzados</strong></span>.</p>
-<p role="presentation">Se mostrarán las funciones de gestión de claves.</p>
+<li class="listitem">
+<p role="presentation">Para añadir una clave privada existente, presione <span class="guibutton"><strong>Subir clave privada</strong></span>. Seleccione un archivo que contenga una clave privada. Se abre la ventana <span class="guilabel"><strong>Subir claves privadas</strong></span>.</p>
+<p role="presentation">Para subir una nueva clave, introduzca su contraseña de seguridad de <span class="phrase">Guard</span>. Indique una nueva contraseña para la nueva clave.</p>
+</li>
+<li class="listitem"><p role="presentation">Para añadir una clave pública existente, presione <span class="guibutton"><strong>Subir clave pública</strong></span>. Seleccione un archivo que contenga una clave pública.</p></li>
+</ul></p>
+<p role="presentation">La nueva clave se insertará al principio de lista de claves, y se convertirá en la clave actual.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.display">
-<p class="title">Cómo visualizar sus propias claves PGP o convertir una clave PGP en la actual:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.display">
+<p class="title">Cómo ver sus claves PGP existentes:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Presione en <span class="guibutton"><strong>Sus claves</strong></span> debajo de <span class="guilabel"><strong>Claves</strong></span>. </p>
-<p role="presentation" class="cap-smime">Dependiendo de la configuración, se abre la ventana <span class="guilabel"><strong>Seleccione el tipo de claves a modificar</strong></span>. Seleccione <span class="guibutton"><strong>PGP</strong></span>.</p>
-<p role="presentation">Se abre la ventana <span class="guilabel"><strong>Sus claves</strong></span>.</p>
-<p role="presentation">
-              <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Se mostrarán sus claves PGP. Cada clave PGP consta de una clave maestra y una subclave. <ul class="itemizedlist" style="list-style-type: circle; ">
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Presione en <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>Sus claves PGP</strong></span> en el panel derecho.</p>
+<p role="presentation">Se mostrarán sus claves PGP. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Cada clave PGP consta de una clave maestra y una subclave. <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Entre otras cosas, la clave maestra se usa para firmar sus correos.</p></li>
 <li class="listitem"><p role="presentation">La subclave se usará para cifrar y descifrar.</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">Dependiendo de las necesidades, <span class="phrase">Guard</span> usa automáticamente la clave maestra o la subclave.</p></li>
-</ul>
-            </p>
+</ul></p>
 </li>
-<li class="step"><p role="presentation">Si su lista de claves contiene más de una, puede definir cuál es la clave actual. Para ello, marque la casilla de verificación <span class="guibutton"><strong>Actual</strong></span> ubicada junto a la clave principal. Desde ese momento, la clave actual se utilizará para cifrar.</p></li>
-<li class="step"><p role="presentation">Para visualizar detalles de una clave, presione el icono <span class="guibutton"><strong>Detalles</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Detalles de la clave</strong></span>. Para ver las firmas de la clave, presione en <span class="guibutton"><strong>Firmas</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addkey">
-<p class="title">Cómo añadir una nueva clave PGP en la ventana <span class="guilabel"><strong>Sus claves</strong></span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Presione el icono <span class="guibutton"><strong>Añadir clave de usuario</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> que hay junto a <span class="guibutton"><strong>Su lista de claves</strong></span>. Se abre la ventana <span class="guilabel"><strong>Adición de claves</strong></span>.</p></li>
 <li class="step">
-<p role="presentation">Tiene las siguientes opciones: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-<p role="presentation">Para añadir una clave privada, presione <span class="guibutton"><strong>Subir clave privada</strong></span>. Seleccione un archivo que contenga una clave privada. Se abre la ventana <span class="guilabel"><strong>Subir claves privadas</strong></span>.</p>
-<p role="presentation">Para subir una nueva clave, introduzca su contraseña de seguridad de <span class="phrase">Guard</span>. Indique una nueva contraseña para la nueva clave.</p>
-</li>
-<li class="listitem"><p role="presentation">Para añadir una clave pública, presione <span class="guibutton"><strong>Subir solo clave pública</strong></span>. Seleccione un archivo que contenga una clave pública.</p></li>
-<li class="listitem">
-<p role="presentation">Para crear un nuevo par de claves, presione <span class="guibutton"><strong>Crear claves nuevas</strong></span>. Se abre la ventana <span class="phrase"><span class="guilabel"><strong>Crear claves de seguridad de Guard</strong></span></span>.</p>
-<p role="presentation">Introduzca una contraseña para la nueva clave. Confirme la contraseña.</p>
-<p role="presentation">La nueva clave consta de una clave maestra y una subclave acorde a ella.</p>
-</li>
-</ul></p>
-<p role="presentation">La nueva clave se insertará al principio de lista de claves, y se convertirá en la clave actual.</p>
+<p role="presentation">Para mostrar los detalles de una clave, presione el icono <span class="guibutton"><strong>Administrar claves</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> que hay junto a una clave maestra. Se abre la ventana <span class="guilabel"><strong>Detalles de la clave</strong></span>.</p>
+<p role="presentation">Para ver las firmas de las claves, presione en <span class="guibutton"><strong>Firmas</strong></span>.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addaccount">
-<p class="title">Cómo añadir un ID de usuario adicional en la ventana <span class="guilabel"><strong>Sus claves</strong></span>:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.manage">
+<p class="title">Cómo administrar sus claves PGP existentes:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Presione el icono <span class="guibutton"><strong>Editar identificadores</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addaccount.edit"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Añadir identificador de usuario</strong></span>.</p></li>
 <li class="step">
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Presione en <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>Sus claves PGP</strong></span> en el panel derecho.</p>
+<p role="presentation">Se mostrarán sus claves PGP.</p>
+</li>
+<li class="step"><p role="presentation">Presione el icono <span class="guibutton"><strong>Administrar claves</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> que hay junto a una clave maestra. Utilice las siguientes funciones. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Si su lista de claves contiene más de una clave, puede definir la clave actual. Para hacerlo, presione en <span class="guibutton"><strong>Marcar actual</strong></span>. A partir de ahora, se utilizará la clave actual para el cifrado.</p></li>
+<li class="listitem">
+<p role="presentation">Si desea utilizar la clave para otra cuenta de correo, presione en <span class="guibutton"><strong>Editar IDs</strong></span>. Se abre la ventana <span class="guilabel"><strong>Añadir ID de usuario</strong></span>.</p>
 <p role="presentation">Introduzca un nombre para el ID de usuario. Introduzca la dirección de correo que quiera usar para esta clave.</p>
 <p role="presentation">Introduzca su contraseña para esta clave.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.download">
-<p class="title">Cómo descargar una clave en la ventana <span class="guilabel"><strong>Sus claves</strong></span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Presione el icono <span class="guibutton"><strong>Descargar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> que hay junto a una clave.</p></li>
-<li class="step">
+<li class="listitem">
+<p role="presentation">Para descargar una clave privada, presione en <span class="guibutton"><strong>Descargar</strong></span>.</p>
 <p role="presentation">Determina si solo se descarga su clave privada, su clave pública o ambas.</p>
 <p role="presentation"><span class="phrase"><strong>Precaución:</strong></span> Su clave privada se descargará cifrada. De todas formas, no debería descargar su clave privada en un sistema accesible públicamente.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.delete">
-<p class="title">Cómo borrar una clave en la ventana <span class="guilabel"><strong>Sus claves</strong></span>:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Advertencia:</strong></span> Si borra una clave privada, ya no podrá descifrar objetos que se hayan cifrado con dicha clave. Si no está seguro no debería borrarla sino revocarla. Una clave revocada no se puede usar para cifrar, pero aún se puede usar para descifrar objetos que se hubiesen cifrado con ella.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Presione el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Borrar clave privada</strong></span>.</p></li>
-<li class="step"><p role="presentation">Tiene las siguientes opciones:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Para revocar o borrar una clave privada, presione en <span class="guibutton"><strong>Borrar</strong></span>. Se abre la ventana <span class="guilabel"><strong>Borrar clave privada</strong></span>. Notas: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">si revoca una clave, ya no se utilizará, pero aún puede descifrar objetos que hayan sido cifrados con esta clave. Por este motivo, revocar una clave es mejor que borrarla.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si borra una clave privada, ya no podrá descifrar objetos que hayan sido cifrados con esta clave.</p></li>
+</ul> <p role="presentation">Tiene las siguientes opciones:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
-<p role="presentation">Para revocar una clave privada, presione <span class="guibutton"><strong>Revocar</strong></span>.</p>
-<p role="presentation">Si revoca una clave, ya no la podrá usar pero aún podrá descifrar objetos cifrados con dicha clave. Por ello, revocar una clave es mejor que borrarla.</p>
-<p role="presentation">Introduzca la contraseña de la clave privada. Si se le pide, seleccione un motivo para la revocación.</p>
-<p role="presentation">Presione <span class="guibutton"><strong>Revocar</strong></span>.</p>
+<p role="presentation">Para revocar una clave privada presione en <span class="guibutton"><strong>Revocar</strong></span>.</p>
+<p role="presentation">Introduzca la contraseña de la clave privada. Si es necesario, seleccione un motivo para revocar la clave.</p>
+<p role="presentation">Presione en <span class="guibutton"><strong>Revocar</strong></span>.</p>
+<p role="presentation">También puede presionar en <span class="guibutton"><strong>Revocar</strong></span> en el menú.</p>
 </li>
 <li class="listitem">
-<p role="presentation">Para borrar una clave privada, presione <span class="guibutton"><strong>Borrar</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si borra una clave privada, ya no podrá descifrar objetos cifrados con dicha clave.</p>
-<p role="presentation">Introduzca la contraseña de la clave privada.</p>
-<p role="presentation">Presione el botón <span class="guibutton"><strong>Borrar</strong></span>.</p>
+<p role="presentation">Para borrar una clave privada, presione en <span class="guibutton"><strong>Borrar</strong></span>.</p>
+<p role="presentation">Introduzca la contraseña de la clave privada .</p>
+<p role="presentation">Presione en el botón <span class="guibutton"><strong>Borrar</strong></span>.</p>
 </li>
-</ul>Al borrar una clave maestra, la subclave correspondiente también se borrará.</p></li>
+</ul> Al borrar una clave maestra, la subclave correspondiente también se borrará.</p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yourpgpkeys">
@@ -156,7 +128,7 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves públicas</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Administración de claves PGP de destinatarios</a>
             </p>
 <p role="presentation" class="cap-smime">
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a>
@@ -167,7 +139,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yourpgpkeys">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yourpgpkeys">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html b/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
index c195905c2..bf44e027c 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
-<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestión de claves">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Gestión de claves PGP propias">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gestión de claves públicas">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Administración de claves">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Administración de claves PGP de destinatarios">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Administrar claves S/MIME de destinatarios">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,58 +22,39 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Cifrado de datos con <span class="phrase">Guard</span>
 </h1>
-<h2 class="sr-only">Gestión de claves</h2>
+<h2 class="sr-only">Administración de claves</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yoursmimekeys">
 <div class="titlepage"><div><div><h3 class="title">Gestión de claves propias S/MIME</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.6.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">En la página de <span class="phrase"><span class="guilabel"><strong>Ajustes de seguridad de Guard</strong></span></span>, puede: </p>
+<a class="indexterm" name="id-1.14.13.9.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">añadir nuevas claves S/MIME</p>
 <p role="presentation">Si posee varias claves, puede decidir cuál de ellas debería ser la actual. La clave actual se usa para cifrar datos.</p>
 </li>
 <li class="listitem"><p role="presentation">mostrar claves propias S/MIME, mostrar detalles</p></li>
-<li class="listitem"><p role="presentation">descargar claves</p></li>
-<li class="listitem"><p role="presentation">borrar claves</p></li>
+<li class="listitem"><p role="presentation">administrar claves S/MIME propias: actualizar, editar ID, revocar, descargar, eliminar</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys">
-<p class="title">Cómo utilizar las funciones de gestión de claves S/MIME:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.add">
+<p class="title">Cómo agregar una nueva clave S/MIME:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
-<p role="presentation">También se puede presionar en <span class="guibutton"><strong>Configuración</strong></span> en el Lanzador de aplicaciones.</p>
-<p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configuración</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo.</p>
-<p role="presentation">Se mostrará la página de <span class="phrase"><span class="guilabel"><strong>ajustes de seguridad de Guard</strong></span></span>.</p>
-</li>
-<li class="step">
+<p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>S/MIME</strong></span> en el panel derecho.</p>
 <p role="presentation">Marque <span class="guibutton"><strong>Activar S/MIME</strong></span>.</p>
-<p role="presentation">Marque <span class="guibutton"><strong>Mostrar ajustes avanzados</strong></span>.</p>
-<p role="presentation">Se mostrarán las funciones de gestión de claves.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.addkey">
-<p class="title">Cómo agregar una nueva clave S/MIME:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Presione en <span class="guibutton"><strong>Sus claves</strong></span> debajo de <span class="guibutton"><strong>Claves</strong></span>. Se abre la ventana <span class="guilabel"><strong>Seleccione el tipo de clave a modificar</strong></span>.</p>
-<p role="presentation">Seleccione <span class="guibutton"><strong>S/MIME</strong></span>. Se are la ventana <span class="guilabel"><strong>Sus Certificados</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Presione el icono <span class="guibutton"><strong>Añadir</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> que hay junto a <span class="guilabel"><strong>Su lista de claves</strong></span>. Se abre la ventana <span class="guilabel"><strong>Subir claves S/MIME</strong></span>.</p></li>
 <li class="step">
+<p role="presentation">Presione en <span class="guibutton"><strong>Subir certificado privado</strong></span>. Se abre la ventana <span class="guilabel"><strong>Subir claves S/MIME</strong></span>.</p>
 <p role="presentation">Introduzca las siguientes contraseñas: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Para subir una nueva clave, introduzca su contraseña de seguridad de <span class="phrase">Guard</span>. Indique una nueva contraseña para la nueva clave.</p></li>
+<li class="listitem"><p role="presentation">Su contraseña de seguridad de <span class="phrase">Guard</span> para subir la nueva clave.</p></li>
 <li class="listitem">
 <p role="presentation">Una nueva contraseña para cifrar los correos.</p>
 <p role="presentation">Confirme la nueva contraseña.</p>
@@ -85,48 +66,51 @@
 </ol></div>
 </div>
 <div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.display">
-<p class="title">Cómo mostrar sus propias claves S/MIME o convertir una clave S/MIME en la actual:</p>
+<p class="title">Cómo ver sus propias claves S/MIME:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Presione en <span class="guibutton"><strong>Sus claves</strong></span> debajo de <span class="guilabel"><strong>Claves</strong></span>. Se abre la ventana <span class="guilabel"><strong>Seleccione el tipo de claves a modificar</strong></span>.</p>
-<p role="presentation">Seleccione <span class="guibutton"><strong>S/MIME</strong></span>.</p>
-<p role="presentation">Se abre la ventana <span class="guilabel"><strong>Sus Certificados</strong></span>. Se mostrarán sus claves S/MIME.</p>
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>S/MIME</strong></span> en el panel derecho.</p>
+<p role="presentation">Marque <span class="guibutton"><strong>Activar S/MIME</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Para mostrar los detalles de una clave,  presione el icono <span class="guibutton"><strong>Administrar claves</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Detalles de la clave</strong></span>.</p>
+<p role="presentation">Para ver las firmas de las claves, presione en <span class="guibutton"><strong>Firmas</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Si su lista de claves contiene más de una, puede definir cuál es la clave actual. Para ello, marque la casilla de verificación <span class="guibutton"><strong>Actual</strong></span> ubicada junto a la clave principal. Desde ese momento, la clave actual se utilizará para cifrar.</p></li>
-<li class="step"><p role="presentation">Para visualizar detalles de una clave, presione el icono <span class="guibutton"><strong>Detalles</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Detalles de la clave</strong></span>. Para ver las firmas de la clave, presione en <span class="guibutton"><strong>Firmas</strong></span>.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.download">
-<p class="title">Cómo descargar una clave en la ventana <span class="guilabel"><strong>Sus claves</strong></span>:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.manage">
+<p class="title">Cómo administrar sus claves S/MIME existentes:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Presione el icono <span class="guibutton"><strong>Descargar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> que hay junto a una clave.</p></li>
 <li class="step">
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>S/MIME</strong></span> en el panel derecho.</p>
+<p role="presentation">Marque <span class="guibutton"><strong>Activar S/MIME</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Presione el icono <span class="guibutton"><strong>Administrar claves</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> que hay junto a una clave. Utilice las siguientes funciones. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Si su lista de claves contiene más de una clave, puede definir la clave actual. Para hacerlo, presione en <span class="guibutton"><strong>Marcar actual</strong></span>. A partir de ahora, se utilizará la clave actual para el cifrado.</p></li>
+<li class="listitem">
+<p role="presentation">Para descargar una clave privada, presione en <span class="guibutton"><strong>Descargar</strong></span>.</p>
 <p role="presentation">Determina si solo se descarga su clave privada, su clave pública o ambas.</p>
 <p role="presentation"><span class="phrase"><strong>Precaución:</strong></span> Su clave privada se descargará cifrada. De todas formas, no debería descargar su clave privada en un sistema accesible públicamente.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.delete">
-<p class="title">Cómo borrar una clave en la ventana <span class="guilabel"><strong>Sus claves</strong></span>:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Advertencia:</strong></span> Si borra una clave privada, ya no podrá descifrar objetos que se hayan cifrado con dicha clave. Si no está seguro no debería borrarla sino revocarla. Una clave revocada no se puede usar para cifrar, pero aún se puede usar para descifrar objetos que se hubiesen cifrado con ella.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Presione el icono <span class="guibutton"><strong>Borrar</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> que hay junto a una clave. Se abre la ventana <span class="guilabel"><strong>Borrar clave privada</strong></span>.</p></li>
-<li class="step"><p role="presentation">Tiene las siguientes opciones: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Para revocar o borrar una clave privada, presione en <span class="guibutton"><strong>Borrar</strong></span>. Se abre la ventana <span class="guilabel"><strong>Borrar clave privada</strong></span>. Notas: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">si revoca una clave, ya no se utilizará más. Pero aún puede descifrar objetos que se han cifrado con dicha clave. Por esta razón, es mejor revocar una clave es mejor que eliminarla.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si borra una clave privada, ya no podrá descifrar objetos que se hayan cifrado con dicha clave.</p></li>
+</ul> <p role="presentation">Tiene las siguientes opciones:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">Para revocar una clave privada, presione en <span class="guibutton"><strong>Revocar</strong></span>.</p>
-<p role="presentation">si revoca una clave, ya no se utilizará más. Pero aún puede descifrar objetos que se han cifrado con dicha clave. Por esta razón, es mejor revocar una clave es mejor que eliminarla.</p>
 <p role="presentation">Introduzca la contraseña de la clave privada. Si es necesario, seleccione un motivo para revocar la clave.</p>
 <p role="presentation">Presione <span class="guibutton"><strong>Revocar</strong></span>.</p>
+<p role="presentation">También puede presionar en <span class="guibutton"><strong>Revocar</strong></span> en el menú.</p>
 </li>
 <li class="listitem">
 <p role="presentation">Para borrar una clave privada, presione <span class="guibutton"><strong>Borrar</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si borra una clave privada, ya no podrá descifrar objetos que se hayan cifrado con dicha clave.</p>
 <p role="presentation">Introduzca su contraseña para la clave privada.</p>
 <p role="presentation">Presione el botón <span class="guibutton"><strong>Borrar</strong></span>.</p>
 </li>
 </ul></p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yoursmimekeys">
@@ -137,7 +121,7 @@
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves públicas</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Administración de claves PGP de destinatarios</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a>
@@ -145,7 +129,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yoursmimekeys">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yoursmimekeys">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.guard.password.change.html b/help/l10n/es_MX/ox.appsuite.user.sect.guard.password.change.html
new file mode 100644
index 000000000..f5d8e72da
--- /dev/null
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.guard.password.change.html
@@ -0,0 +1,75 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Cambiar la contraseña</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Gestión de contraseñas">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Gestión de contraseñas">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.reset.html" title="restablecer la contraseña">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.reset.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Cifrado de datos con <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Gestión de contraseñas</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.change">
+<div class="titlepage"><div><div><h3 class="title">Cambiar la contraseña</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.6.2"></a><a class="indexterm" name="id-1.14.12.6.3"></a><p role="presentation" class="cap-smime">Dependiendo de la configuración, también puede utilizar S/MIME para el cifrado en lugar de PGP. Para PGP y S/MIME se utilizarán contraseñas independientes.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.change">
+<p class="title">Cómo cambiar la contraseña de <span class="phrase">Guard</span>:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.change"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>Gestión de contraseñas (PGP)</strong></span><span class="cap-smime"> o en <span class="guibutton"><strong>Gestión de contraseñas (S/MIME)</strong></span></span> en el panel derecho.</p>
+</li>
+<li class="step">
+<p role="presentation">En el campo <span class="guibutton"><strong>Contraseña antigua</strong></span>, introduzca la contraseña que utilizó anteriormente para cifrar sus datos.</p>
+<p role="presentation">En el campo <span class="guibutton"><strong>Contraseña nueva</strong></span>, introduzca la contraseña que quiera usar para cifrar sus datos a partir de ahora.</p>
+<p role="presentation">Introduzca la nueva contraseña otra vez en el campo <span class="guibutton"><strong>Confirmar nueva contraseña</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Presione <span class="guibutton"><strong>Cambiar contraseña</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.change">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">restablecer la contraseña</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Eliminación de la función de restablecimiento de contraseña</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.change">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.guard.password.deleterecovery.html b/help/l10n/es_MX/ox.appsuite.user.sect.guard.password.deleterecovery.html
new file mode 100644
index 000000000..1d826dc64
--- /dev/null
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.guard.password.deleterecovery.html
@@ -0,0 +1,74 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Eliminación de la función de restablecimiento de contraseña</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Gestión de contraseñas">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.reset.html" title="restablecer la contraseña">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Administración de claves">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.reset.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Cifrado de datos con <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Gestión de contraseñas</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.deleterecovery">
+<div class="titlepage"><div><div><h3 class="title">Eliminación de la función de restablecimiento de contraseña</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.8.2"></a><p id="ox.appsuite.user.concept.guard.password.deleterecovery">Para poder restablecer su contraseña si es necesario, su contraseña debe guardarse en el servidor en una versión cifrada. Si no desea que su contraseña se guarde en el servidor, puede borrar la recuperación de contraseña.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
+<p class="title">Cómo eliminar la función de restablecimiento de contraseña:</p>
+<div class="taskprerequisites">
+          <p><span class="phrase"><strong>Advertencia:</strong></span> Si elimina la función de restablecimiento de contraseña ya no podrá restablecer su contraseña. Si más adelante olvida su contraseña ya no tendrá la posibilidad de descifrar sus datos cifrados.</p>
+        </div>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.remove"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Presione  <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>Avanzado</strong></span> en el panel derecho.</p>
+</li>
+<li class="step"><p role="presentation">Debajo de <span class="guibutton"><strong>Opciones de restablecimiento</strong></span>, presione en <span class="guibutton"><strong>Borrar recuperación de contraseña</strong></span>. Se abre la ventana <span class="guilabel"><strong>Borrar recuperación</strong></span>.</p></li>
+<li class="step"><p role="presentation">Presione el botón <span class="guibutton"><strong>Borrar</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.deleterecovery">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Cambiar la contraseña</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">restablecer la contraseña</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.deleterecovery">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.guard.password.html b/help/l10n/es_MX/ox.appsuite.user.sect.guard.password.html
index dc2834e44..d3d613f91 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.guard.password.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.guard.password.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Cifrado de datos con Guard">
 <link rel="prev" href="ox.appsuite.user.sect.guard.logout.html" title="Cierre de sesión de Guard">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Gestión de claves">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.change.html" title="Cambiar la contraseña">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.logout.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.change.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,102 +33,24 @@
 </h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.password">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Gestión de contraseñas</h2></div></div></div>
-<a class="indexterm" name="id-1.14.12.2"></a><a class="indexterm" name="id-1.14.12.3"></a><a class="indexterm" name="id-1.14.12.4"></a><a class="indexterm" name="id-1.14.12.5"></a><a class="indexterm" name="id-1.14.12.6"></a><p id="ox.appsuite.user.concept.guard.password">Existen las siguientes opciones: </p>
+<a class="indexterm" name="id-1.14.12.2"></a><p id="ox.appsuite.user.concept.guard.password">Existen las siguientes opciones: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Cambiar la contraseña de seguridad de <span class="phrase">Guard</span></p></li>
-<li class="listitem"><p role="presentation">Cuando ha perdido su contraseña de seguridad de <span class="phrase">Guard</span>, puede solicitar una contraseña de seguridad temporal de <span class="phrase">Guard</span> restableciendo la contraseña de seguridad de <span class="phrase">Guard</span>.</p></li>
-<li class="listitem"><p role="presentation">Definición de una dirección de correo para restablecer la contraseña.</p></li>
-<li class="listitem"><p role="presentation">Para poder restablecer su contraseña si es necesario, su contraseña debe guardarse en el servidor en una versión cifrada. Si no desea que su contraseña se guarde en el servidor, puede eliminar la recuperación de contraseña.</p></li>
-<li class="listitem cap-smime" id="id-1.14.12.7.1.5"><p role="presentation">Dependiendo de la configuración, también puede usar S/MIME para el cifrado en lugar de PGP. En este caso, se utilizarán contraseñas separadas para PGP y S/MIME.</p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Cambiar la contraseña</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">restablecer la contraseña</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Eliminación de la función de restablecimiento de contraseña</a></p></li>
 </ul>
-<p> Nota: Según la configuración, es posible que algunas de esas funciones no estén disponibles.</p>
-<div class="task help-hide-inline" id="ox.appsuite.user.task.guard.password">
-<p class="title">Cómo abrir las funciones de administración de contraseñas:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
-<p role="presentation">También se puede presionar en <span class="guibutton"><strong>Configuración</strong></span> en el Lanzador de aplicaciones.</p>
-<p role="presentation">Se abre la ventana <span class="guilabel"><strong>Configuración</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo.</p>
-<p role="presentation">Se mostrará la página de <span class="phrase"><span class="guilabel"><strong>ajustes de seguridad de Guard</strong></span></span>.</p>
-<p role="presentation">Se mostrarán las funciones de gestión de contraseñas.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.change">
-<p class="title">Cómo cambiar la contraseña de <span class="phrase">Guard</span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Presione <span class="guibutton"><strong>Cambiar contraseña</strong></span>.</p>
-<p role="presentation" class="cap-smime">Dependiendo de la configuración, se abrirá la ventana <span class="guilabel"><strong>Seleccione el tipo de claves a modificar</strong></span>. Según el tipo de cifrado para el que desee restablecer la contraseña, seleccione <span class="guibutton"><strong>PGP</strong></span> o <span class="guibutton"><strong>S/MIME</strong></span>. Se abre la ventana <span class="guilabel"><strong>Restablecer contraseña</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">En el campo <span class="phrase"><span class="guibutton"><strong>Introduzca la contraseña de seguridad actual de Guard</strong></span></span>, indique la contraseña que haya usado hasta ahora para cifrar sus datos.</p>
-<p role="presentation">En el campo <span class="phrase"><span class="guibutton"><strong>Introduzca nueva contraseña de seguridad de Guard</strong></span></span>, indique la contraseña que quiere usar para cifrar sus datos en adelante.</p>
-<p role="presentation">Confirme la contraseña en el campo <span class="phrase"><span class="guibutton"><strong>Verifique nueva contraseña de seguridad de Guard</strong></span></span> introduciéndola nuevamente.</p>
-</li>
-<li class="step"><p role="presentation">Presione <span class="guibutton"><strong>Cambiar</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.reset">
-<p class="title">Cómo restablecer la contraseña de <span class="phrase">Guard</span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Presione <span class="guibutton"><strong>Restablecer contraseña</strong></span>.</p>
-<p role="presentation" class="cap-smime">Dependiendo de la configuración, se abrirá la ventana <span class="guilabel"><strong>Seleccione el tipo de claves a modificar</strong></span>. Según el tipo de cifrado para el que desee restablecer la contraseña, seleccione <span class="guibutton"><strong>PGP</strong></span> o <span class="guibutton"><strong>S/MIME</strong></span>. Se abre la ventana <span class="guilabel"><strong>Restablecer contraseña</strong></span>.</p>
-<p role="presentation">Presione <span class="guibutton"><strong>Restablecer</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Se le enviará una nueva contraseña a su dirección de correo secundaria.</p>
-<p role="presentation">Si no ha indicado una dirección de correo secundaria, la nueva contraseña se enviará a su dirección principal.</p>
-<p role="presentation">Esta nueva contraseña ahora es su contraseña de seguridad de <span class="phrase">Guard</span> actual. Debería <a class="link" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.task.guard.settings">cambiarla</a> inmediatamente.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.secondarymail">
-<p class="title">Cómo cambiar su dirección de correo secundaria para el restablecimiento de contraseña.</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Presione en <span class="guibutton"><strong>Configurar dirección de correo para restablecer</strong></span>.</p>
-<p role="presentation" class="cap-smime">Dependiendo de la configuración, se abre la ventana <span class="guilabel"><strong>Seleccione el tipo de claves a modificar</strong></span>. Según el tipo de cifrado para el que desee restablecer la contraseña, seleccione <span class="guibutton"><strong>PGP</strong></span> o <span class="guibutton"><strong>S/MIME</strong></span>. Se abre la ventana <span class="guilabel"><strong>Dirección de correo secundaria</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">En el campo <span class="phrase"><span class="guibutton"><strong>Introduzca la contraseña de seguridad actual de Guard</strong></span></span>, indique la contraseña que haya usado hasta ahora para cifrar sus datos.</p>
-<p role="presentation">En el campo <span class="guibutton"><strong>Introduzca nuevo correo secundario</strong></span>, introduzca la dirección de correo que se usará para recibir una contraseña provisional para el restablecimiento de su contraseña de seguridad de <span class="phrase">Guard</span>.</p>
-<p role="presentation">Vuelva a introducir la dirección de correo en <span class="guibutton"><strong>Verifique dirección de correo</strong></span>.</p>
-<p role="presentation">Presione en <span class="guibutton"><strong>Cambiar dirección de correo</strong></span>.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
-<p class="title">Cómo eliminar la función de restablecimiento de contraseña:</p>
-<div class="taskprerequisites">
-        <p><span class="phrase"><strong>Advertencia:</strong></span> Si elimina la función de restablecimiento de contraseña ya no podrá restablecer su contraseña. Si más adelante olvida su contraseña ya no tendrá la posibilidad de descifrar sus datos cifrados.</p>
-      </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Marque <span class="guibutton"><strong>Mostrar ajustes avanzados</strong></span>.</p>
-<p role="presentation">Presione en <span class="guibutton"><strong>Borrar recuperación de contraseña</strong></span>. Se abre la ventana <span class="guilabel"><strong>Borrar recuperación</strong></span>.</p>
-</li>
-<li class="step"><p role="presentation">Presione el botón <span class="guibutton"><strong>Borrar</strong></span>.</p></li>
-</ol></div>
-</div>
+<p> Nota: Dependiendo de la configuración, es posible que algunas de esas funciones no estén disponibles.</p>
 <p id="ox.appsuite.user.related.guard.password">
       </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a>
-          </p>
-<p role="presentation" class="cap-smime">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestión de claves propias S/MIME</a>
-          </p>
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestión de claves públicas</a>
-          </p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Configuración de <span class="phrase">Guard</span></a>
+          </p></li>
+</ul>
 <p>
     </p>
 <p id="ox.appsuite.user.parent.guard.password">Tema superior: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Cifrado de datos con <span class="phrase">Guard</span></i></a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.guard.password.reset.html b/help/l10n/es_MX/ox.appsuite.user.sect.guard.password.reset.html
new file mode 100644
index 000000000..dc29b6770
--- /dev/null
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.guard.password.reset.html
@@ -0,0 +1,91 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>restablecer la contraseña</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Gestión de contraseñas">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.change.html" title="Cambiar la contraseña">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Eliminación de la función de restablecimiento de contraseña">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.change.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Cifrado de datos con <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Gestión de contraseñas</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.reset">
+<div class="titlepage"><div><div><h3 class="title">restablecer la contraseña</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.7.2"></a><a class="indexterm" name="id-1.14.12.7.3"></a><p id="ox.appsuite.user.concept.guard.password.reset">Existen las siguientes opciones: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Si pierde su contraseña de <span class="phrase">Guard</span>, puede solicitar una contraseña temporal de <span class="phrase">Guard</span> restableciendo la contraseña de <span class="phrase">Guard</span>.</p></li>
+<li class="listitem"><p role="presentation">Puede definir una dirección de correo para restablecer la contraseña.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.password.reset">
+<p class="title">Cómo restablecer la contraseña de <span class="phrase">Guard</span>:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Presione el icono <span class="guibutton"><strong>Configuración</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.reset"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> de la barra de menús. Presione en <span class="guibutton"><strong>Todos los ajustes</strong></span>.</p>
+<p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo. Presione en <span class="guibutton"><strong>Gestión de contraseñas (PGP)</strong></span><span class="cap-smime"> o en <span class="guibutton"><strong>Gestión de contraseñas (S/MIME)</strong></span></span> en el panel derecho.</p>
+</li>
+<li class="step">
+<p role="presentation">Para configurar una dirección de correo secundaria a la que se envíe una contraseña temporal, presione en <span class="guibutton"><strong>Establecer dirección de correo para restablecimiento</strong></span>. Se abre la ventana <span class="guilabel"><strong>Dirección de correo secundaria</strong></span>.</p>
+<p role="presentation">Introduzca su contraseña actual. Introduzca la dirección de correo que desea utilizar para restablecer la contraseña.</p>
+</li>
+<li class="step">
+<p role="presentation">Presione en <span class="guibutton"><strong>Restablecer contraseña</strong></span>. Se abre la ventana <span class="guilabel"><strong>Restablecer contraseña</strong></span>.</p>
+<p role="presentation">Presione <span class="guibutton"><strong>Restablecer</strong></span>.</p>
+</li>
+</ol></div>
+<div class="taskrelated">
+          <p>Resultado: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">Se le enviará una nueva contraseña a su dirección de correo secundaria.</p>
+<p role="presentation">Si no ha indicado una dirección de correo secundaria, la nueva contraseña se enviará a su dirección principal.</p>
+</li>
+<li class="listitem"><p role="presentation">Esta nueva contraseña ahora es su contraseña de seguridad actual de <span class="phrase">Guard</span>. Debería cambiarla inmediatamente.</p></li>
+</ul>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.reset">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Cambiar la contraseña</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Eliminación de la función de restablecimiento de contraseña</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.reset">Tema superior: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.guard.settings.html b/help/l10n/es_MX/ox.appsuite.user.sect.guard.settings.html
index 423c63aee..b7fbcc864 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.guard.settings.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.guard.settings.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Cifrado de datos con Guard">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gestión de claves públicas">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Administrar claves S/MIME de destinatarios">
 <link rel="next" href="ox.appsuite.user.index.html" title="Índice">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.index.html">Siguiente</a></li>
@@ -44,84 +44,170 @@
 </li>
 <li class="step"><p role="presentation">Presione <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> en el panel izquierdo.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>Se mostrará la página de <span class="phrase"><span class="guilabel"><strong>ajustes de seguridad de Guard</strong></span></span>.</p>
-      </div>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings">Están disponibles los siguientes ajustes:</p>
+<p id="ox.appsuite.user.reference.guard.settings">Dependiendo de la configuración, están disponibles los siguientes ajustes:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.default">Configuración predeterminada de <span class="phrase">Guard</span></a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.pgppasswords">Administración de contraseñas (PGP)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.smimepasswords">Administración de contraseñas (S/MIME)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yourpgpkeys">Sus claves PGP</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientpgpkeys">Claves PGP del destinatario</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yoursmime">S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientsmime">Destinatarios S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.advanced">Avanzados</a></p></li>
+</ul>
+<p>Vea también: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Búsqueda de configuraciones</a></p>
 <p id="ox.appsuite.user.reference.guard.settings.default"></p>
-<h3 class="title">Ajustes predeterminados</h3>
+<h3 class="title">Configuración predeterminada de <span class="phrase">Guard</span>
+</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.encrypt"><b>De manera predeterminada, enviar cifrado al redactar correo. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>Determina si un correo nuevo se cifra de manera predeterminada.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.sign"><b>De manera predeterminada, añadir firma a correos salientes. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Determina si un correo nuevo se cifra de manera predeterminada.</p></li>
-<li class="listitem cap-smime" id="id-1.14.14.7.2.1.3">
-<p id="ox.appsuite.user.task.guard.settings.default.smime"><b>Usar S/MIME de manera predeterminada para firma y cifrado. </b><a class="indexterm" name="id-1.14.14.7.2.1.3.1.2"></a>
+<li class="listitem">
+<p id="ox.appsuite.user.reference.guard.settings.default.create"><b>Opciones de redacción. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>
                 </p>
-<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p role="presentation">Determina si se utiliza S/MIME para el cifrado y firma de forma predeterminada. </p></li></ul>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.encrypt"><b>De manera predeterminada, enviar cifrado al redactar correo. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.1.1.2"></a>Determina si un correo nuevo se cifra de manera predeterminada.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.sign"><b>De manera predeterminada, añadir firma a correos salientes. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.2.1.2"></a>Determina si un correo nuevo se cifra de manera predeterminada.</p></li>
+<li class="listitem cap-smime" id="id-1.14.14.7.2.1.1.1.3.1.3">
+<p id="ox.appsuite.user.task.guard.settings.default.create.smime"><b>Usar S/MIME de manera predeterminada para firma y cifrado. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.3.1.2"></a>
+                        </p>
+<ul class="itemizedlist" style="list-style-type: square; "><li class="listitem"><p role="presentation">Determina si se utiliza S/MIME para el cifrado y firma de forma predeterminada.</p></li></ul>
 <p>
-              </p>
+                      </p>
 </li>
-<li class="listitem">
-<p id="ox.appsuite.user.task.guard.settings.default.inline"><b>De manera predeterminada, usar PGP incrustado en correos nuevos. </b><a class="indexterm" name="id-1.14.14.7.2.1.4.1.2"></a>Nota: Esta opción solo está disponible si la casilla de verificación <span class="guibutton"><strong>Ajustes avanzados</strong></span> está habilitada. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">Determina si se utiliza PGP/Incrustado para el cifrado de forma predeterminada.</p></li>
-<li class="listitem"><p role="presentation">Use esa configuración solo si el cliente de correo de un destinatario no es compatible con PGP. Sin embargo, con PGP/Incrustado, el destinatario puede descifrar el mensaje.</p></li>
-<li class="listitem"><p role="presentation">Si usa esta configuración, no podrá enviar correos en formato html.</p></li>
 </ul>
+<p>
+              </p>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Recordar contraseña de manera predeterminada. </b><a class="indexterm" name="id-1.14.14.7.2.1.5.1.2"></a>Determina el plazo predeterminado de <span class="phrase">Guard</span> para recordar la contraseña. Puede cambiar este valor predeterminado cuando se le pida su contraseña de <span class="phrase">Guard</span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Recordar contraseña de manera predeterminada. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Determina el plazo predeterminado de <span class="phrase">Guard</span> para recordar la contraseña. Puede cambiar este valor predeterminado cuando se le pida su contraseña de <span class="phrase">Guard</span>.</p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.pgppasswords"></p>
+<h3 class="title">Administración de contraseñas (PGP)</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funciones para cambiar o restablecer la contraseña PGP.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a></p></li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.reference.guard.settings.password"></p>
-<h3 class="title">Gestión de contraseñas</h3>
+<div id="ox.appsuite.user.reference.guard.settings.smimepasswords" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.smimepasswords"></p>
+<h3 class="title">Administración de contraseñas (S/MIME)</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funciones para cambiar o restablecer la contraseña.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funciones para cambiar o restablecer la contraseña S/MIME.</p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestión de contraseñas</a></p></li>
 </ul>
 <p>
       </p>
-<div id="ox.appsuite.user.reference.guard.settings.smime" class="cap-smime">
-<p id="ox.appsuite.user.reference.guard.settings.smime"></p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.yourpgpkeys"></p>
+<h3 class="title">Sus claves PGP</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funciones para administrar sus claves PGP.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Consulte <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestión de claves PGP propias</a></p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.recipientpgpkeys"></p>
+<h3 class="title">Claves PGP del destinatario</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funciones para administrar claves PGP de los destinatarios.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Consulte <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Administración de claves PGP de destinatarios</a></p></li>
+</ul>
+<p>
+      </p>
+<div id="ox.appsuite.user.reference.guard.settings.yoursmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.yoursmime"></p>
 <h3 class="title">S/MIME</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.smime.enable"><b>Habilitar S/MIME. </b><a class="indexterm" name="id-1.14.14.9.2.1.1.1.2"></a>Determina si puede enviar y recibir correos con cifrado S/MIME.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">Contiene funciones para administrar el cifrado de tipo S/MIME.</p>
+<p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a></p>
+</li></ul>
 <p>
       </p>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings.extended"></p>
+<div id="ox.appsuite.user.reference.guard.settings.recipientsmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.recipientsmime"></p>
+<h3 class="title">Destinatarios S/MIME</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funciones para mostrar y añadir certificados de destinatarios de tipo S/MIME. </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Administración de claves</a></p></li>
+</ul>
+<p>
+      </p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.advanced"></p>
 <h3 class="title">Avanzados</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<p id="ox.appsuite.user.reference.guard.settings.extended.advanced"><b>Ajustes avanzados. </b><a class="indexterm" name="id-1.14.14.10.2.1.1.1.2"></a>Si <span class="guibutton"><strong>Mostrar ajustes avanzados</strong></span> está activado, estarán disponibles los siguientes ajustes y funciones. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
+<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Caché de correo</strong></span></p>
-<p role="presentation">Determina si un correo descifrado se mantiene en la memoria caché del navegador en un formato legible cuando se muestra otro correo o se cambia a otra aplicación de software colaborativo.</p>
-<p role="presentation">Para eliminar el correo descifrado de la caché del navegador, marque <span class="guibutton"><strong>No mantener los correos descifrados.</strong></span>.</p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.email"><b>Mostrar configuraciones avanzadas para redactar correo. </b>
+                </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<a class="indexterm" name="id-1.14.14.14.2.1.1.1.2.1.1.1"></a><p role="presentation">Si esta opción está habilitada, puede utilizar más opciones al enviar correos cifrados.</p>
+<p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Sección <span class="guibutton"><strong>Claves</strong></span></p>
-<p role="presentation">Gestión de las claves propias, públicas o de Autocrypt.</p>
-<p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestión de claves</a></p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.inline"><b>De manera predeterminada, usar PGP incrustado en correos nuevos. </b><a class="indexterm" name="id-1.14.14.14.2.1.2.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Determina si se utiliza PGP/Incrustado para el cifrado de forma predeterminada.</p></li>
+<li class="listitem"><p role="presentation">Use esa configuración solo si el cliente de correo de un destinatario no es compatible con PGP. Sin embargo, con PGP/Incrustado, el destinatario puede descifrar el mensaje.</p></li>
+<li class="listitem"><p role="presentation">Si usa esta configuración, no podrá enviar correos en formato html.</p></li>
+</ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Sección <span class="guibutton"><strong>Autocrypt</strong></span></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.autocrypt"><b>Configuración de Autocrypt. </b><a class="indexterm" name="id-1.14.14.14.2.1.3.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
 <p role="presentation">Configura el uso de Autocrypt en correos entrantes. Le permite transferir claves de Autocrypt a otros clientes.</p>
 <p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">Cifrado de conversaciones de correo con Autocrypt</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Al enviar correos cifrados hay opciones adicionales.</p>
-<p role="presentation">Véase <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Envío de correos cifrados</a></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.cache"><b>Caché de correo. </b><a class="indexterm" name="id-1.14.14.14.2.1.4.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation">Determina si un correo descifrado se mantiene en la memoria caché del navegador en un formato legible cuando se muestra otro correo o se cambia a otra aplicación de software colaborativo.</p>
+<p role="presentation">Para eliminar el correo descifrado de la caché del navegador, marque <span class="guibutton"><strong>No mantener los correos descifrados.</strong></span>.</p>
+</li></ul>
+<p>
+              </p>
 </li>
-</ul>
+<li class="listitem">
+<p id="ox.appsuite.user.task.guard.settings.advanced.reset"><b>Opciones de reinicio. </b><a class="indexterm" name="id-1.14.14.14.2.1.5.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation"><span class="guibutton"><strong>Borrar recuperación de contraseña</strong></span>. Borra la función de recuperación de una contraseña perdida.</p>
+<p role="presentation"><span class="phrase"><strong>Advertencia:</strong></span> Si elimina la función de restablecimiento de contraseña ya no podrá restablecer su contraseña. Si más adelante olvida su contraseña ya no tendrá la posibilidad de descifrar sus datos cifrados.</p>
+<p role="presentation">Consulte <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Eliminación de la función de restablecimiento de contraseña</a></p>
 </li></ul>
+<p>
+              </p>
+</li>
+</ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.guard.settings">Tema superior: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Cifrado de datos con <span class="phrase">Guard</span></i></a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.settings.commonsettings.html b/help/l10n/es_MX/ox.appsuite.user.sect.settings.commonsettings.html
index a49ba6c62..13fb4aa30 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.settings.commonsettings.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.settings.commonsettings.html
@@ -165,9 +165,9 @@
               </p>
 </li>
 <li class="listitem cap-deputy" id="id-1.4.6.11.2.1.3">
-<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Gestión de representantes. </b>
+<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Administrar representantes. </b>
                 </p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Administrar representantes</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">administrar representantes</a></p></li></ul>
 <p>
               </p>
 </li>
@@ -193,7 +193,7 @@
             <a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.settings.countdown.html b/help/l10n/es_MX/ox.appsuite.user.sect.settings.countdown.html
index 5cbcc9047..da9ac0621 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.settings.countdown.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.settings.countdown.html
@@ -1,13 +1,13 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Uso de cuentas atrás para Citas</title>
+<title>Uso de cuentas atrás para citas</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Configuración personalizada">
 <link rel="prev" href="ox.appsuite.user.sect.settings.notifications.html" title="Personalización de las notificaciones">
-<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Usar el área de notificación">
+<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="usar el área de notificación">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Configuración personalizada</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.countdown">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Uso de cuentas atrás para Citas</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Uso de cuentas atrás para citas</h2></div></div></div>
 <a class="indexterm" name="id-1.4.8.2"></a><a class="indexterm" name="id-1.4.8.3"></a><a class="indexterm" name="id-1.4.8.4"></a><p id="ox.appsuite.user.concept.settings.countdown">Puede habilitar una cuenta atrás para las próximas citas. Antes del comienzo de la cita, una ventana de cuenta atrás visualmente llamativa le recordará la cita. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.settings.notificationarea.html b/help/l10n/es_MX/ox.appsuite.user.sect.settings.notificationarea.html
index 15f82b310..c78e8cd9f 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.settings.notificationarea.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.settings.notificationarea.html
@@ -1,12 +1,12 @@
 <html lang="es">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Usar el área de notificación</title>
+<title>usar el área de notificación</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Configuración personalizada">
-<link rel="prev" href="ox.appsuite.user.sect.settings.countdown.html" title="Uso de cuentas atrás para Citas">
+<link rel="prev" href="ox.appsuite.user.sect.settings.countdown.html" title="Uso de cuentas atrás para citas">
 <link rel="next" href="ox.appsuite.user.sect.settings.personaldata.html" title="Cambio de datos personales de contacto">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Configuración personalizada</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.notificationarea">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Usar el área de notificación</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">usar el área de notificación</h2></div></div></div>
 <a class="indexterm" name="id-1.4.9.2"></a><a class="indexterm" name="id-1.4.9.3"></a><p id="ox.appsuite.user.concept.settings.notificationarea">Se le notificará en el área de notificaciones para los siguientes eventos: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Recordatorios de citas o tareas próximas</p></li>
@@ -61,10 +61,10 @@
 <li class="listitem"><p role="presentation">Para mostrar sugerencias de invitaciones a citas en el calendario, presione en la fecha.</p></li>
 <li class="listitem"><p role="presentation">Para aceptar o declinar una invitación, presione en el botón correspondiente.</p></li>
 </ul></p>
-<p role="presentation" class="feat-io-ox-core-managedResources">Al recibir solicitudes de reserva de recursos administrados, se pueden usar las siguientes funciones: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Para ver las solicitudes de reserva en el calendario de recursos, presione en la fecha.</p></li>
-<li class="listitem"><p role="presentation">Para aceptar o rechazar una solicitud de reserva, presione en el botón correspondiente.</p></li>
-</ul></p>
+<p role="presentation" class="feat-io-ox-core-managedResources">Al recibir solicitudes de reserva para recursos administrados, puede utilizar las siguientes funciones: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Para ver la solicitud de reserva en el calendario de recursos, presione en la fecha.</p></li>
+<li class="listitem"><p role="presentation">Para aceptar o rechazar la solicitud de reserva, presione en el botón correspondiente.</p></li>
+</ul> </p>
 <p role="presentation">Si hay tareas atrasadas se pueden usar las siguientes funciones: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Para mostrar detalles en una ventana emergente, presione en el recordatorio.</p></li>
 <li class="listitem"><p role="presentation">Para editar la tarea, use las funciones de la ventana emergente.</p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.settings.notifications.html b/help/l10n/es_MX/ox.appsuite.user.sect.settings.notifications.html
index 11fefe02e..03f7164b7 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.settings.notifications.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.settings.notifications.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Configuración personalizada">
 <link rel="prev" href="ox.appsuite.user.sect.settings.commonsettings.html" title="Ajuste de la Configuración general">
-<link rel="next" href="ox.appsuite.user.sect.settings.countdown.html" title="Uso de cuentas atrás para Citas">
+<link rel="next" href="ox.appsuite.user.sect.settings.countdown.html" title="Uso de cuentas atrás para citas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -60,7 +60,7 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>mostrar notificaciones de escritorio. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Determina si se recibirá una notificación de escritorio para los correos entrantes si el software colaborativo está en segundo plano.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>Mostrar notificaciones de escritorio. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Determina si se recibirá una notificación de escritorio para los correos entrantes si el software colaborativo está en segundo plano.</p></li>
 <li class="listitem">
 <p role="presentation">Dependiendo de la configuración del navegador, se muestra el botón <span class="guibutton"><strong>Administrar los permisos del navegador ahora</strong></span>. Presione el botón. El navegador le preguntará si se debe permitir la recepción de notificaciones. Conceda este permiso.</p>
 <p role="presentation">Nota: Dependiendo del navegador, podría tener que permitir la recepción de notificaciones en la configuración del navegador para que el ajuste surta efecto. Se puede encontrar información en las páginas de ayuda del navegador.</p>
@@ -74,7 +74,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.show"><b>Abrir automáticamente el área de notificación cuando haya nuevos recordatorios. </b><a class="indexterm" name="id-1.4.7.8.2.1.1.1.2"></a>Determina si el área de notificación se abre automáticamente al recibir un recordatorio para una cita o tarea.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.birthdays"><b>Mostrar cumpleaños en el área de notificación. </b>Determina si el área de notificación también incluye cumpleaños próximos.</p></li>
 </ul>
-<p>Consulte <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a></p>
+<p>Consulte <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a></p>
 <p id="ox.appsuite.user.reference.settings.notifications.email"></p>
 <h3 class="title">correo</h3>
 <p>
@@ -93,14 +93,14 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem feat-io-ox-core-countdown" id="id-1.4.7.10.2.1.1"><p id="ox.appsuite.user.reference.settings.notifications.calendar.countdown"><b>Cuenta atrás. </b><a class="indexterm" name="id-1.4.7.10.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.3"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.4"></a>Determina si se mostrará una ventana de cuenta regresiva para las próximas citas. Consulte <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a></p></li>
+<li class="listitem feat-io-ox-core-countdown" id="id-1.4.7.10.2.1.1"><p id="ox.appsuite.user.reference.settings.notifications.calendar.countdown"><b>Cuenta atrás. </b><a class="indexterm" name="id-1.4.7.10.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.3"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.4"></a>Determina si se mostrará una ventana de cuenta regresiva para las próximas citas. Consulte <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a></p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.settings.notifications.calendar.email"><b>Notificaciones por correo. </b>Determina si recibirá un correo de notificación si se cumple lo siguiente: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.changes"><b>Recibir notificaciones cuando se ha creado, modificado o borrado, una cita en la que participa. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.1.1.2"></a>Una cita en la que participa se ha vuelto a crear, se ha cambiado o se ha borrado.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>recibir notificación como creador de la cita cuando los participantes acepten o rechacen. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Un participante ha aceptado o rechazado una cita creada por usted.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>recibir notificación como participante de la cita cuando otros participantes acepten o rechacen. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>un participante ha aceptado o rechazado una cita en la que usted participa.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>borrar automáticamente el correo de invitación cuando la cita haya sido aceptada o rechazada. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Determina si la notificación por correo para una invitación a una cita se borrará automáticamente cuando se acepte o rechace dicha cita. Consulte <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>Recibir notificación como creador de la cita cuando los participantes acepten o rechacen. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Un participante ha aceptado o rechazado una cita creada por usted.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>Recibir notificación como participante de la cita cuando otros participantes acepten o rechacen. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>un participante ha aceptado o rechazado una cita en la que usted participa.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>Borrar automáticamente el correo de invitación cuando la cita haya sido aceptada o rechazada. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Determina si la notificación por correo para una invitación a una cita se borrará automáticamente cuando se acepte o rechace dicha cita. Consulte <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responder a invitaciones de cita</a></p></li>
 </ul>
 </li>
 </ul>
@@ -141,14 +141,14 @@
             <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Búsqueda de configuraciones</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuste de la Configuración general</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Usar el área de notificación</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">usar el área de notificación</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.settings.personaldata.html b/help/l10n/es_MX/ox.appsuite.user.sect.settings.personaldata.html
index 56b7ffabb..b43cb3356 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.settings.personaldata.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.settings.personaldata.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Configuración personalizada">
-<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Usar el área de notificación">
+<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="usar el área de notificación">
 <link rel="next" href="ox.appsuite.user.sect.settings.wizard.html" title="Uso de un asistente para configurar aplicaciones locales">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.settings.presencestatus.html b/help/l10n/es_MX/ox.appsuite.user.sect.settings.presencestatus.html
index 9d14abf73..23cdd91f2 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.settings.presencestatus.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.settings.presencestatus.html
@@ -56,7 +56,7 @@
             <a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a>
           </p>
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a>
           </p>
 <p role="presentation" class="cap-contacts">
             <a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.settings.search.html b/help/l10n/es_MX/ox.appsuite.user.sect.settings.search.html
index 332c9e115..acb7dd381 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.settings.search.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.settings.search.html
@@ -64,7 +64,7 @@
             <a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personalización de las notificaciones</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para Citas</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Uso de cuentas atrás para citas</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none">
@@ -80,6 +80,9 @@
 <p role="presentation" class="cap-infostore">
             <a class="xref" href="ox.appsuite.user.sect.drive.settings.html">Configuración de <span class="phrase">Ficheros</span></a>
           </p>
+<p role="presentation" class="cap-guard">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Configuración de <span class="phrase">Guard</span></a>
+          </p>
 </li>
 </ul>
 <p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.add.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.add.html
index 9fcc112e6..5b3ad2a7a 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.add.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.add.html
@@ -52,7 +52,7 @@
             <a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importación de tareas</a>
           </p>
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">crear citas</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creación de citas</a>
           </p>
 </li></ul>
 <p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.call.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.call.html
index 7dc0a3ce8..51067d4a9 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.call.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.call.html
@@ -66,7 +66,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Llamar al remitente o a otro destinatario</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Llamar a los participantes de la cita</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio o video</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Programación de conferencias de audio/vídeo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Llamar a contactos</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Establecer el estado de presencia</a></p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.detailview.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.detailview.html
index 9456b0417..1a6923b07 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.detailview.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.detailview.html
@@ -55,7 +55,7 @@
 <li class="listitem"><p role="presentation">El asunto de la tarea</p></li>
 <li class="listitem"><p role="presentation">La fecha de recordatorio de la tarea, si está configurada</p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.7.10.4.1.5">
-<p role="presentation">Las categorías asignadas</p>
+<p role="presentation">las categorías asignadas</p>
 <p role="presentation">Presionar en un categoría lanza una búsqueda de tareas a las que se ha asignado dicha categoría.</p>
 </li>
 <li class="listitem"><p role="presentation">Si la tarea es repetitiva, se mostrarán los parámetros de repetición.</p></li>
@@ -70,7 +70,7 @@
 <li class="listitem"><p role="presentation">fecha de comienzo</p></li>
 <li class="listitem"><p role="presentation">definición</p></li>
 <li class="listitem"><p role="presentation">información de facturación</p></li>
-<li class="listitem"><p role="presentation">adjuntos</p></li>
+<li class="listitem"><p role="presentation">Adjuntos</p></li>
 <li class="listitem">
 <p role="presentation">los nombres de los participantes</p>
 <p role="presentation">Si presiona en un nombre, se abre una ventana emergente. Se muestra la <span class="guibutton"><strong>Vista Halo</strong></span> del participante.</p>
@@ -87,14 +87,11 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.create.html">La ventana de edición</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Visualización de tareas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Visualización o almacenamiento de adjuntos de tareas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">Llamar a los participantes de la tarea</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualización de contactos en la vista halo</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.gui.detailview">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Los componentes de <span class="phrase">Tareas</span></a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.foldertree.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.foldertree.html
index 2af1a4dc3..eefcf5994 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.foldertree.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.foldertree.html
@@ -59,6 +59,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Visualización de tareas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Adición de listas de tareas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Administración de datos con carpetas</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.list.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.list.html
index e61877a71..322aea855 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.list.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.list.html
@@ -59,17 +59,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.list.html">La vista de lista</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.settingsmenu.html">El menú de configuración de <span class="phrase">Tareas</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.detailview.html">La vista de detalle de <span class="phrase">Tareas</span></a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Visualización de tareas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Visualización o almacenamiento de adjuntos de tareas</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.list">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Los componentes de <span class="phrase">Tareas</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.settingsmenu.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
index dc6b9def5..f3547fd01 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
@@ -53,10 +53,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.menubar.html">La barra de menús</a></p></li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Suscribirse a listas de tareas públicas y compartidas</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Suscribirse a listas de tareas públicas y compartidas</a></p></li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.settingsmenu">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Los componentes de <span class="phrase">Tareas</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.toolbar.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.toolbar.html
index 1c4f924e2..89735795b 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.toolbar.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.gui.toolbar.html
@@ -60,13 +60,7 @@
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Edición de tareas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Cambio de la fecha de vencimiento de una tarea</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marcado de tareas como realizadas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Mover tareas a otra carpeta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Cambiar confirmaciones de tareas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Exportación de tareas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.print.html">Impresión de tareas</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.delete.html">Borrado de tareas</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.toolbar">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Los componentes de <span class="phrase">Tareas</span></a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.categories.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.categories.html
new file mode 100644
index 000000000..ad77eb230
--- /dev/null
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="es">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Uso de categorías para tareas</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Guía del usuario">
+<link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Gestión de tareas">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Cambio de la fecha de vencimiento de una tarea">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Mover tareas a otra carpeta">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Atrás</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Siguiente</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Tareas</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestión de tareas</h2>
+<div class="sect2" id="ox.appsuite.user.sect.tasks.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Uso de categorías para tareas</h3></div></div></div>
+<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.categories">Para organizar tareas independientemente de las carpetas, puede utilizar categorías. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Puede marcar tareas con categorías.</p></li>
+<li class="listitem"><p role="presentation">Puede mostrar todas las tareas que se han marcado con una categoría específica.</p></li>
+</ul>
+<p> Puede crear, editar o borrar categorías propias; consulte <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>.</p>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories">
+<p class="title">Cómo marcar tareas con una categoría:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Seleccione una tarea. Presione el icono <span class="guibutton"><strong>Editar contacto</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.mark.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> de la barra de herramientas.</p>
+<p role="presentation">Se abre la ventana de edición de tareas.</p>
+</li>
+<li class="step">
+<p role="presentation">Para hacerlo, presione en <span class="guibutton"><strong>Agregar categoría</strong></span> ubicado junto a <span class="guibutton"><strong>Categorías</strong></span>. Seleccione una categoría.</p>
+<p role="presentation">Para eliminar una categoría de la tarea, presione en el icono <span class="guibutton"><strong>Eliminar categoría</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> que hay junto a la categoría.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories.view">
+<p class="title">Cómo mostrar tareas que han sido marcadas con una categoría específica:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Seleccione una tarea que haya sido marcada con una categoría.</p></li>
+<li class="step"><p role="presentation">Presione en la categoría en la vista de detalle.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Resultado: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vista de lista muestra todas las tareas que se han marcado con esta categoría.</p></li>
+<li class="listitem"><p role="presentation">Para mostrar la lista anterior, presione en el icono <span class="guibutton"><strong>Cancelar búsqueda</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> en el campo de búsqueda.</p></li>
+</ul>
+          <p>Consejo: También puede utilizar la función de búsqueda buscando una categoría mediante las opciones de búsqueda.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.tasks.manage.categories">
+        </p>
+<p class="title">Temas relacionados:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Búsqueda de tareas</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">De forma predeterminada se utiliza PGP incrustado para correos nuevos</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Uso de categorías para citas</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Uso de categorías para los contactos</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.tasks.manage.categories">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.changeduedate.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.changeduedate.html
index d29b66eaa..7a53bc18f 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.changeduedate.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.changeduedate.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Gestión de tareas">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="Marcado de tareas como realizadas">
-<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Mover tareas a otra carpeta">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Uso de categorías para tareas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Siguiente</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Siguiente</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -48,7 +48,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changeduedate"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.changestatus.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.changestatus.html
index b1b82ef24..2c90122bd 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.changestatus.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.changestatus.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de tareas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.changestatus">
 <div class="titlepage"><div><div><h3 class="title">Cambiar confirmaciones de tareas</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.10.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Si es un participante de la tarea, puede cambiar su confirmación para esta tarea más tarde. Puede agregar un comentario que sea visible para otros participantes de la tarea.</p>
+<a class="indexterm" name="id-1.10.15.11.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Si es un participante de la tarea, puede cambiar su confirmación para esta tarea más tarde. Puede agregar un comentario que sea visible para otros participantes de la tarea.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.changestatus">
 <p class="title">Cómo cambiar su confirmación:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changestatus"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.delete.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.delete.html
index df9a903ca..beff663ec 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.delete.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de tareas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Borrado de tareas</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Advertencia:</strong></span> Las tareas borradas <span class="phrase"><strong>no</strong></span> se pueden restaurar.</p>
+<a class="indexterm" name="id-1.10.15.15.2"></a><a class="indexterm" name="id-1.10.15.15.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Advertencia:</strong></span> Las tareas borradas <span class="phrase"><strong>no</strong></span> se pueden restaurar.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.delete">
 <p class="title">Cómo borrar tareas:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -50,9 +50,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.delete">
         </p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.delete">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.export.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.export.html
index 7b4978db3..fcc7bff0b 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.export.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de tareas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exportación de tareas</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">Puede exportar tareas en formato iCal. Puede, por ejemplo, utilizar este formato para intercambiar tareas con otras aplicaciones de calendario. Puede exportar tareas individuales o todas las tareas desde una carpeta.</p>
+<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><a class="indexterm" name="id-1.10.15.13.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">Puede exportar tareas en formato iCal. Puede, por ejemplo, utilizar este formato para intercambiar tareas con otras aplicaciones de calendario. Puede exportar tareas individuales o todas las tareas desde una carpeta.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.export.selected">
 <p class="title">Cómo exportar tareas individuales: </p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -63,12 +63,16 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.export"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista de carpeta de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importación de tareas</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.10.15.12.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.10.15.13.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Descarga de datos personales</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.manage.export">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
 </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.html
index d1d4e41e6..c2da837bb 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marcado de tareas como realizadas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Cambio de la fecha de vencimiento de una tarea</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Mover tareas a otra carpeta</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Cambiar confirmaciones de tareas</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importación de tareas</a></p></li>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.import.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.import.html
index 427b1925a..57789f53c 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.import.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de tareas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importación de tareas</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.11.2"></a><a class="indexterm" name="id-1.10.15.11.3"></a><a class="indexterm" name="id-1.10.15.11.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">Puede importar tareas desde archivos en formato iCal.</p>
+<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">Puede importar tareas desde archivos en formato iCal.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.import">
 <p class="title">Cómo importar tareas desde un archivo iCal:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,19 +54,15 @@
           <p>Resultado: Las tareas se agregan a la carpeta.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.tasks.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.tasks.manage.import"></p>
+<p class="title">Interfaz de usuario:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista de carpeta de <span class="phrase">Tareas</span></a></p></li></ul>
+<p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Exportación de tareas</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Creación de tareas</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Exportación de tareas</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Creación de tareas</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.tasks.manage.import">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
 </div>
           </div>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.markasdone.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.markasdone.html
index 00e7335a6..0ec4481ad 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.markasdone.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.markasdone.html
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.markasdone"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.move.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.move.html
index 9c6b523ed..9fb69c566 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.move.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.move.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Guía del usuario">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Gestión de tareas">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Cambio de la fecha de vencimiento de una tarea">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Uso de categorías para tareas">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.changestatus.html" title="Cambiar confirmaciones de tareas">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Aviso Legal">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Atrás</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Atrás</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inicio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdC</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Siguiente</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de tareas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Mover tareas a otra carpeta</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">Puede mover tareas a otra carpeta.</p>
+<a class="indexterm" name="id-1.10.15.10.2"></a><a class="indexterm" name="id-1.10.15.10.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">Puede mover tareas a otra carpeta.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.move">
 <p class="title">Cómo mover tareas a otra carpeta:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 <p id="ox.appsuite.user.tip.tasks.manage.move">Consejo: también puede mover los objetos seleccionados arrastrando los objetos desde la vista de carpeta a una carpeta.</p>
 <p id="ox.appsuite.user.related.tasks.manage.move"></p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista de carpeta de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Temas relacionados:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">Adición de lista de tareas personales</a></p></li></ul>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.print.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.print.html
index 0879ed38d..fed1c3486 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.print.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestión de tareas</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Impresión de tareas</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">Puede imprimir los datos de una sola tarea o de múltiples tareas.</p>
+<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">Puede imprimir los datos de una sola tarea o de múltiples tareas.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.print.data">
 <p class="title">Cómo imprimir los datos de una tarea:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,9 +51,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.print">
         </p>
 <p class="title">Interfaz de usuario:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra de herramientas de <span class="phrase">Tareas</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista de lista de <span class="phrase">Tareas</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.print">Tema superior: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestión de tareas</a></p>
diff --git a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.search.html b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.search.html
index 79ea4925d..d8037eed7 100644
--- a/help/l10n/es_MX/ox.appsuite.user.sect.tasks.search.html
+++ b/help/l10n/es_MX/ox.appsuite.user.sect.tasks.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Visualización de tareas</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestión de Categorías</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Uso de categorías para tareas</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/fr_FR/bk01-toc.html b/help/l10n/fr_FR/bk01-toc.html
index 5f0c27c6b..ab4c66731 100644
--- a/help/l10n/fr_FR/bk01-toc.html
+++ b/help/l10n/fr_FR/bk01-toc.html
@@ -63,8 +63,8 @@
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.search.html">Chercher des réglages</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuster les réglages généraux</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a></li>
-<li class="sect1 feat-io-ox-core-countdown"><a href="ox.appsuite.user.sect.settings.countdown.html">Utiliser le compte à rebours pour les rendez-vous</a></li>
-<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">Utiliser la zone de notification</a></li>
+<li class="sect1 feat-io-ox-core-countdown"><a href="ox.appsuite.user.sect.settings.countdown.html">Utiliser des comptes à rebours pour les rendez-vous</a></li>
+<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">utiliser la zone de notification</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.personaldata.html">Modifier les données personnelles de contact</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.wizard.html">Utiliser un assistant pour configurer les applications locales</a></li>
 <li class="sect1 cap-switchboard"><a href="ox.appsuite.user.sect.settings.presencestatus.html">Définir l'état de présence</a></li>
@@ -134,7 +134,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.new.html">Le bouton Nouveau message</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Courriel</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">La barre d'onglets de <span class="phrase">Courriel</span></a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">La barre des catégories de la boîte de réception</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.popup.html">Les fenêtres de <span class="phrase">Courriel</span></a></li>
@@ -144,13 +144,13 @@
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.view.html">Afficher les courriels</a></li>
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.attachments.html">Afficher ou enregistrer les pièces jointes à un courriel</a></li>
 <li class="sect1 cap-webmail">
-<a href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a><ul>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">Sélectionner une adresse d'expéditeur</a></li>
+<a href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a><ul>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">sélectionner une adresse d'expéditeur</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.replyto.html">Définir une adresse de réponse</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">Ajouter des pièces jointes</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">ajouter des pièces jointes</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Ajouter des pièces jointes de courriels existants</a></li>
-<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envoyer des pièces jointes sous forme de liens</a></li>
+<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">envoyer des pièces jointes sous forme de liens</a></li>
 <li class="sect2 feat-io-ox-core-templates"><a href="ox.appsuite.user.sect.email.send.templates.html">Utiliser les modèles</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.signatures.html">Utiliser des signatures</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.reply.html">Répondre à des courriels</a></li>
@@ -174,6 +174,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.movecopy.html">Déplacer ou copier des courriels</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.mark.html">Marquer des courriels comme lus ou non lus</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecter des adresses</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">Par défaut, utiliser PGP dans le corps pour tout nouveau courriel</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.label.html">Classement des courriels</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.source.html">Afficher le code source d'un message</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.draft.html">Utiliser les brouillons de message</a></li>
@@ -185,6 +186,9 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.print.html">Imprimer des courriels</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.archive.html">Archiver des courriels</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.delete.html">Suppression de courriels</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.recover.html">Récupération de courriels</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.deleteforever.html">Suppression de courriels</a></li>
+<li class="sect2 cap-dumpster"><a href="ox.appsuite.user.sect.email.manage.undelete.html">Récupérer des courriels supprimés définitivement</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.expungefolder.html">Nettoyer les dossiers de courrier électronique</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utiliser la messagerie unifiée</a></li>
 </ul>
@@ -238,7 +242,7 @@
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.attachments.html">Afficher ou enregistrer des pièces jointes de rendez-vous</a></li>
 <li class="sect1 cap-calendar">
-<a href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a><ul>
+<a href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a><ul>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.create.html">Créer de nouveaux rendez-vous</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.datepicker.html">Outil de sélection de date</a></li>
 <li class="sect2 cap-calendar cap-switchboard"><a href="ox.appsuite.user.sect.calendar.add.call.html">Planifier des conférences audio/vidéo</a></li>
@@ -252,7 +256,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviter des participants à un nouveau rendez-vous</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviter les destinataires d'un courriel à un nouveau rendez-vous</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Créer des rendez-vous à partir de pièces jointes au format iCal</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">résoudre les conflits</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Résoudre les conflits</a></li>
 </ul>
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.invitation.html">Répondre des invitations à des rendez-vous</a></li>
@@ -269,10 +273,11 @@
 </li>
 <li class="sect1 cap-calendar">
 <a href="ox.appsuite.user.sect.calendar.manage.html">Gérer les rendez-vous</a><ul>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changer l'état d'un rendez-vous</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Modification de l'état d'un rendez-vous</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modifier les rappels de rendez-vous</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Modifier l'organisateur</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.timezones.html">Gérer les fuseaux horaires favoris</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">Utiliser des catégories pour les rendez-vous</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.colors.html">Utiliser les couleurs de l'agenda</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.move.html">Déplacer des rendez-vous vers un autre agenda</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.import.html">Importer des rendez-vous</a></li>
@@ -360,6 +365,7 @@
 <a href="ox.appsuite.user.sect.contacts.manage.html">Gérer les contacts</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envoyer des courriels à partir du carnet d'adresses</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">invitation de contacts à un rendez-vous</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">Utiliser des catégories pour les contacts</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Déplacer ou copier des contacts</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envoyer des contacts sous forme de vCard</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.import.html">Importer des contacts</a></li>
@@ -413,6 +419,7 @@
 <a href="ox.appsuite.user.sect.tasks.manage.html">Gérer les tâches</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marquer des tâches comme terminées</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Changer la date d'échéance d'une tâche</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">Utiliser des catégories pour les tâches</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.move.html">Déplacer des tâches vers un autre dossier</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Modifier l'état de confirmation d'une tâche</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.import.html">Importer des tâches</a></li>
@@ -515,7 +522,7 @@
 </ul>
 </li>
 <li class="sect1 cap-deputy">
-<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gérer les délégués</a><ul>
+<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">gérer les délégués</a><ul>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.add.html">Ajout de délégués</a></li>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">Afficher, modifier, supprimer des délégués</a></li>
 </ul>
@@ -577,19 +584,26 @@
 </ul>
 </li>
 <li class="sect1 cap-guard">
-<a href="ox.appsuite.user.sect.guard.documents.html">Chiffrer des documents Office</a><ul>
+<a href="ox.appsuite.user.sect.guard.documents.html">Chiffrement des documents Office</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.createencrypted.html">Création de nouveaux documents chiffrés</a></li>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Enregistrement des documents sélectionnés sous un format chiffré</a></li>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.open.html">Ouvrir des documents chiffrés</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.logout.html">Se déconnecter de <span class="phrase">Sécurité</span></a></li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a></li>
+<li class="sect1 cap-guard">
+<a href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a><ul>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.change.html">Changer le mot de passe</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.reset.html">réinitialiser le mot de passe</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Supprimer la fonction de réinitialisation du mot de passe</a></li>
+</ul>
+</li>
 <li class="sect1 cap-guard">
 <a href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gérer vos clés PGP personnelles</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gérer les clés PGP des destinataires</a></li>
 <li class="sect2 cap-smime"><a href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gérer vos clés S/MIME personnelles</a></li>
-<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gérer les clés publiques</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Gérer les clés S/MIME des destinataires</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html">Réglages de <span class="phrase">Sécurité</span></a></li>
diff --git a/help/l10n/fr_FR/index.html b/help/l10n/fr_FR/index.html
index ac7a60b0c..b318b0425 100644
--- a/help/l10n/fr_FR/index.html
+++ b/help/l10n/fr_FR/index.html
@@ -34,7 +34,7 @@
 </h3></div></div>
 <div><p class="copyright">Copyright ©  OX Software GmbH </p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">Note légale</a></div>
-<div><p class="pubdate">mardi, 21. novembre 2023 Version 8.19.0 </p></div>
+<div><p class="pubdate">jeudi, 21. décembre 2023 Version 8.20.0 </p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">Liste des sujets de l'aide</h2>
@@ -81,10 +81,10 @@
                 <a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser le compte à rebours pour les rendez-vous</a>
+                <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser des comptes à rebours pour les rendez-vous</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Utiliser la zone de notification</a>
+                <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">utiliser la zone de notification</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Utiliser un assistant pour configurer les applications locales</a>
@@ -97,6 +97,19 @@
               </p></li>
 </ul>
 </li>
+<li class="listitem" id="ox.appsuite.user.startpage.toc.keyboard" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.chap.keyboard.html"><i>Saisie au clavier</i></a>
+            </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.navigation.html">Utiliser la navigation au clavier</a>
+              </p></li>
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.shortkeys.html">Utiliser les raccourcis clavier</a>
+              </p></li>
+</ul>
+</li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.portal" style="list-style-type: none">
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.chap.portal.html"><i>
@@ -135,12 +148,12 @@
                 <a class="xref" href="ox.appsuite.user.sect.email.view.html">Afficher les courriels</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a>
+                <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a>
               </p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.5.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.6.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Utiliser l'intégration de l'IA</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.5.1.6"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.call.html">Appeler l'expéditeur ou un autre destinataire</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -155,13 +168,13 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.search.html">Chercher des courriels</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.5.1.11"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.11"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Envoyer ou recevoir des courriels en tant que délégué</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Ajouter des comptes de courrier électronique</a>
               </p></li>
-<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.5.1.13"><p role="presentation">
+<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
               </p></li>
 </ul>
@@ -183,7 +196,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Afficher les rendez-vous</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a>
+                <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Répondre des invitations à des rendez-vous</a>
@@ -191,7 +204,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modifier un rendez-vous</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.7"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Appeler les participants d'un rendez-vous</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -200,25 +213,25 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gérer les rendez-vous</a>
               </p></li>
-<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.6.1.10"><p role="presentation">
+<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.7.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Utiliser les agendas de ressources</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Rechercher des rendez-vous</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.12"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.7.1.12"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Créer, modifier ou gérer des rendez-vous en tant que délégué</a>
               </p></li>
-<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation">
+<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.7.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">Utiliser des groupes</a>
               </p></li>
-<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.6.1.14"><p role="presentation">
+<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">Utiliser des ressources</a>
               </p></li>
-<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.6.1.15"><p role="presentation">
+<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.7.1.15"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">Utiliser les ressources gérées</a>
               </p></li>
-<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.6.1.16"><p role="presentation">
+<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.7.1.16"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
               </p></li>
 </ul>
@@ -242,7 +255,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Ajouter automatiquement des contacts ou des ressources depuis un carnet d'adresses</a>
               </p></li>
-<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.7.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.8.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Ajouter automatiquement des contacts ou des ressources depuis le répertoire des adresses</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -254,7 +267,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Modifier des contacts ou des listes de diffusion</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.9"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.8.1.9"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Appeler des contacts</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -269,7 +282,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Chercher des contacts</a>
               </p></li>
-<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation">
+<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.8.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Réglages du carnet d'adresses</a>
               </p></li>
 </ul>
@@ -344,7 +357,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Ajouter des comptes de stockage</a>
               </p></li>
-<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.9.1.10"><p role="presentation">
+<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.10.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.settings.html">Réglages de <span class="phrase">Fichiers</span></a>
               </p></li>
 </ul>
@@ -357,19 +370,19 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestion des données avec les dossiers</a>
               </p></li>
-<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.10.1.3"><p role="presentation">
+<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.11.1.3"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Partager des données</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.10.1.4"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gérer les délégués</a>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.11.1.4"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gérer les délégués</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Gérer les comptes</a>
               </p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.10.1.6"><p role="presentation">
+<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.11.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>
               </p></li>
-<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.10.1.7"><p role="presentation">
+<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.11.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Télécharger les données personnelles</a>
               </p></li>
 </ul>
@@ -388,7 +401,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.sessions.html">Afficher les clients actifs et vous en déconnecter</a>
               </p></li>
-<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.11.1.5"><p role="presentation">
+<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.12.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Authentification multifacteur</a>
               </p></li>
 </ul>
@@ -411,7 +424,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Chiffre ou déchiffrer des fichiers</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Chiffrer des documents Office</a>
+                <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Chiffrement des documents Office</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.guard.logout.html">Se déconnecter de <span class="phrase">Sécurité</span></a>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.chap.calendar.html b/help/l10n/fr_FR/ox.appsuite.user.chap.calendar.html
index 52d13cc1e..5960e727a 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.chap.calendar.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.chap.calendar.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="index.html" title="Manuel de l'utilisateur">
-<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="Réglages de courriel">
+<link rel="prev" href="ox.appsuite.user.sect.email.mailfilter.apply.html" title="Appliquer une règle à des courriels existants">
 <link rel="next" href="ox.appsuite.user.sect.calendar.gui.html" title="Les composants de Agenda">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.mailfilter.apply.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.gui.html">Suivant</a></li>
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Les composants de <span class="phrase">Agenda</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Afficher les rendez-vous</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.attachments.html">Afficher ou enregistrer des pièces jointes de rendez-vous</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Répondre des invitations à des rendez-vous</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modifier un rendez-vous</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.8.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Appeler les participants d'un rendez-vous</a></p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/fr_FR/ox.appsuite.user.chap.dataorganisation.html
index 7c11a9a65..fd01dbf60 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.chap.dataorganisation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="index.html" title="Manuel de l'utilisateur">
-<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="Configurer WebDAV sous Windows">
+<link rel="prev" href="ox.appsuite.user.sect.drive.settings.html" title="Réglages de Fichiers">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.folder.html" title="Gestion des données avec les dossiers">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.settings.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.folder.html">Suivant</a></li>
@@ -35,7 +35,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestion des données avec les dossiers</a></p></li>
 <li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.12.2.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Partager des données</a></p></li>
-<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gérer les délégués</a></p></li>
+<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gérer les délégués</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Gérer les comptes</a></p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.12.2.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a></p></li>
 <li class="listitem cap-dataexport" id="id-1.12.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Télécharger les données personnelles</a></p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.chap.drive.html b/help/l10n/fr_FR/ox.appsuite.user.chap.drive.html
index 836f548f9..9cd6ca8de 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.chap.drive.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="index.html" title="Manuel de l'utilisateur">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.search.html" title="Rechercher des tâches">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.delete.html" title="Suppression de tâches">
 <link rel="next" href="ox.appsuite.user.sect.drive.gui.html" title="Les composants de Fichiers">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.search.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.delete.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.drive.gui.html">Suivant</a></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.chap.email.html b/help/l10n/fr_FR/ox.appsuite.user.chap.email.html
index 047bfdb42..dbd6527ab 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.chap.email.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.chap.email.html
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html">Les composants de <span class="phrase">Courriel</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Afficher les courriels</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Afficher ou enregistrer les pièces jointes à un courriel</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">Utiliser l'intégration de l'IA</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.7.7.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Appeler l'expéditeur ou un autre destinataire</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Ajouter des dossiers de courrier électronique</a></p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.chap.guard.html b/help/l10n/fr_FR/ox.appsuite.user.chap.guard.html
index b096af256..8fe8f966c 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.chap.guard.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="index.html" title="Manuel de l'utilisateur">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="Gérer les méthodes de vérification">
+<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="Se déconnecter automatiquement">
 <link rel="next" href="ox.appsuite.user.sect.guard.setup.html" title="Configurer Sécurité">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.autologout.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.setup.html">Suivant</a></li>
@@ -45,7 +45,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.html">Chiffrer les conversations par courriel</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">Chiffrer les conversations par courriel à l'aide d'Autocrypt</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Chiffre ou déchiffrer des fichiers</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Chiffrer des documents Office</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Chiffrement des documents Office</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.logout.html">Se déconnecter de <span class="phrase">Sécurité</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a></p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.chap.security.html b/help/l10n/fr_FR/ox.appsuite.user.chap.security.html
index e8a92721c..854c787e3 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.chap.security.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.chap.security.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="index.html" title="Manuel de l'utilisateur">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="Afficher, modifier, supprimer des comptes">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="Télécharger les données personnelles">
 <link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="Afficher les clients actifs et vous en déconnecter">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">Suivant</a></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.chap.settings.html b/help/l10n/fr_FR/ox.appsuite.user.chap.settings.html
index 0591bfe00..ea0055bad 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.chap.settings.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.chap.settings.html
@@ -36,8 +36,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Chercher des réglages</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuster les réglages généraux</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser le compte à rebours pour les rendez-vous</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Utiliser la zone de notification</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser des comptes à rebours pour les rendez-vous</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">utiliser la zone de notification</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.personaldata.html">Modifier les données personnelles de contact</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Utiliser un assistant pour configurer les applications locales</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.4.3.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Définir l'état de présence</a></p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.chap.tasks.html b/help/l10n/fr_FR/ox.appsuite.user.chap.tasks.html
index ce3c955a2..0e0e4116c 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.chap.tasks.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.chap.tasks.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="index.html" title="Manuel de l'utilisateur">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="Réglages du carnet d'adresses">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.delete.html" title="Suppression de contacts">
 <link rel="next" href="ox.appsuite.user.sect.tasks.gui.html" title="Les composants de Tâches">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.settings.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.delete.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.gui.html">Suivant</a></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.index.html b/help/l10n/fr_FR/ox.appsuite.user.index.html
index 73bd2681e..9eecf1272 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.index.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="index.html" title="Manuel de l'utilisateur">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="Réglages de Sécurité">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Gérer les clés S/MIME des destinataires">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -21,7 +21,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.settings.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 </ul></div>
@@ -107,11 +107,11 @@
 </dt>
 <dt class="cap-calendar">composants, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.html">Les composants de Agenda</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Créer des rendez-vous en passant par l'agenda de ressource, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Créer des rendez-vous en passant par l'agenda de ressource</a>
+<dt class="feat-io-ox-core-resourceCalendars">créer des rendez-vous en passant par l'agenda de ressource, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Créer des rendez-vous en passant par l'agenda de ressource</a>
 </dt>
 <dt class="cap-calendar">fenêtre d'édition, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.create.html">La fenêtre d'édition d'un rendez-vous</a>
 </dt>
-<dt class="cap-calendar">Importer, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importer des agendas depuis des fichiers</a>
+<dt class="cap-calendar">importer, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importer des agendas depuis des fichiers</a>
 </dt>
 <dt class="cap-calendar">le menu Réglages, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">Le menu des réglages de Agenda</a>
 </dt>
@@ -121,9 +121,11 @@
 </dt>
 <dt class="cap-calendar">outil de sélection de date, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">L'outil de sélection de date</a>
 </dt>
+<dt class="cap-share_links cap-share_mail_attachments">partager, voir partage, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Partager des données</a>
+</dt>
 <dt class="cap-calendar">réglages, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt>
-<dt class="cap-calendar_google">S'abonner à des agendas Google Calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">S'abonner à des agendas Google Calendar</a>
+<dt class="cap-calendar_google">s'abonner à des agendas Google Calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">S'abonner à des agendas Google Calendar</a>
 </dt>
 <dt class="cap-calendar">s'abonner à des agendas iCal , <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">S'abonner à des agendas externes à partir d'une URL iCal</a>
 </dt>
@@ -131,7 +133,9 @@
 </dt>
 <dt class="cap-calendar">utiliser la vue de planification, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utiliser la vue de planification</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Utiliser les agendas de ressources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Utiliser les agendas de ressources</a>
+<dt class="feat-io-ox-core-resourceCalendars">utiliser les agendas de ressources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Utiliser les agendas de ressources</a>
+</dt>
+<dt class="feat-io-ox-core-categories">utiliser les catégories, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utiliser des catégories pour les rendez-vous</a>
 </dt>
 <dt class="cap-calendar">utiliser les couleurs de l'agenda, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Utiliser les couleurs de l'agenda</a>
 </dt>
@@ -139,16 +143,13 @@
 </dt>
 <dt class="cap-calendar">vue de planification, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.scheduling.html">La vue de planification</a>
 </dt>
-<dt class="cap-calendar">vue des dossiers, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vue des dossiers de Agenda</a>
+<dt class="cap-calendar">Vue des dossiers, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vue des dossiers de Agenda</a>
 </dt>
 <dt class="cap-calendar">vue détaillée, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vue détaillée de Agenda</a>
 </dt>
-<dt class="cap-calendar">Vue en liste, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">La vue en liste Agenda</a>
+<dt class="cap-calendar">vue en liste, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">La vue en liste Agenda</a>
 </dt>
 </dl></dd>
-<dt class="cap-share_links cap-share_mail_attachments">agenda</dt>
-<dd><dl><dt class="cap-share_links cap-share_mail_attachments">partager, voir partage, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Partager des données</a>
-</dt></dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Agenda de ressource</dt>
 <dd><dl>
 <dt class="feat-io-ox-core-resourceCalendars">afficher, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.view.html">Afficher les agendas de ressources</a>
@@ -170,7 +171,7 @@
 </dt>
 <dt class="cap-contacts">contact, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.attachments.html">Ajout de pièces jointes</a>, <a class="indexterm" href="ox.appsuite.user.sect.tasks.add.attachments.html">Ajouter des pièces jointes</a>
 </dt>
-<dt class="cap-webmail">courrier électronique, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Ajouter des pièces jointes</a>
+<dt class="cap-webmail">courriel, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">ajouter des pièces jointes</a>
 </dt>
 <dt class="cap-calendar">rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Ajouter des pièces jointes</a>
 </dt>
@@ -332,7 +333,7 @@
 </dt>
 <dt class="cap-contacts">réglages, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Réglages du carnet d'adresses</a>
 </dt>
-<dt class="cap-contacts">vue des dossiers, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vue des dossiers dans Carnet d'adresses</a>
+<dt class="cap-contacts">Vue des dossiers, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vue des dossiers dans Carnet d'adresses</a>
 </dt>
 <dt class="cap-contacts">vue détaillée, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vue détaillée de Carnet d'adresses</a>
 </dt>
@@ -340,8 +341,18 @@
 </dt>
 </dl></dd>
 <dt class="feat-io-ox-core-categories">Catégories</dt>
-<dd><dl><dt class="feat-io-ox-core-categories">gérer, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="feat-io-ox-core-categories">gérer, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>
+</dt>
+<dt class="feat-io-ox-core-categories">utiliser pour les contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utiliser des catégories pour les contacts</a>
+</dt>
+<dt class="feat-io-ox-core-categories">utiliser pour les courriels, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Par défaut, utiliser PGP dans le corps pour tout nouveau courriel</a>
+</dt>
+<dt class="feat-io-ox-core-categories">utiliser pour les rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utiliser des catégories pour les rendez-vous</a>
+</dt>
+<dt class="feat-io-ox-core-categories">utiliser pour les tâches, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utiliser des catégories pour les tâches</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">Catégories de la boîte de réception</dt>
 <dd><dl><dt class="cap-webmail">travail avec, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Travailler avec les catégories de la boîte de réception</a>
 </dt></dl></dd>
@@ -362,7 +373,7 @@
 </dl></dd>
 <dt class="cap-guard">Chiffrer</dt>
 <dd><dl>
-<dt class="cap-guard">chiffrer les documents Office , <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Chiffrer des documents Office</a>
+<dt class="cap-guard">chiffrer les documents Office , <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Chiffrement des documents Office</a>
 </dt>
 <dt class="cap-guard">courriels, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.html">Chiffrer les conversations par courriel</a>
 </dt>
@@ -377,7 +388,7 @@
 <dt class="cap-guard">fichiers, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.html">Chiffre ou déchiffrer des fichiers</a>, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.encrypt.html">Chiffrer des fichiers</a>
 </dt>
 </dl></dd>
-<dt class="cap-guard">Chiffrer les documents Office , <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Chiffrer des documents Office</a>
+<dt class="cap-guard">Chiffrer les documents Office , <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Chiffrement des documents Office</a>
 </dt>
 <dt class="cap-portal">Composants graphiques du portail</dt>
 <dd><dl>
@@ -497,6 +508,8 @@
 </dt>
 <dt class="cap-contacts">supprimer, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.delete.html">Suppression de contacts</a>
 </dt>
+<dt class="feat-io-ox-core-categories">utiliser les catégories, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utiliser des catégories pour les contacts</a>
+</dt>
 </dl></dd>
 <dt class="cap-webmail">Copier</dt>
 <dd><dl>
@@ -511,22 +524,96 @@
 </dt>
 <dt class="">courriel</dt>
 <dd><dl>
+<dt class="cap-webmail">afficher, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Afficher les courriels</a>
+</dt>
 <dt class="cap-guard">afficher les clés Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gérer les clés Autocrypt</a>
 </dt>
-<dt class="cap-infostore">afficher les pièces jointes, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Afficher les pièces jointes aux courriels dans Fichiers</a>
+<dt class="cap-portal">ajouter au portail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.addportal.html">Ajouter un courriel au portail</a>
+</dt>
+<dt class="cap-webmail">ajouter des pièces jointes, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">ajouter des pièces jointes</a>
+</dt>
+<dt class="cap-webmail">ajouter des pièces jointes de courriels existants, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Ajouter des pièces jointes de courriels existants</a>
+</dt>
+<dt class="cap-webmail">ajouter un dossier, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Ajouter des dossiers de courrier électronique</a>
+</dt>
+<dt class="cap-webmail">archiver, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">Archiver des courriels</a>
+</dt>
+<dt class="cap-webmail">assigner des couleurs, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Classement des courriels</a>
+</dt>
+<dt class="cap-webmail">Catégories de la boîte de réception, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Travailler avec les catégories de la boîte de réception</a>
+</dt>
+<dt class="cap-webmail">chercher, <a class="indexterm" href="ox.appsuite.user.sect.email.search.html">Chercher des courriels</a>
 </dt>
 <dt class="cap-guard">chiffrer les courriels entrants, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Chiffrer des courriels entrants à l'aide d'une règle de filtrage</a>
 </dt>
+<dt class="cap-webmail">classer, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Classement des courriels</a>
+</dt>
+<dt class="cap-webmail">copier, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Déplacer ou copier des courriels</a>
+</dt>
+<dt class="cap-tasks">créer un rappel, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.reminder.html">Créer des rappels de courriel</a>
+</dt>
+<dt class="cap-webmail">définir des adresses de réponse, <a class="indexterm" href="ox.appsuite.user.sect.email.send.replyto.html">Définir une adresse de réponse</a>
+</dt>
+<dt class="cap-webmail">déplacer, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Déplacer ou copier des courriels</a>
+</dt>
+<dt class="cap-webmail">enregistrer au format EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">Enregistrement des courriels</a>
+</dt>
+<dt class="cap-webmail">envoyer, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a>
+</dt>
+<dt class="cap-calendar">envoyer aux participants au rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attendees.html">Envoyer un courriel aux participants du rendez-vous</a>
+</dt>
 <dt class="cap-guard">envoyer des courriels chiffrés, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Envoyer des courriels chiffrés</a>
 </dt>
+<dt class="cap-infostore">envoyer des pièces jointes sous forme de liens, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">envoyer des pièces jointes sous forme de liens</a>
+</dt>
+<dt class="cap-webmail">envoyer un message d'absence, <a class="indexterm" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Envoi automatique d'un message d'absence</a>
+</dt>
+<dt class="feat-io-ox-core-mailPDFExport">exporter au format PDF, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporter des courriels au format PDF</a>
+</dt>
+<dt class="cap-webmail">faire suivre automatiquement, <a class="indexterm" href="ox.appsuite.user.sect.email.send.autoforward.html">Faire suivre automatiquement des courriels</a>
+</dt>
+<dt class="cap-webmail">filtres, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Utiliser les filtres de courriel</a>
+</dt>
+<dt class="cap-webmail">Gérer, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a>
+</dt>
 <dt class="">images externes, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Images insérées dans les courriels au moyen de liens externes</a>
 </dt>
+<dt class="cap-webmail">importer depuis le format EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importer des courriels</a>
+</dt>
 <dt class="cap-guard">lire des courriels chiffrés, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Lire des courriels chiffrés</a>
 </dt>
+<dt class="cap-webmail">marquer comme lus, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marquer des courriels comme lus ou non lus</a>
+</dt>
+<dt class="cap-webmail">marquer comme non lus, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marquer des courriels comme lus ou non lus</a>
+</dt>
+<dt class="cap-webmail">marquer un dossier comme lu, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marquer des courriels comme lus ou non lus</a>
+</dt>
+<dt class="cap-webmail">Messagerie unifiée, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utiliser la messagerie unifiée</a>
+</dt>
+<dt class="cap-webmail">nettoyer les dossiers, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Nettoyer les dossiers de courrier électronique</a>
+</dt>
+<dt class="cap-webmail">récupérer, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Récupération de courriels</a>
+</dt>
+<dt class="cap-dumpster">récupérer des courriels supprimés définitivement, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Récupérer des courriels supprimés définitivement</a>
+</dt>
+<dt class="cap-webmail">répondre, <a class="indexterm" href="ox.appsuite.user.sect.email.send.reply.html">Répondre à des courriels</a>
+</dt>
+<dt class="cap-webmail">sélectionner une adresse d'expéditeur, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">sélectionner une adresse d'expéditeur</a>
+</dt>
 <dt class="">sons de notification, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
 </dt>
+<dt class="cap-webmail">supprimer, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Suppression de courriels</a>
+</dt>
 <dt class="cap-guard">supprimer des clés Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gérer les clés Autocrypt</a>
 </dt>
+<dt class="cap-webmail">transmettre, <a class="indexterm" href="ox.appsuite.user.sect.email.send.forward.html">Transmettre des courriels</a>
+</dt>
+<dt class="feat-io-ox-core-openai">utiliser l'intégration de l'IA, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Utiliser l'intégration de l'IA</a>
+</dt>
+<dt class="cap-webmail">utiliser les brouillons, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">Utiliser les brouillons de message</a>
+</dt>
+<dt class="feat-io-ox-core-openai">utiliser les fonctions d'IA pour répondre, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">Utiliser les fonctions d'IA pour répondre à des courriels</a>
+</dt>
 <dt class="cap-guard">vérifier les clés Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gérer les clés Autocrypt</a>
 </dt>
 </dl></dd>
@@ -543,131 +630,65 @@
   </a>
 </dt>
 <dd><dl>
-<dt class="cap-webmail">afficher, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Afficher les courriels</a>
-</dt>
 <dt class="cap-webmail">afficher la pièce jointe, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Afficher ou enregistrer les pièces jointes à un courriel</a>
 </dt>
 <dt class="cap-webmail">afficher le code source d'un message, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Afficher le code source d'un message</a>
 </dt>
-<dt class="cap-portal">ajouter au portail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.addportal.html">Ajouter un courriel au portail</a>
+<dt class="cap-infostore">afficher les pièces jointes, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Afficher les pièces jointes aux courriels dans Fichiers</a>
 </dt>
 <dt class="feat-io-ox-core-enterprisePicker">ajouter automatiquement depuis le répertoire d'adresses, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Ajouter automatiquement des contacts ou des ressources depuis le répertoire des adresses</a>
 </dt>
 <dt class="cap-contacts">ajouter automatiquement depuis un carnet d'adresses, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Ajouter automatiquement des contacts ou des ressources depuis un carnet d'adresses</a>
 </dt>
-<dt class="cap-webmail">ajouter des pièces jointes, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Ajouter des pièces jointes</a>
-</dt>
-<dt class="cap-webmail">ajouter des pièces jointes de courriels existants, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Ajouter des pièces jointes de courriels existants</a>
-</dt>
 <dt class="cap-webmail">ajouter un compte de courrier électronique, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Ajouter des comptes de courrier électronique</a>
 </dt>
-<dt class="cap-webmail">ajouter un dossier, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Ajouter des dossiers de courrier électronique</a>
-</dt>
 <dt class="cap-webmail cap-switchboard">appeler l'expéditeur ou un autre destinataire, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Appeler l'expéditeur ou un autre destinataire</a>
 </dt>
-<dt class="cap-webmail">archiver, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">Archiver des courriels</a>
-</dt>
-<dt class="cap-webmail">assigner des couleurs, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Classement des courriels</a>
-</dt>
-<dt class="cap-webmail">barre d'onglets, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">La barre d'onglets de Courriel</a>
-</dt>
 <dt class="cap-webmail">barre d'outils, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de Courriel</a>
 </dt>
-<dt class="cap-webmail">Bouton Nouveau message, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.new.html">Le bouton Nouveau message</a>
+<dt class="cap-webmail">barre des catégories de la boîte de réception, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">La barre des catégories de la boîte de réception</a>
 </dt>
-<dt class="cap-webmail">Catégories de la boîte de réception, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Travailler avec les catégories de la boîte de réception</a>
-</dt>
-<dt class="cap-webmail">chercher, <a class="indexterm" href="ox.appsuite.user.sect.email.search.html">Chercher des courriels</a>
-</dt>
-<dt class="cap-webmail">classer, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Classement des courriels</a>
+<dt class="cap-webmail">Bouton Nouveau message, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.new.html">Le bouton Nouveau message</a>
 </dt>
 <dt class="cap-webmail">collecter des adresses, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecter des adresses</a>
 </dt>
 <dt class="cap-webmail">composants, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.html">Les composants de Courriel</a>
 </dt>
-<dt class="cap-webmail">copier, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Déplacer ou copier des courriels</a>
-</dt>
-<dt class="cap-tasks">créer un rappel, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.reminder.html">Créer des rappels de courriel</a>
-</dt>
-<dt class="cap-webmail">définir des adresses de réponse, <a class="indexterm" href="ox.appsuite.user.sect.email.send.replyto.html">Définir une adresse de réponse</a>
-</dt>
-<dt class="cap-webmail">déplacer, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Déplacer ou copier des courriels</a>
-</dt>
-<dt class="cap-webmail">enregistrer au format EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">Enregistrement des courriels</a>
-</dt>
 <dt class="cap-webmail">enregistrer la pièce jointe, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Afficher ou enregistrer les pièces jointes à un courriel</a>
 </dt>
-<dt class="cap-webmail">envoyer, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a>
-</dt>
-<dt class="cap-calendar">envoyer aux participants au rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attendees.html">Envoyer un courriel aux participants du rendez-vous</a>
-</dt>
 <dt class="cap-webmail">envoyer depuis le carnet d'adresses, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envoyer des courriels à partir du carnet d'adresses</a>
 </dt>
-<dt class="cap-infostore">Envoyer des pièces jointes sous forme de liens, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envoyer des pièces jointes sous forme de liens</a>
-</dt>
 <dt class="cap-deputy">envoyer en tant que délégué, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Envoyer ou recevoir des courriels en tant que délégué</a>
 </dt>
-<dt class="cap-webmail">envoyer un message d'absence, <a class="indexterm" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Envoi automatique d'un message d'absence</a>
-</dt>
-<dt class="feat-io-ox-core-mailPDFExport">exporter au format PDF, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporter des courriels au format PDF</a>
-</dt>
-<dt class="cap-webmail">faire suivre automatiquement, <a class="indexterm" href="ox.appsuite.user.sect.email.send.autoforward.html">Faire suivre automatiquement des courriels</a>
-</dt>
 <dt class="cap-webmail">fenêtre de rédaction, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.create.html">La fenêtre de rédaction de courrier</a>
 </dt>
-<dt class="cap-webmail">filtres, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Utiliser les filtres de courriel</a>
-</dt>
-<dt class="cap-webmail">Gérer, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a>
-</dt>
-<dt class="cap-webmail">importer depuis le format EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importer des courriels</a>
-</dt>
 <dt class="cap-guard">importer des clés Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importer des clés Autocrypt</a>
 </dt>
 <dt class="cap-webmail">imprimer, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Imprimer des courriels</a>
 </dt>
 <dt class="cap-webmail">le menu Réglages, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">Le menu des réglages de Courriel</a>
 </dt>
-<dt class="cap-webmail">marquer comme lu, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marquer des courriels comme lus ou non lus</a>
-</dt>
 <dt class="cap-webmail">marquer comme lu, réglage pour, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
-<dt class="cap-webmail">marquer comme non lus, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marquer des courriels comme lus ou non lus</a>
-</dt>
-<dt class="cap-webmail">marquer un dossier comme lu, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marquer des courriels comme lus ou non lus</a>
-</dt>
-<dt class="cap-webmail">messagerie unifiée, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utiliser la messagerie unifiée</a>
-</dt>
 <dt class="cap-deputy">modifier, gérer en tant que délégué, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Envoyer ou recevoir des courriels en tant que délégué</a>
 </dt>
-<dt class="cap-webmail">nettoyer les dossiers, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Nettoyer les dossiers de courrier électronique</a>
-</dt>
 <dt class="cap-webmail">nouvelle fenêtre, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.popup.html">Les fenêtres de Courriel</a>
 </dt>
 <dt class="cap-webmail">réglages, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
-<dt class="cap-webmail">répondre, <a class="indexterm" href="ox.appsuite.user.sect.email.send.reply.html">Répondre à des courriels</a>
-</dt>
-<dt class="cap-webmail">sélectionner une adresse d'expéditeur, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">Sélectionner une adresse d'expéditeur</a>
-</dt>
-<dt class="cap-webmail">supprimer, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Suppression de courriels</a>
+<dt class="cap-webmail">supprimer définitivement, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Suppression de courriels</a>
 </dt>
 <dt class="cap-guard">transférer des clés Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Transférer des clés Autocrypt vers d'autres clients</a>
 </dt>
-<dt class="cap-webmail">transmettre, <a class="indexterm" href="ox.appsuite.user.sect.email.send.forward.html">Transmettre des courriels</a>
-</dt>
 <dt class="feat-io-ox-core-templates">utiliser des modèles, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Utiliser les modèles</a>
 </dt>
 <dt class="cap-webmail">utiliser des signatures, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Utiliser des signatures</a>
 </dt>
-<dt class="feat-io-ox-core-openai">utiliser l'intégration de l'IA, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Utiliser l'intégration de l'IA</a>
-</dt>
-<dt class="cap-webmail">utiliser les brouillons, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">Utiliser les brouillons de message</a>
+<dt class="feat-io-ox-core-categories">utiliser les catégories, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Par défaut, utiliser PGP dans le corps pour tout nouveau courriel</a>
 </dt>
 <dt class="feat-io-ox-core-openai">utiliser les fonctions d'IA pour rédiger des courriels, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Utiliser les fonctions d'IA pour rédiger des courriels</a>
 </dt>
-<dt class="feat-io-ox-core-openai">utiliser les fonctions d'IA pour répondre, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">Utiliser les fonctions d'IA pour répondre à des courriels</a>
-</dt>
-<dt class="cap-webmail">vue des dossiers, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vue des dossiers dans Courriel</a>
+<dt class="cap-webmail">Vue des dossiers, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vue des dossiers dans Courriel</a>
 </dt>
 <dt class="cap-webmail">vue détaillée, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de Courriel</a>
 </dt>
@@ -723,7 +744,7 @@
 </dt>
 <dt class="cap-deputy">envoyer des courriels, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Envoyer ou recevoir des courriels en tant que délégué</a>
 </dt>
-<dt class="cap-deputy">gérer, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gérer les délégués</a>
+<dt class="cap-deputy">gérer, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gérer les délégués</a>
 </dt>
 <dt class="cap-deputy">gérer les courriels, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Envoyer ou recevoir des courriels en tant que délégué</a>
 </dt>
@@ -739,7 +760,7 @@
 <dt class="cap-guard">supprimer la clé, voir déchiffrer des fichiers, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.decrypt.html">Déchiffrer des fichiers</a>
 </dt>
 </dl></dd>
-<dt class="">données personnelles de contact, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Modifier les données personnelles de contact</a>
+<dt class="">Données personnelles de contact, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Modifier les données personnelles de contact</a>
 </dt>
 <dt class="cap-infostore">Dossier</dt>
 <dd><dl>
@@ -777,7 +798,7 @@
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">partager, voir partage, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Partager des données</a>
 </dt>
-<dt class="">Renommer, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Renommer des dossiers</a>
+<dt class="">renommer, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Renommer des dossiers</a>
 </dt>
 <dt class="cap-infostore">téléchargement des contenus, <a class="indexterm" href="ox.appsuite.user.sect.drive.download.html">Téléchargement des fichiers ou du contenu du dossier</a>
 </dt>
@@ -786,20 +807,23 @@
 <dt class="">type, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.kind.html">Que sont les types de dossier ?</a>
 </dt>
 </dl></dd>
-<dt class="">droits</dt>
+<dt class="">Droits</dt>
 <dd><dl>
 <dt class="cap-share_links cap-share_mail_attachments">administrateur, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Quels droits peuvent être accordés ?</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">application, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Quels droits peuvent être accordés ?</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">auteur, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Quels droits peuvent être accordés ?</a>
-</dt>
 <dt class="">définition, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">À quoi servent les droits d'accès ?</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">exemples, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">Cas d'utilisations des droits</a>
-</dt>
 <dt class="cap-share_links cap-share_mail_attachments">lecteur, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Quels droits peuvent être accordés ?</a>
 </dt>
+</dl></dd>
+<dt class="cap-share_links cap-share_mail_attachments">droits</dt>
+<dd><dl>
+<dt class="cap-share_links cap-share_mail_attachments">auteur, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Quels droits peuvent être accordés ?</a>
+</dt>
+<dt class="cap-share_links cap-share_mail_attachments">exemples, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">Cas d'utilisations des droits</a>
+</dt>
 <dt class="cap-share_links cap-share_mail_attachments">réviseur, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Quels droits peuvent être accordés ?</a>
 </dt>
 </dl></dd>
@@ -812,7 +836,7 @@
 <dd><dl>
 <dt class="cap-contacts">contacts sous forme de vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envoyer des contacts sous forme de vCard</a>
 </dt>
-<dt class="cap-webmail">courrier électronique, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a>
+<dt class="cap-webmail">courriel, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a>
 </dt>
 </dl></dd>
 <dt class="cap-share_links cap-share_mail_attachments">Exemples de permissions, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">Cas d'utilisations des droits</a>
@@ -1069,7 +1093,7 @@
 </dt>
 <dt class="feat-io-ox-core-resourceCalendars">Groupe d'agendas de ressources</dt>
 <dd><dl>
-<dt class="feat-io-ox-core-resourceCalendars">Ajouter des agendas de ressources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Créer des agendas de ressources et des groupes d'agendas de ressources</a>
+<dt class="feat-io-ox-core-resourceCalendars">ajouter des agendas de ressources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Créer des agendas de ressources et des groupes d'agendas de ressources</a>
 </dt>
 <dt class="feat-io-ox-core-resourceCalendars">créer, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Créer des agendas de ressources et des groupes d'agendas de ressources</a>
 </dt>
@@ -1105,18 +1129,16 @@
 <dt class="">Image personnelle de contact, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Modifier les données personnelles de contact</a>
 </dt>
 <dt class="cap-webmail">importer</dt>
+<dd><dl><dt class="cap-webmail">courriel, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importer des courriels</a>
+</dt></dl></dd>
+<dt class="cap-calendar">Importer</dt>
 <dd><dl>
+<dt class="cap-calendar">agenda , <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importer des agendas depuis des fichiers</a>
+</dt>
 <dt class="cap-contacts">contacts au format CSV, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importer des contacts</a>
 </dt>
 <dt class="cap-contacts">contacts au format vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importer des contacts</a>
 </dt>
-<dt class="cap-webmail">Courriel, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importer des courriels</a>
-</dt>
-</dl></dd>
-<dt class="cap-calendar">Importer</dt>
-<dd><dl>
-<dt class="cap-calendar">Agenda, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importer des agendas depuis des fichiers</a>
-</dt>
 <dt class="cap-calendar">rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importer des rendez-vous</a>
 </dt>
 <dt class="cap-tasks">tâches, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importer des tâches</a>
@@ -1126,7 +1148,7 @@
 <dd><dl>
 <dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.print.html">Imprimer des contacts</a>
 </dt>
-<dt class="cap-webmail">courrier électronique, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Imprimer des courriels</a>
+<dt class="cap-webmail">courriel, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Imprimer des courriels</a>
 </dt>
 <dt class="cap-infostore">documents, fichiers texte, images, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Imprimer des fichiers au format PDF</a>
 </dt>
@@ -1185,7 +1207,7 @@
 <dl>
 <dt class="cap-webmail cap-switchboard">Jitsi</dt>
 <dd><dl>
-<dt class="cap-contacts cap-switchboard">Appeler des contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Appeler des contacts</a>
+<dt class="cap-contacts cap-switchboard">appeler des contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Appeler des contacts</a>
 </dt>
 <dt class="cap-webmail cap-switchboard">appeler l'expéditeur ou un autre destinataire, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Appeler l'expéditeur ou un autre destinataire</a>
 </dt>
@@ -1232,7 +1254,7 @@
 </dl></dd>
 <dt class="cap-webmail">Message d'absence, <a class="indexterm" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Envoi automatique d'un message d'absence</a>
 </dt>
-<dt class="cap-webmail">messagerie unifiée, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utiliser la messagerie unifiée</a>
+<dt class="cap-webmail">Messagerie unifiée, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utiliser la messagerie unifiée</a>
 </dt>
 <dt class="cap-multifactor">Mettre en place les méthodes de vérification, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.settings.html">Mettre en place les méthodes de vérification</a>
 </dt>
@@ -1261,11 +1283,11 @@
 </dt>
 <dt class="">Mot de passe</dt>
 <dd><dl>
-<dt class="cap-guard">Changer le mot de passe Sécurité, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a>
+<dt class="cap-guard">Changer le mot de passe Sécurité, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Changer le mot de passe</a>
 </dt>
 <dt class="">modifier, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.changepassword.html">Changer le mot de passe</a>
 </dt>
-<dt class="cap-guard">Réinitialiser le mot de passe Sécurité, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a>
+<dt class="cap-guard">Réinitialiser le mot de passe Sécurité, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">réinitialiser le mot de passe</a>
 </dt>
 <dt class="">Utiliser des mots de passe d'applications, <a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">Utiliser des mots de passe d'applications</a>
 </dt>
@@ -1283,17 +1305,19 @@
 <dd><dl>
 <dt class="">Ouvrir automatiquement la zone de notification, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
 </dt>
-<dt class="">Utiliser la zone de notification, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Utiliser la zone de notification</a>
-</dt>
-<dt class="">Utiliser le compte à rebours pour les rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser le compte à rebours pour les rendez-vous</a>
+<dt class="">utiliser la zone de notification, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">utiliser la zone de notification</a>
 </dt>
 </dl></dd>
 <dt class="">Notifications</dt>
-<dd><dl><dt class="">afficher les notifications de bureau, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="">afficher les notifications de bureau, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
+</dt>
+<dt class="">utiliser des comptes à rebours pour les rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser des comptes à rebours pour les rendez-vous</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">Nouveau</dt>
 <dd><dl>
-<dt class="cap-calendar">Agenda, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Ajouter des agendas</a>
+<dt class="cap-calendar">agenda , <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Ajouter des agendas</a>
 </dt>
 <dt class="cap-calendar">agendas personnels, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.personal.html">Ajouter des agendas personnels</a>
 </dt>
@@ -1305,13 +1329,13 @@
 </dt>
 <dt class="cap-contacts">contact, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.create.html">Créer un nouveau contact</a>
 </dt>
-<dt class="cap-webmail">courrier électronique, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a>
+<dt class="cap-webmail">courriel, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a>
 </dt>
 <dt class="cap-guard">créer des documents chiffrés, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.createencrypted.html">Création de nouveaux documents chiffrés</a>
 </dt>
 <dt class="cap-guard">créer des fichiers chiffrés, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.upload.html">Transférer des fichiers de manière sécurisée à l'aide du chiffrement</a>
 </dt>
-<dt class="cap-webmail">Dossiers de courrier électronique, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Ajouter des dossiers de courrier électronique</a>
+<dt class="cap-webmail">dossiers de courrier électronique, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Ajouter des dossiers de courrier électronique</a>
 </dt>
 <dt class="cap-infostore">Dossiers Fichiers, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.html">Ajouter des dossiers Fichiers</a>, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.personal.html">Créer des dossiers Fichiers</a>
 </dt>
@@ -1389,7 +1413,7 @@
 <dt class="cap-infostore">PDF, imprimer des fichiers au format, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Imprimer des fichiers au format PDF</a>
 </dt>
 </dl></dd>
-<dt class="cap-calendar cap-switchboard">Planifier une conférence audio/vidéo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Planifier des conférences audio/vidéo</a>
+<dt class="cap-calendar cap-switchboard">Planifier des conférences audio/vidéo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Planifier des conférences audio/vidéo</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">Planifier une conférence, audio/vidéo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Planifier des conférences audio/vidéo</a>
 </dt>
@@ -1425,6 +1449,13 @@
 <div class="indexdiv">
 <h3>R</h3>
 <dl>
+<dt class="cap-webmail">Récupérer</dt>
+<dd><dl>
+<dt class="cap-webmail">courriel, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Récupération de courriels</a>
+</dt>
+<dt class="cap-dumpster">courriels supprimés définitivement, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Récupérer des courriels supprimés définitivement</a>
+</dt>
+</dl></dd>
 <dt class="">Réglages</dt>
 <dd><dl>
 <dt class="cap-calendar">agenda , <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
@@ -1441,13 +1472,20 @@
 </dt>
 <dt class="cap-contacts">contacts, voir réglages du carnet d'adresses, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Réglages du carnet d'adresses</a>
 </dt>
-<dt class="cap-webmail">courrier électronique, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
+<dt class="cap-webmail">courriel, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
 <dt class="cap-switchboard">définir l'état de présence, <a class="indexterm" href="ox.appsuite.user.sect.settings.presencestatus.html">Définir l'état de présence</a>
 </dt>
 <dt class="">données personnelles de contact, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Modifier les données personnelles de contact</a>
 </dt>
-<dt class="cap-deputy">gérer les délégués, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gérer les délégués</a>
+<dt class="cap-infostore">
+        Fichiers
+        
+        
+        
+      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Réglages de Fichiers</a>
+</dt>
+<dt class="cap-deputy">gérer les délégués, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gérer les délégués</a>
 </dt>
 <dt class="">notifications, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
 </dt>
@@ -1455,23 +1493,16 @@
 </dt>
 <dt class="">réglages généraux, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuster les réglages généraux</a>
 </dt>
-<dt class="cap-guard">
-        Sécurité
-        
-        
-        
-      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
-</dt>
 <dt class="cap-dataexport">télécharger les données personnelles, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Télécharger les données personnelles</a>
 </dt>
 </dl></dd>
-<dt class="cap-infostore">réglages</dt>
-<dd><dl><dt class="cap-infostore">
-        Fichiers
+<dt class="cap-guard">réglages</dt>
+<dd><dl><dt class="cap-guard">
+        Sécurité
         
         
         
-      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Réglages de Fichiers</a>
+      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
 </dt></dl></dd>
 <dt class="">Réglages de courriel</dt>
 <dd><dl>
@@ -1494,7 +1525,9 @@
 </dt>
 <dt class="cap-webmail">afficher le texte cité dans une autre couleur, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
-<dt class="cap-webmail">afficher les demandes d'accusé de réception, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
+<dt class="cap-webmail">afficher les catégories, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
+</dt>
+<dt class="cap-webmail">Afficher les demandes d'accusé de réception, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
 <dt class="cap-webmail">ajouter une vcard, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
@@ -1516,15 +1549,13 @@
 </dt>
 <dt class="cap-webmail">disposition, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
-<dt class="cap-webmail">effacer définitivement les messages supprimés, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
-</dt>
 <dt class="cap-webmail">envoyer automatiquement les courriels en CCI à, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
 <dt class="cap-webmail">format de message, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
 <dt class="cap-webmail">liste de messages, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
-<dt class="cap-webmail">marquer comme lu, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
+<dt class="cap-webmail">marquer comme lus, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
 <dt class="cap-webmail">police à chasse fixe, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
@@ -1532,7 +1563,9 @@
 </dt>
 <dt class="cap-webmail">style de texte par défaut, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
-<dt class="cap-webmail">transférer les messages en tant que, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
+<dt class="cap-webmail">Supprimer définitivement les messages effacés, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
+</dt>
+<dt class="cap-webmail">Transférer les messages en tant que, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
 <dt class="cap-webmail">volet de lecture, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
 </dt>
@@ -1543,7 +1576,7 @@
 </dt>
 <dt class="cap-infostore">ajouter des fichiers, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Réglages de Fichiers</a>
 </dt>
-<dt class="cap-infostore">diaporama pour les images, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Réglages de Fichiers</a>
+<dt class="cap-infostore">Diaporama pour les images, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Réglages de Fichiers</a>
 </dt>
 <dt class="cap-infostore">historique des versions, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Réglages de Fichiers</a>
 </dt>
@@ -1554,7 +1587,7 @@
 </dt>
 <dt class="cap-calendar">afficher les rappels pour les rendez-vous passés, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt>
-<dt class="cap-calendar">Afficher les rendez-vous déclinés, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
+<dt class="cap-calendar">afficher les rendez-vous déclinés, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt>
 <dt class="cap-calendar">appliquer automatiquement à votre agenda les modifications de rendez-vous reçues par courriel, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt>
@@ -1570,11 +1603,9 @@
 </dt>
 <dt class="cap-calendar">marquer automatiquement les rendez-vous sur la journée comme « Disponibles » , <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt>
-<dt class="cap-calendar">Rappels de rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
-</dt>
-<dt class="">recevoir des notifications en tant que créateur du rendez-vous lorsque des participants acceptent ou déclinent, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
+<dt class="cap-calendar">rappels de rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt>
-<dt class="">recevoir des notifications en tant que participant au rendez-vous lorsque des participants acceptent ou déclinent, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
+<dt class="">Recevoir des notifications en tant que créateur du rendez-vous lorsque des participants acceptent ou déclinent, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
 </dt>
 <dt class="">recevoir des notifications lorsqu'un rendez-vous auquel vous participez est créé, modifié ou supprimé, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
 </dt>
@@ -1586,26 +1617,33 @@
 </dt>
 <dt class="cap-calendar">s'abonner à des agendas partagés, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt>
-<dt class="cap-calendar">Semaine ouvrée, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
+<dt class="cap-calendar">semaine ouvrée, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt>
-<dt class="">supprimer automatiquement le courriel d'invitation une fois que le rendez-vous a été accepté ou décliné, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
+<dt class="">Supprimer automatiquement le courriel d'invitation une fois que le rendez-vous a été accepté ou décliné, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
 </dt>
 <dt class="cap-calendar">utiliser la première couleur de catégorie pour les rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt>
 <dt class="cap-calendar">visibilité sur l'état disponible/occupé, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt>
 </dl></dd>
+<dt class="cap-guard">Réglages de Sécurité</dt>
+<dd><dl><dt class="cap-guard">options de rédaction, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
+</dt></dl></dd>
 <dt class="cap-guard">Réglages de sécurité Sécurité</dt>
 <dd><dl>
 <dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
 </dt>
+<dt class="cap-guard">afficher les réglages avancés pour la rédaction d'un courriel, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
+</dt>
 <dt class="cap-guard">chiffrer par défaut à la rédaction d'un nouveau message, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
 </dt>
 <dt class="cap-guard">Mémorisation par défaut du mot de passe, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
 </dt>
-<dt class="cap-guard">réglages avancés, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
+<dt class="cap-guard">options de réinitialisation, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
+</dt>
+<dt class="cap-guard">réglage Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
 </dt>
-<dt class="cap-guard">S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
+<dt class="cap-guard">réglage du cache de courrier, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
 </dt>
 <dt class="cap-guard">Signer par défaut les courriels sortants, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
 </dt>
@@ -1627,7 +1665,7 @@
 </dt>
 <dt class="cap-contacts">lier les adresses postales à un service de cartographie, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Réglages du carnet d'adresses</a>
 </dt>
-<dt class="cap-contacts">noms, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Réglages du carnet d'adresses</a>
+<dt class="cap-contacts">Noms, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Réglages du carnet d'adresses</a>
 </dt>
 </dl></dd>
 <dt class="cap-portal">Réglages du portail</dt>
@@ -1672,15 +1710,15 @@
 </dt>
 </dl></dd>
 <dt class="cap-calendar">Réglages Jitsi</dt>
-<dd><dl><dt class="cap-calendar">Copier automatiquement le lien vers le lieu, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
+<dd><dl><dt class="cap-calendar">copier automatiquement le lien vers le lieu, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt></dl></dd>
 <dt class="">Réglages personnalisés, <a class="indexterm" href="ox.appsuite.user.chap.settings.html">Réglages personnalisés</a>
 </dt>
 <dt class="cap-calendar">Réglages Zoom</dt>
 <dd><dl>
-<dt class="cap-calendar">Copier automatiquement le lien vers le lieu, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
+<dt class="cap-calendar">copier automatiquement le lien vers le lieu, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt>
-<dt class="cap-calendar">Copier les informations d'appel vers la description, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
+<dt class="cap-calendar">copier les informations d'appel vers la description, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt>
 <dt class="cap-calendar">toujours ajouter un mot de passe de réunion aléatoire, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Réglages de l'agenda</a>
 </dt>
@@ -1697,11 +1735,11 @@
 </dt>
 <dt class="cap-calendar">ajouter des participants ou des ressources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.participants.html">Ajouter des participants ou des ressources</a>
 </dt>
-<dt class="cap-calendar">Ajouter des pièces jointes, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Ajouter des pièces jointes</a>
+<dt class="cap-calendar">ajouter des pièces jointes, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Ajouter des pièces jointes</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">appeler les participants d'un rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Appeler les participants d'un rendez-vous</a>
 </dt>
-<dt class="cap-calendar">changer l'état d'un rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changer l'état d'un rendez-vous</a>
+<dt class="cap-calendar">changer l'état d'un rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Modification de l'état d'un rendez-vous</a>
 </dt>
 <dt class="cap-calendar">chercher, <a class="indexterm" href="ox.appsuite.user.sect.calendar.search.html">Rechercher des rendez-vous</a>
 </dt>
@@ -1733,13 +1771,13 @@
 </dt>
 <dt class="cap-calendar">gérer les fuseaux horaires favoris, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Gérer les fuseaux horaires favoris</a>
 </dt>
-<dt class="cap-calendar">Importer, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importer des rendez-vous</a>
+<dt class="cap-calendar">importer, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importer des rendez-vous</a>
 </dt>
 <dt class="cap-calendar">imprimer, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.print.html">Imprimer des rendez-vous</a>
 </dt>
 <dt class="cap-calendar">inviter depuis le carnet d'adresses, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">invitation de contacts à un rendez-vous</a>
 </dt>
-<dt class="cap-calendar">Inviter des participants à un nouveau rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviter des participants à un nouveau rendez-vous</a>
+<dt class="cap-calendar">inviter des participants à un nouveau rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviter des participants à un nouveau rendez-vous</a>
 </dt>
 <dt class="cap-calendar">inviter les destinataires d'un courriel à un nouveau rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviter les destinataires d'un courriel à un nouveau rendez-vous</a>
 </dt>
@@ -1759,7 +1797,7 @@
 </dt>
 <dt class="cap-calendar">reprogrammer à une autre date, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Modifier un rendez-vous</a>
 </dt>
-<dt class="cap-calendar">résoudre les conflits, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">résoudre les conflits</a>
+<dt class="cap-calendar">résoudre les conflits, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Résoudre les conflits</a>
 </dt>
 <dt class="cap-calendar">supprimer, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.delete.html">Supprimer des rendez-vous</a>
 </dt>
@@ -1767,7 +1805,9 @@
 </dt>
 <dt class="cap-calendar">utiliser la vue de planification, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utiliser la vue de planification</a>
 </dt>
-<dt class="">utiliser le compte à rebours, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser le compte à rebours pour les rendez-vous</a>
+<dt class="">utiliser le compte à rebours, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser des comptes à rebours pour les rendez-vous</a>
+</dt>
+<dt class="feat-io-ox-core-categories">utiliser les catégories, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utiliser des catégories pour les rendez-vous</a>
 </dt>
 <dt class="cap-calendar">utiliser les couleurs de l'agenda, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Utiliser les couleurs de l'agenda</a>
 </dt>
@@ -1816,7 +1856,7 @@
 </dt>
 <dt class="cap-edit_resource">utiliser, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resources.html">Utiliser des ressources</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Utiliser les agendas de ressources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Utiliser les agendas de ressources</a>
+<dt class="feat-io-ox-core-resourceCalendars">utiliser les agendas de ressources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Utiliser les agendas de ressources</a>
 </dt>
 <dt class="feat-io-ox-core-managedResources">utiliser, ressources gérées, <a class="indexterm" href="ox.appsuite.user.sect.calendar.managedresources.html">Utiliser les ressources gérées</a>
 </dt>
@@ -1843,7 +1883,7 @@
 </dt>
 <dt class="cap-contacts">carnet d'adresses, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">S'abonner à des carnets d'adresses externes</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">Dossiers de courrier électronique, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">S'abonner à des dossiers de courrier partagés ou personnels</a>
+<dt class="cap-share_links cap-share_mail_attachments">dossiers de courrier électronique, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">S'abonner à des dossiers de courrier partagés ou personnels</a>
 </dt>
 <dt class="cap-calendar_google">Google Calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">S'abonner à des agendas Google Calendar</a>
 </dt>
@@ -1881,9 +1921,9 @@
 </dt>
 <dt class="cap-multifactor">authentification multifacteur, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.html">Authentification multifacteur</a>
 </dt>
-<dt class="cap-guard">changer le mot de passe, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a>
+<dt class="cap-guard">changer le mot de passe, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Changer le mot de passe</a>
 </dt>
-<dt class="cap-guard">Chiffrement d'un document Office, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Chiffrer des documents Office</a>
+<dt class="cap-guard">Chiffrement d'un document Office, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Chiffrement des documents Office</a>
 </dt>
 <dt class="cap-guard">chiffrement de fichiers, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.html">Chiffre ou déchiffrer des fichiers</a>, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.encrypt.html">Chiffrer des fichiers</a>
 </dt>
@@ -1897,7 +1937,7 @@
 </dt>
 <dt class="cap-guard">chiffrer les courriels entrants, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Chiffrer des courriels entrants à l'aide d'une règle de filtrage</a>
 </dt>
-<dt class="cap-guard">chiffrer les documents Office , <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Chiffrer des documents Office</a>
+<dt class="cap-guard">chiffrer les documents Office , <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Chiffrement des documents Office</a>
 </dt>
 <dt class="cap-guard">chiffrer ou déchiffrer des fichiers, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.html">Chiffre ou déchiffrer des fichiers</a>
 </dt>
@@ -1913,13 +1953,15 @@
 </dt>
 <dt class="cap-guard">envoyer des courriels chiffrés, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Envoyer des courriels chiffrés</a>
 </dt>
-<dt class="cap-guard">gérer les clés publiques, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gérer les clés publiques</a>
+<dt class="cap-guard">gérer les clés PGP des destinataires, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gérer les clés PGP des destinataires</a>
+</dt>
+<dt class="cap-guard">gérer les clés S/MIME des destinataires, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Gérer les clés S/MIME des destinataires</a>
 </dt>
 <dt class="cap-guard">gérer vos clés PGP personnelles, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gérer vos clés PGP personnelles</a>
 </dt>
 <dt class="cap-smime">gérer vos clés S/MIME personnelles, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gérer vos clés S/MIME personnelles</a>
 </dt>
-<dt class="cap-guard">gestion des clés, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a>
+<dt class="cap-guard">Gestion des clés, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a>
 </dt>
 <dt class="cap-guard">gestion des mots de passe, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a>
 </dt>
@@ -1937,7 +1979,7 @@
 </dt>
 <dt class="cap-guard">Réglages de Sécurité, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Réglages de Sécurité</a>
 </dt>
-<dt class="cap-guard">réinitialiser le mot de passe, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a>
+<dt class="cap-guard">réinitialiser le mot de passe, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">réinitialiser le mot de passe</a>
 </dt>
 <dt class="cap-guard">se déconnecter, <a class="indexterm" href="ox.appsuite.user.sect.guard.logout.html">Se déconnecter de Sécurité</a>
 </dt>
@@ -1945,6 +1987,8 @@
 </dt>
 <dt class="cap-guard">supprimer des clés Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gérer les clés Autocrypt</a>
 </dt>
+<dt class="cap-guard">supprimer la fonction de réinitialisation du mot de passe, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Supprimer la fonction de réinitialisation du mot de passe</a>
+</dt>
 <dt class="cap-guard">télécharger des fichiers chiffrés, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.download.html">Télécharger des fichiers chiffrés</a>
 </dt>
 <dt class="cap-guard">Transférer des clés Autocrypt vers d'autres clients, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Transférer des clés Autocrypt vers d'autres clients</a>
@@ -1959,7 +2003,7 @@
 </dt></dl></dd>
 <dt class="">Structure des dossiers</dt>
 <dd><dl>
-<dt class="">Favoris, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Ajout des dossiers aux favoris</a>
+<dt class="">favoris, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Ajout des dossiers aux favoris</a>
 </dt>
 <dt class="">masquer des dossiers, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.hide.html">Masquer des dossiers</a>
 </dt>
@@ -1972,7 +2016,7 @@
 </dt>
 <dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.delete.html">Suppression de contacts</a>
 </dt>
-<dt class="cap-webmail">Courriel, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Suppression de courriels</a>
+<dt class="cap-webmail">courriel, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Suppression de courriels</a>, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Suppression de courriels</a>
 </dt>
 <dt class="">dossier, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.delete.html">Supprimer des dossiers</a>
 </dt>
@@ -2059,7 +2103,9 @@
 </dt>
 <dt class="cap-tasks">supprimer, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.delete.html">Suppression de tâches</a>
 </dt>
-<dt class="cap-tasks">vue des dossiers, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vue des dossiers dans Tâches</a>
+<dt class="feat-io-ox-core-categories">utiliser les catégories, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utiliser des catégories pour les tâches</a>
+</dt>
+<dt class="cap-tasks">Vue des dossiers, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vue des dossiers dans Tâches</a>
 </dt>
 <dt class="cap-tasks">vue détaillée, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.detailview.html">La vue détaillée de Tâches</a>
 </dt>
@@ -2072,7 +2118,7 @@
 </dt>
 <dt class="cap-calendar cap-switchboard">Téléphone</dt>
 <dd><dl>
-<dt class="cap-contacts cap-switchboard">Appeler des contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Appeler des contacts</a>
+<dt class="cap-contacts cap-switchboard">appeler des contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Appeler des contacts</a>
 </dt>
 <dt class="cap-tasks cap-switchboard">appeler les participants à la tâche, <a class="indexterm" href="ox.appsuite.user.sect.tasks.call.html">Appeler les participants à la tâche</a>
 </dt>
@@ -2091,15 +2137,15 @@
 <dl>
 <dt class="">Utilisation sur les appareils mobiles, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.mobile.html">Remarques concernant l'utilisation sur les appareils mobiles</a>
 </dt>
+<dt class="">Utiliser des comptes à rebours pour les rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser des comptes à rebours pour les rendez-vous</a>
+</dt>
 <dt class="feat-io-ox-core-templates">Utiliser des modèles, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Utiliser les modèles</a>
 </dt>
 <dt class="cap-webmail">Utiliser des signatures, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Utiliser des signatures</a>
 </dt>
 <dt class="cap-calendar">Utiliser la vue de planification, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utiliser la vue de planification</a>
 </dt>
-<dt class="">Utiliser la zone de notification, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Utiliser la zone de notification</a>
-</dt>
-<dt class="">Utiliser le compte à rebours pour les rendez-vous, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser le compte à rebours pour les rendez-vous</a>
+<dt class="">utiliser la zone de notification, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">utiliser la zone de notification</a>
 </dt>
 <dt class="feat-io-ox-core-navigation">Utiliser les boutons du navigateur, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.browserbuttons.html">Utiliser les boutons du navigateur</a>
 </dt>
@@ -2121,10 +2167,11 @@
 </dl></dd>
 <dt class="">vue des dossiers, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.foldertree.html">La vue des dossiers</a>
 </dt>
+<dt class="">Vue des dossiers</dt>
 <dd><dl>
 <dt class="">changer la largeur, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Naviguer dans la structure des dossiers</a>
 </dt>
-<dt class="">Favoris, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Ajout des dossiers aux favoris</a>
+<dt class="">favoris, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Ajout des dossiers aux favoris</a>
 </dt>
 <dt class="">masquer des dossiers, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.hide.html">Masquer des dossiers</a>
 </dt>
@@ -2133,7 +2180,7 @@
 </dl></dd>
 <dt class="">vue détaillée, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.detailview.html">La vue détaillée</a>
 </dt>
-<dt class="cap-webmail cap-calendar cap-tasks">vue en halo, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Afficher des contacts dans la vue en halo</a>
+<dt class="cap-webmail cap-calendar cap-tasks">Vue en halo, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Afficher des contacts dans la vue en halo</a>
 </dt>
 <dt class="">vue en halo, voir fenêtre qui apparaît, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.popup.html">Les fenêtres</a>
 </dt>
@@ -2178,7 +2225,7 @@
 </dt>
 <dt class="cap-webmail cap-switchboard">Zoom</dt>
 <dd><dl>
-<dt class="cap-contacts cap-switchboard">Appeler des contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Appeler des contacts</a>
+<dt class="cap-contacts cap-switchboard">appeler des contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Appeler des contacts</a>
 </dt>
 <dt class="cap-webmail cap-switchboard">appeler l'expéditeur ou un autre destinataire, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Appeler l'expéditeur ou un autre destinataire</a>
 </dt>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.about.glossary.html b/help/l10n/fr_FR/ox.appsuite.user.sect.about.glossary.html
index 1119343a5..299c6af92 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.about.glossary.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.about.glossary.html
@@ -44,10 +44,17 @@
 </dd>
 <dt class="feat-io-ox-core-categories" id="ox.appsuite.user.reference.about.glossary.categories"><span class="glossterm">Catégories</span></dt>
 <dd class="glossdef feat-io-ox-core-categories">
-<p role="presentation">Les catégories peuvent servir à classer les rendez-vous, les contacts et les tâches. Cette solution permet d'identifier et de trouver facilement les objets qui sont sémantiquement liés. Suivant la configuration, certaines catégories peuvent être prédéfinies. Vous pouvez aussi définir vos propres catégories.</p>
-<p role="presentation">Remarque : ces catégories ne peuvent pas être utilisées pour les courriels. Pour les courriels, vous disposez des onglets de la boîte de réception.</p>
+<p role="presentation">Les catégories vous permettent d'organiser vos courriels, rendez-vous, contacts et tâches dans différentes applications, indépendamment de la structure des dossiers. Cette solution permet d'identifier et de trouver facilement les objets qui sont logiquement liés, par exemple tous les courriels, rendez-vous, contacts et tâches associés à un projet ou à un client donné. Suivant la configuration, certaines catégories sont prédéfinies. Vous pouvez définir vos propres catégories.</p>
+<p role="presentation">Remarque : pour les courriels, vous pouvez également utiliser les onglets de la boîte de réception.</p>
 <p role="presentation">Voir aussi : <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a></p></li></ul></p>
 </dd>
+<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Catégories de la boîte de réception</span></dt>
+<dd class="glossdef cap-webmail">
+<p role="presentation">Les onglets de la boîte de réception constituent un moyen simple et efficace de garder la <span class="guilabel"><strong>Boîte de réception</strong></span> organisée. Avec ces onglets, les courriels entrants sont enregistrés séparément suivant l'expéditeur dans le dossier <span class="guilabel"><strong>Boîte de réception</strong></span>. Selon la configuration du collecticiel, certains onglets de la boîte de réception sont prédéfinis. Vous pouvez définir des onglets supplémentaires suivant vos besoins.</p>
+<p role="presentation">Les onglets de la boîte de réception ne peuvent être utilisés que dans le dossier <span class="guilabel"><strong>Boîte de réception</strong></span>. Si vous avez besoin d'options de stockage supplémentaires, utilisez la vue des dossiers pour créer des dossiers de courriel.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Remarque : les catégories de la boîte de réception décrites ici ne peuvent être utilisées que pour les courriels. Suivant la configuration, vous pouvez utiliser un système distinct de catégories pour les rendez-vous, les contacts et les tâches.</p>
+<p role="presentation">Voir aussi : <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Travailler avec les catégories de la boîte de réception</a></p></li></ul></p>
+</dd>
 <dt id="ox.appsuite.user.reference.about.glossary.groupware"><span class="glossterm">collecticiel</span></dt>
 <dd class="glossdef">
 <p role="presentation">Le logiciel décrit dans cette documentation. Il inclut les fonctions de gestion des informations personnelles : courriel, contacts, agenda. Cela inclut des fonctions de collaboration au sein d'un groupe, comme le partage de carnets d'adresses et d'agendas. Suivant la configuration, d'autres fonctions peuvent être disponibles pour la gestion des tâches, le stockage de fichiers publics ou privés, et le traitement de documents.</p>
@@ -90,7 +97,7 @@
 <li class="listitem"><p role="presentation">planifier, modifier ou organiser les rendez-vous d'un autre utilisateur</p></li>
 </ul></p>
 <p role="presentation">Voir aussi : <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gérer les délégués</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gérer les délégués</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Envoyer ou recevoir des courriels en tant que délégué</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Créer, modifier ou gérer des rendez-vous en tant que délégué</a></p>
 </li></ul></p>
@@ -151,13 +158,6 @@
 </dd>
 <dt id="ox.appsuite.user.reference.about.glossary.object"><span class="glossterm">Objets</span></dt>
 <dd class="glossdef"><p role="presentation">Les objets sont des données du collecticiel créées et organisées par l'utilisateur. Les courriels, les contacts, les rendez-vous, les tâches, les documents, les fichiers, les dossiers, les carnets d'adresses et les agendas constituent des exemples de ces objets.</p></dd>
-<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Onglets de la boîte de réception</span></dt>
-<dd class="glossdef cap-webmail">
-<p role="presentation">Les onglets de la boîte de réception constituent un moyen simple et efficace de garder la <span class="guilabel"><strong>Boîte de réception</strong></span> organisée. Avec ces onglets, les courriels entrants sont enregistrés séparément suivant l'expéditeur dans le dossier <span class="guilabel"><strong>Boîte de réception</strong></span>. Selon la configuration du collecticiel, certains onglets de la boîte de réception sont prédéfinis. Vous pouvez définir des onglets supplémentaires suivant vos besoins.</p>
-<p role="presentation">Les onglets de la boîte de réception ne peuvent être utilisés que dans le dossier <span class="guilabel"><strong>Boîte de réception</strong></span>. Si vous avez besoin d'options de stockage supplémentaires, utilisez la vue des dossiers pour créer des dossiers de courriel.</p>
-<p role="presentation" class="feat-io-ox-core-categories">Remarque : les onglets de la boîte de réception décrits ici ne peuvent être utilisés que pour les courriels. Suivant la configuration, vous pouvez utiliser un système distinct de catégories pour les rendez-vous, les contacts et les tâches.</p>
-<p role="presentation">Voir aussi : <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Travailler avec les catégories de la boîte de réception</a></p></li></ul></p>
-</dd>
 <dt id="ox.appsuite.user.reference.about.glossary.participant"><span class="glossterm">Participant</span></dt>
 <dd class="glossdef"><p role="presentation">Un utilisateur invité à un rendez-vous ou à une tâche. Les participants sont également appelés « Participants internes », pour les différencier d'un participant externe ayant été ajouté en tant qu'invité.</p></dd>
 <dt id="ox.appsuite.user.reference.about.glossary.externalparticipant"><span class="glossterm">Participant externe</span></dt>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.alarms.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.alarms.html
index 9b1b8ea06..4f4932708 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.alarms.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.alarms.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.display.html" title="Définir l'affichage d'un rendez-vous">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Ajouter des participants ou des ressources">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.alarms">
 <div class="titlepage"><div><div><h3 class="title">Utiliser les rappels de rendez-vous</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.12.2"></a><p id="ox.appsuite.user.concept.calendar.add.alarms">Lorsque vous créez ou modifiez un rendez-vous, vous pouvez demander à recevoir un rappel de la date d'échéance du rendez-vous. Pour cela vous pouvez faire appel à l'une ou plusieurs des notifications suivantes : </p>
@@ -64,7 +64,7 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modifier les rappels de rendez-vous</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.alarms">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.alarms">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.attachments.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.attachments.html
index ff26a87bb..07b153475 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.attachments.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.attachments.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Ajouter des participants ou des ressources">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Utiliser la vue de planification">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attachments">
 <div class="titlepage"><div><div><h3 class="title">Ajouter des pièces jointes</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.14.2"></a><a class="indexterm" name="id-1.8.10.14.3"></a><p id="ox.appsuite.user.concept.calendar.add.attachments">Suivant la configuration, vous pouvez joindre des fichiers enregistrés sur votre ordinateur ou dans l'application <span class="phrase">Fichiers</span>.</p>
@@ -65,7 +65,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.attachments">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attachments">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.attendees.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.attendees.html
index 3fa39f1f5..4ffbb61ff 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.attendees.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Créer un rendez-vous de suivi">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="Inviter les destinataires d'un courriel à un nouveau rendez-vous">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attendees">
 <div class="titlepage"><div><div><h3 class="title">Inviter des participants à un nouveau rendez-vous</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.17.2"></a><p id="ox.appsuite.user.concept.calendar.add.attendees">Si un rendez-vous comporte plusieurs participants, vous pouvez les inviter à un nouveau rendez-vous.</p>
@@ -67,10 +67,10 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utiliser la vue de planification</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">résoudre les conflits</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Résoudre les conflits</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.attendees">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attendees">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.call.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.call.html
index 9c704cdcb..3a2e06c7d 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.call.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.call.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Outil de sélection de date">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Définir des rendez-vous récurrents">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.call">
 <div class="titlepage"><div><div><h3 class="title">Planifier des conférences audio/vidéo</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.9.2"></a><a class="indexterm" name="id-1.8.10.9.3"></a><a class="indexterm" name="id-1.8.10.9.4"></a><a class="indexterm" name="id-1.8.10.9.5"></a><a class="indexterm" name="id-1.8.10.9.6"></a><p id="ox.appsuite.user.precondition.calendar.add.call">Prérequis : vous avez configuré un compte auprès d'un fournisseur de conférences audio ou vidéo.</p>
@@ -71,7 +71,7 @@
 <p role="presentation" class="feat-jitsi"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.jitsi">Réunions Jitsi</a></p>
 <p role="presentation" class="feat-zoom"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.zoom">Réunions Zoom</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.call">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.call">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.conflicthandling.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.conflicthandling.html
index 9ff5ddeb1..e796b80b8 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.conflicthandling.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.conflicthandling.html
@@ -1,11 +1,11 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>résoudre les conflits</title>
+<title>Résoudre les conflits</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Créer des rendez-vous à partir de pièces jointes au format iCal">
 <link rel="next" href="ox.appsuite.user.sect.calendar.invitation.html" title="Répondre des invitations à des rendez-vous">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.conflicthandling">
-<div class="titlepage"><div><div><h3 class="title">résoudre les conflits</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Résoudre les conflits</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.20.2"></a><p id="ox.appsuite.user.concept.calendar.add.conflicthandling">Un conflit de rendez-vous survient dans les conditions suivantes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
@@ -84,7 +84,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.create.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.create.html
index 069f71eae..175ff8ec2 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.create.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.create.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Outil de sélection de date">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.create">
 <div class="titlepage"><div><div><h3 class="title">Créer de nouveaux rendez-vous</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.7.2"></a><a class="indexterm" name="id-1.8.10.7.3"></a><div class="task" id="ox.appsuite.user.task.calendar.add.create">
@@ -110,13 +110,13 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviter des participants à un nouveau rendez-vous</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviter les destinataires d'un courriel à un nouveau rendez-vous</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Créer des rendez-vous à partir de pièces jointes au format iCal</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">résoudre les conflits</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Résoudre les conflits</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">invitation de contacts à un rendez-vous</a></p>
 <p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modifier un rendez-vous</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.create">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.create">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.datepicker.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.datepicker.html
index 5e1f4aa19..e03a4abae 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.datepicker.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.datepicker.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.create.html" title="Créer de nouveaux rendez-vous">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.call.html" title="Planifier des conférences audio/vidéo">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.datepicker">
 <div class="titlepage"><div><div><h3 class="title">Outil de sélection de date</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.8.2"></a><p id="ox.appsuite.user.concept.calendar.add.datepicker">L'outil de sélection de date vous permet de choisir la date à saisir dans le champ de date.</p>
@@ -87,7 +87,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Modifier des tâches</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.datepicker">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.datepicker">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.display.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.display.html
index fda23ed75..53321bc98 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.display.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.display.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Définir des rendez-vous récurrents">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Utiliser les rappels de rendez-vous">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.display">
 <div class="titlepage"><div><div><h3 class="title">Définir l'affichage d'un rendez-vous</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.11.2"></a><p id="ox.appsuite.user.concept.calendar.add.display">Vous disposez des options suivantes : </p>
@@ -75,7 +75,7 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Comment les rendez-vous sont-ils affichés dans la vue d'agenda ? </a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.display">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.display">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.followup.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.followup.html
index cbdfc0dcf..86eba50c6 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.followup.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.followup.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Utiliser la vue de planification">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Inviter des participants à un nouveau rendez-vous">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.followup">
 <div class="titlepage"><div><div><h3 class="title">Créer un rendez-vous de suivi</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.16.2"></a><a class="indexterm" name="id-1.8.10.16.3"></a><p id="ox.appsuite.user.concept.calendar.add.followup">Vous pouvez créer un rendez-vous de suivi pour un rendez-vous existant. Le rendez-vous de suivi est pré-rempli avec les informations principales provenant du rendez-vous existant.</p>
@@ -64,10 +64,10 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Créer de nouveaux rendez-vous</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utiliser la vue de planification</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">résoudre les conflits</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Résoudre les conflits</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.followup">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.followup">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.html
index 31bf792aa..77a829fae 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.html
@@ -1,7 +1,7 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>créer des rendez-vous</title>
+<title>Créer des rendez-vous</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
@@ -36,7 +36,7 @@
     
   </h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.add">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">créer des rendez-vous</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Créer des rendez-vous</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.calendar.add">Découvrez comment créer un rendez-vous, ainsi que les fonctions disponibles pour définir les détails de vos rendez-vous : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Créer de nouveaux rendez-vous</a></p></li>
@@ -52,7 +52,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviter des participants à un nouveau rendez-vous</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviter les destinataires d'un courriel à un nouveau rendez-vous</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Créer des rendez-vous à partir de pièces jointes au format iCal</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">résoudre les conflits</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Résoudre les conflits</a></p></li>
 </ul>
 <p id="ox.appsuite.user.hint.calendar.add">Notes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.icalattachment.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.icalattachment.html
index 99059927d..10de474e8 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.icalattachment.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.icalattachment.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="Inviter les destinataires d'un courriel à un nouveau rendez-vous">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="résoudre les conflits">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Résoudre les conflits">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.icalattachment">
 <div class="titlepage"><div><div><h3 class="title">Créer des rendez-vous à partir de pièces jointes au format iCal</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.19.2"></a><a class="indexterm" name="id-1.8.10.19.3"></a><p id="ox.appsuite.user.concept.calendar.add.icalattachment">Vous pouvez créer un rendez-vous à partir d'un fichier iCal joint à un courriel.Un fichier iCal se reconnaît à son extension « .ics ».</p>
@@ -54,12 +54,12 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Créer de nouveaux rendez-vous</a>
             </p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">résoudre les conflits</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Résoudre les conflits</a>
             </p></li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.participants.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.participants.html
index b9120da22..64c7bb08f 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.participants.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.participants.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Utiliser les rappels de rendez-vous">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Ajouter des pièces jointes">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.participants">
 <div class="titlepage"><div><div><h3 class="title">Ajouter des participants ou des ressources</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.13.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.participants">
@@ -67,6 +67,7 @@
 <li class="listitem"><p role="presentation">Si les participants externes acceptent le rendez-vous, vous recevrez un courriel.</p></li>
 </ul>
           <p role="presentation" class="feat-io-ox-core-managedResources">Remarque : lorsque vous ajoutez une ressource gérée, le délégué qui en est responsable reçoit une demande de réservation pour cette ressource. Vous serez informé dès que ce délégué accepte ou décline votre demande de réservation.</p>
+          
         </div>
 </div>
 <p id="ox.appsuite.user.tip.calendar.add.participants">Conseil : pour trouver des plages horaires libres pour tous les participants et toutes les ressources, vous pouvez <a class="link" href="ox.appsuite.user.sect.calendar.add.scheduling.html">utiliser la vue de planification</a>.</p>
@@ -82,7 +83,7 @@
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Ajouter automatiquement des contacts ou des ressources depuis un carnet d'adresses</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Ajouter automatiquement des contacts ou des ressources depuis le répertoire des adresses</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.participants">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.participants">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.recipients.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.recipients.html
index 0b9ea2794..9cad9267e 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.recipients.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.recipients.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Inviter des participants à un nouveau rendez-vous">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Créer des rendez-vous à partir de pièces jointes au format iCal">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.recipients">
 <div class="titlepage"><div><div><h3 class="title">Inviter les destinataires d'un courriel à un nouveau rendez-vous</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.18.2"></a><p id="ox.appsuite.user.concept.calendar.add.recipients">Vous pouvez inviter à un nouveau rendez-vous les destinataires d'un courriel que vous avez envoyé ou reçu.</p>
@@ -67,13 +67,13 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utiliser la vue de planification</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">résoudre les conflits</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Résoudre les conflits</a>
             </p>
 </li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.recipients">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.recipients">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.scheduling.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.scheduling.html
index f4b9160fa..42bc7f198 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.scheduling.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.scheduling.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Ajouter des pièces jointes">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Créer un rendez-vous de suivi">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.scheduling">
 <div class="titlepage"><div><div><h3 class="title">Utiliser la vue de planification</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.15.2"></a><a class="indexterm" name="id-1.8.10.15.3"></a><a class="indexterm" name="id-1.8.10.15.4"></a><a class="indexterm" name="id-1.8.10.15.5"></a><p id="ox.appsuite.user.concept.calendar.add.scheduling">Lorsque vous planifiez un rendez-vous avec plusieurs participants ou ressources, la vue de planification affiche les horaires libres et occupés pour tous les utilisateurs et ressources.</p>
@@ -92,11 +92,11 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Créer de nouveaux rendez-vous</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviter des participants à un nouveau rendez-vous</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">résoudre les conflits</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Résoudre les conflits</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy">Afficher les informations d'état disponible/occupé aux autres utilisateurs</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.scheduling">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.scheduling">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.serial.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.serial.html
index cb0c0509a..5fdd4ed14 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.serial.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.add.serial.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.call.html" title="Planifier des conférences audio/vidéo">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.display.html" title="Définir l'affichage d'un rendez-vous">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">créer des rendez-vous</h2>
+<h2 class="sr-only">Créer des rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.serial">
 <div class="titlepage"><div><div><h3 class="title">Définir des rendez-vous récurrents</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.10.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.serial">
@@ -108,7 +108,7 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.serial.html">Créer des tâches récurrentes</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.serial">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.serial">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.attachments.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.attachments.html
index cf09a8946..a19408bd8 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.attachments.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Agenda">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.view.appointments.html" title="Comment les rendez-vous sont-ils affichés dans la vue d'agenda ?">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="créer des rendez-vous">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="Créer des rendez-vous">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.deputy.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.deputy.html
index f5330a72f..439270596 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.deputy.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.deputy.html
@@ -63,12 +63,12 @@
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gérer les rendez-vous</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Envoyer ou recevoir des courriels en tant que délégué</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gérer les délégués</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gérer les délégués</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.deputy">Sujet parent : <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.create.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.create.html
index fc813db65..df227d8c2 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.create.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.create.html
@@ -111,7 +111,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vue détaillée de <span class="phrase">Agenda</span></a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Créer de nouveaux rendez-vous</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
 <p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Créer, modifier ou gérer des rendez-vous en tant que délégué</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modifier un rendez-vous</a></p>
 </li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.detailview.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.detailview.html
index 09d449af8..d39c55ed5 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.detailview.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.detailview.html
@@ -67,7 +67,7 @@
 <li class="listitem">
 <p role="presentation">autres données concernant le rendez-vous, le cas échéant : </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">pièces jointes</p></li>
+<li class="listitem"><p role="presentation">Pièces jointes</p></li>
 <li class="listitem"><p role="presentation">définition</p></li>
 <li class="listitem">
 <p role="presentation">organisateur, destinataires supplémentaires, ressources</p>
@@ -105,10 +105,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Afficher des contacts dans la vue en halo</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Appeler les participants d'un rendez-vous</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changer l'état d'un rendez-vous</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modifier les rappels de rendez-vous</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gérer les rendez-vous</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.detailview">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Les composants de <span class="phrase">Agenda</span></a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.foldertree.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.foldertree.html
index 8931d4c43..7727c8f2a 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.foldertree.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.foldertree.html
@@ -65,7 +65,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Afficher les rendez-vous</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">Ajouter des agendas personnels</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Utiliser les couleurs de l'agenda</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gérer les rendez-vous</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Créer des agendas de ressources et des groupes d'agendas de ressources</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.edit.html">Modifier les agendas de ressources</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Créer des rendez-vous en passant par l'agenda de ressource</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.list.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.list.html
index b9c8a8bf7..e6cbdba57 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.list.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.list.html
@@ -57,11 +57,11 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vue détaillée de <span class="phrase">Agenda</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Afficher des rendez-vous dans les différentes vues</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.view.html">Afficher les agendas de ressources</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gérer les rendez-vous</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.list">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Les composants de <span class="phrase">Agenda</span></a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.new.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.new.html
index a4d99c1af..919d574a0 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.new.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.new.html
@@ -52,10 +52,7 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Créer de nouveaux rendez-vous</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utiliser la vue de planification</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">S'abonner à des agendas Google Calendar</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">S'abonner à des agendas publics et partagés</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.popup.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.popup.html
index 8555d4841..bc80c4552 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.popup.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.popup.html
@@ -71,7 +71,7 @@
 <li class="listitem">
 <p role="presentation">autres données concernant le rendez-vous, le cas échéant : </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">pièces jointes</p></li>
+<li class="listitem"><p role="presentation">Pièces jointes</p></li>
 <li class="listitem"><p role="presentation">définition</p></li>
 <li class="listitem">
 <p role="presentation">organisateur, destinataires supplémentaires, ressources</p>
@@ -119,15 +119,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modifier un rendez-vous</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Créer un rendez-vous de suivi</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changer l'état d'un rendez-vous</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modifier les rappels de rendez-vous</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Modifier l'organisateur</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Déplacer des rendez-vous vers un autre agenda</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporter des rendez-vous</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Imprimer des rendez-vous</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Supprimer des rendez-vous</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gérer les rendez-vous</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Envoyer un courriel aux participants du rendez-vous</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.popup">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Les composants de <span class="phrase">Agenda</span></a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.toolbar.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.toolbar.html
index 197ae92d3..0bb1438c8 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.toolbar.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.gui.toolbar.html
@@ -76,14 +76,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modifier un rendez-vous</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modifier les rappels de rendez-vous</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Modifier l'organisateur</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Déplacer des rendez-vous vers un autre agenda</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporter des rendez-vous</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Imprimer des rendez-vous</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Supprimer des rendez-vous</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gérer les rendez-vous</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.toolbar">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Les composants de <span class="phrase">Agenda</span></a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.invitation.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.invitation.html
index 6034945fe..fa1626adb 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.invitation.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.invitation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Agenda">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="résoudre les conflits">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Résoudre les conflits">
 <link rel="next" href="ox.appsuite.user.sect.calendar.edit.html" title="Modifier un rendez-vous">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -87,7 +87,7 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changer l'état d'un rendez-vous</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Modification de l'état d'un rendez-vous</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.invitation">Sujet parent : <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.categories.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.categories.html
new file mode 100644
index 000000000..479f48db6
--- /dev/null
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.categories.html
@@ -0,0 +1,106 @@
+<html lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Utiliser des catégories pour les rendez-vous</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuel de l'utilisateur">
+<link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Gérer les rendez-vous">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Gérer les fuseaux horaires favoris">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Utiliser les couleurs de l'agenda">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Précédent</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Suivant</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Agenda</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gérer les rendez-vous</h2>
+<div class="sect2" id="ox.appsuite.user.sect.calendar.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Utiliser des catégories pour les rendez-vous</h3></div></div></div>
+<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><a class="indexterm" name="id-1.8.15.11.4"></a><p id="ox.appsuite.user.concept.calendar.manage.categories">Vous pouvez faire appel aux catégories pour organiser vos rendez-vous indépendamment des agendas. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Vous pouvez attribuer des catégories aux rendez-vous.</p></li>
+<li class="listitem"><p role="presentation">Vous pouvez afficher tous les rendez-vous correspondant à une catégorie donnée.</p></li>
+</ul>
+<p> Vous pouvez créer, modifier ou supprimer vos catégories personnelles (voir <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>).</p>
+<div class="task" id="ox.appsuite.user.task.calendar.manage.categories">
+<p class="title">Pour attribuer une catégorie à un rendez-vous :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Suivant la vue courante, utilisez l'une des méthodes suivantes : <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Cliquez sur un rendez-vous dans la vue en calendrier. Dans la fenêtre qui s'ouvre, cliquez sur l'icône <span class="guibutton"><strong>Modifier le rendez-vous</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">Sélectionnez un rendez-vous dans la vue en liste. Cliquez sur l'icône <span class="guibutton"><strong>Modifier le rendez-vous</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> dans la barre d'outils.</p></li>
+</ul></p>
+<p role="presentation">La fenêtre d'édition d'un rendez-vous s'ouvre.</p>
+</li>
+<li class="step">
+<p role="presentation">Pour procéder, cliquez sur <span class="guibutton"><strong>Ajouter une catégorie</strong></span> à côté de <span class="guibutton"><strong>Catégories</strong></span>. Choisissez une catégorie.</p>
+<p role="presentation">Pour supprimer une catégorie du rendez-vous, cliquez sur l'icône <span class="guibutton"><strong>Supprimer la catégorie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> figurant à côté de son intitulé.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.calendar.categories.view">
+<p class="title">Pour afficher les rendez-vous associés à une catégorie spécifique :</p>
+<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Suivant la vue courante, utilisez l'une des méthodes suivantes : <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Dans la vue en calendrier, cliquez sur un rendez-vous auquel une catégorie a été attribuée. Dans la fenêtre qui s'ouvre, cliquez sur la catégorie.</p></li>
+<li class="listitem"><p role="presentation">Dans la vue en liste, sélectionnez un rendez-vous auquel une catégorie est attribuée. Cliquez sur la catégorie dans la vue détaillée.</p></li>
+</ul></p></li></ul></div>
+<div class="taskrelated">
+          <p>Résultat : </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vue en liste affiche tous les rendez-vous associés à cette catégorie.</p></li>
+<li class="listitem"><p role="presentation">Pour revenir à la vue précédente, cliquez sur l'icône <span class="guibutton"><strong>Annuler la recherche</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> dans le champ de recherche.</p></li>
+</ul>
+          <p>Conseil : vous pouvez aussi utiliser la fonction de recherche et ses options pour rechercher une catégorie.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.calendar.manage.categories">
+        </p>
+<p class="title">Voir aussi :</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Rechercher des rendez-vous</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Par défaut, utiliser PGP dans le corps pour tout nouveau courriel</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utiliser des catégories pour les contacts</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utiliser des catégories pour les tâches</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.calendar.manage.categories">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gérer les rendez-vous</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.changeorganizer.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
index 34416db74..34ac3e51e 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
@@ -64,8 +64,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changeorganizer"></p>
 <p class="title">Interface utilisateur :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barre d'outils <span class="phrase">Agenda</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vue en liste <span class="phrase">Agenda</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.changereminder.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.changereminder.html
index 8ee4855f4..f0576ee3b 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.changereminder.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.changereminder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Gérer les rendez-vous">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="Changer l'état d'un rendez-vous">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="Modification de l'état d'un rendez-vous">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Modifier l'organisateur">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -60,9 +60,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changereminder"></p>
 <p class="title">Interface utilisateur :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barre d'outils <span class="phrase">Agenda</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vue détaillée de <span class="phrase">Agenda</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vue en liste <span class="phrase">Agenda</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.changestatus.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.changestatus.html
index 2fb744007..6282cc223 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.changestatus.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.changestatus.html
@@ -1,7 +1,7 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Changer l'état d'un rendez-vous</title>
+<title>Modification de l'état d'un rendez-vous</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
@@ -37,7 +37,7 @@
   </h1>
 <h2 class="sr-only">Gérer les rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.changestatus">
-<div class="titlepage"><div><div><h3 class="title">Changer l'état d'un rendez-vous</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Modification de l'état d'un rendez-vous</h3></div></div></div>
 <a class="indexterm" name="id-1.8.15.7.2"></a><a class="indexterm" name="id-1.8.15.7.3"></a><p id="ox.appsuite.user.concept.calendar.manage.changestatus">Vous pouvez modifier ultérieurement votre état de confirmation pour le rendez-vous. Vous pouvez ajouter un commentaire visible par les autres participants.</p>
 <p id="ox.appsuite.user.hint.calendar.manage.changestatus">Notes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -64,6 +64,7 @@
 <p class="title">Interface utilisateur :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vue en liste <span class="phrase">Agenda</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vue détaillée de <span class="phrase">Agenda</span></a></p>
 </li></ul>
 <p> </p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.colors.html
index ef80275ee..c7e95d428 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.colors.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.colors.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Gérer les rendez-vous">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Gérer les fuseaux horaires favoris">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Utiliser des catégories pour les rendez-vous">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.move.html" title="Déplacer des rendez-vous vers un autre agenda">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.move.html">Suivant</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.colors">
 <div class="titlepage"><div><div><h3 class="title">Utiliser les couleurs de l'agenda</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">Vous pouvez définir une couleur d'agenda. Par défaut, tous les rendez-vous de cet agenda seront affichés dans cette couleur. Si vous assignez une couleur individuelle à un rendez-vous lorsque vous le créez ou le modifiez, le rendez-vous sera affiché dans la couleur choisie et non dans celle de l'agenda.</p>
+<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">Vous pouvez définir une couleur d'agenda. Par défaut, tous les rendez-vous de cet agenda seront affichés dans cette couleur. Si vous assignez une couleur individuelle à un rendez-vous lorsque vous le créez ou le modifiez, le rendez-vous sera affiché dans la couleur choisie et non dans celle de l'agenda.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.colors">
 <p class="title">Pour choisir une couleur d'agenda :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,19 +46,15 @@
 <li class="step"><p role="presentation">Choisissez une couleur dans la liste déroulante de choix des couleurs.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.colors">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.colors"></p>
+<p class="title">Interface utilisateur :</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vue des dossiers de <span class="phrase">Agenda</span></a></p></li></ul>
+<p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Comment les rendez-vous sont-ils affichés dans la vue d'agenda ? </a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vue des dossiers de <span class="phrase">Agenda</span></a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vue des dossiers de <span class="phrase">Agenda</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Comment les rendez-vous sont-ils affichés dans la vue d'agenda ? </a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.colors">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gérer les rendez-vous</a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.delete.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.delete.html
index 405ea8c5b..79caf3248 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.delete.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Supprimer des rendez-vous</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Attention</strong></span> : les rendez-vous supprimés ne peuvent <span class="phrase"><strong>pas</strong></span> être restaurés. Suivant la configuration, vous ne pouvez supprimer un rendez-vous dans vos agendas privés que si vous en êtes l'organisateur.</p>
+<a class="indexterm" name="id-1.8.15.17.2"></a><a class="indexterm" name="id-1.8.15.17.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Attention</strong></span> : les rendez-vous supprimés ne peuvent <span class="phrase"><strong>pas</strong></span> être restaurés. Suivant la configuration, vous ne pouvez supprimer un rendez-vous dans vos agendas privés que si vous en êtes l'organisateur.</p>
 <p id="ox.appsuite.user.concept.calendar.manage.delete">Vous pouvez supprimer des rendez-vous d'un agenda si vous avez le droit de supprimer des objets.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.delete">
 <p class="title">Pour supprimer des rendez-vous :</p>
@@ -73,11 +73,14 @@
         </p>
 <p class="title">Interface utilisateur :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barre d'outils <span class="phrase">Agenda</span></a>
+            </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barre d'outils <span class="phrase">Agenda</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vue en liste <span class="phrase">Agenda</span></a>
             </p>
 </li></ul>
 <p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.export.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.export.html
index e2246abd5..6dcbc74ea 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.export.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exporter des rendez-vous</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">Vous pouvez exporter des rendez-vous au format iCal. Vous pouvez par exemple utiliser ce format pour échanger des rendez-vous avec d'autres applications d'agenda. Vous pouvez exporter des rendez-vous individuels ou l'intégralité des rendez-vous d'un agenda.</p>
+<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">Vous pouvez exporter des rendez-vous au format iCal. Vous pouvez par exemple utiliser ce format pour échanger des rendez-vous avec d'autres applications d'agenda. Vous pouvez exporter des rendez-vous individuels ou l'intégralité des rendez-vous d'un agenda.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.manage.export.selected">
 <p class="title">Pour exporter des rendez-vous individuels :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -65,14 +65,16 @@
 <p id="ox.appsuite.user.related.calendar.manage.export"></p>
 <p class="title">Interface utilisateur :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vue des dossiers de <span class="phrase">Agenda</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barre d'outils <span class="phrase">Agenda</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vue en liste <span class="phrase">Agenda</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importer des rendez-vous</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.8.15.14.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Télécharger les données personnelles</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.8.15.15.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Télécharger les données personnelles</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.manage.export">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gérer les rendez-vous</a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.html
index a2840857b..a8df428b3 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Agenda">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.folder.import.html" title="Importer des agendas depuis des fichiers">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="Changer l'état d'un rendez-vous">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="Modification de l'état d'un rendez-vous">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -39,10 +39,11 @@
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Gérer les rendez-vous</h2></div></div></div>
 <a class="indexterm" name="id-1.8.15.2"></a><a class="indexterm" name="id-1.8.15.3"></a><p id="ox.appsuite.user.orientation.calendar.manage">Découvrez comment organiser vos rendez-vous ainsi que les actions disponibles sur les rendez-vous. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changer l'état d'un rendez-vous</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Modification de l'état d'un rendez-vous</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Modifier les rappels de rendez-vous</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Modifier l'organisateur</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Gérer les fuseaux horaires favoris</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utiliser des catégories pour les rendez-vous</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Utiliser les couleurs de l'agenda</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Déplacer des rendez-vous vers un autre agenda</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importer des rendez-vous</a></p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.import.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.import.html
index 9e534befe..222338576 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.import.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importer des rendez-vous</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><a class="indexterm" name="id-1.8.15.13.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">Vous pouvez importer des rendez-vous depuis des fichiers au format iCal.</p>
+<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">Vous pouvez importer des rendez-vous depuis des fichiers au format iCal.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.import">
 <p class="title">Pour importer des rendez-vous depuis un fichier iCal :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -55,22 +55,16 @@
           <p>Remarque : tous les participants des rendez-vous importés seront supprimés. À la place, vous serez ajouté en tant que participant.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.import"></p>
+<p class="title">Interface utilisateur :</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vue des dossiers de <span class="phrase">Agenda</span></a></p></li></ul>
+<p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporter des rendez-vous</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importer des agendas depuis des fichiers</a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporter des rendez-vous</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importer des agendas depuis des fichiers</a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.import">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gérer les rendez-vous</a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.move.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.move.html
index e83b511c0..6ca37a68b 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.move.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.move.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Déplacer des rendez-vous vers un autre agenda</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">Vous pouvez déplacer des rendez-vous individuels vers un autre agenda, mais pas une série.</p>
+<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">Vous pouvez déplacer des rendez-vous individuels vers un autre agenda, mais pas une série.</p>
 <p>Pré-requis : vous devez avoir le droit de créer des objets dans l'agenda cible.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.move">
 <p class="title">Pour déplacer des rendez-vous vers un autre agenda :</p>
@@ -57,8 +57,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.move"></p>
 <p class="title">Interface utilisateur :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barre d'outils <span class="phrase">Agenda</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vue en liste <span class="phrase">Agenda</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.print.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.print.html
index b1e9f6f03..9cfc30ca4 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.print.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Imprimer des rendez-vous</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><a class="indexterm" name="id-1.8.15.15.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">Pour imprimer des agendas et des rendez-vous, vous pouvez : </p>
+<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><a class="indexterm" name="id-1.8.15.16.4"></a><a class="indexterm" name="id-1.8.15.16.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">Pour imprimer des agendas et des rendez-vous, vous pouvez : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">imprimer une page d'agenda avec des rendez-vous</p></li>
 <li class="listitem"><p role="presentation">imprimer les détails d'un rendez-vous</p></li>
@@ -89,14 +89,20 @@
 <p class="title">Interface utilisateur :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">Le menu des réglages de <span class="phrase">Agenda</span></a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">Le menu des réglages de <span class="phrase">Agenda</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vue des dossiers de <span class="phrase">Agenda</span></a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barre d'outils <span class="phrase">Agenda</span></a>
             </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vue en liste <span class="phrase">Agenda</span></a>
+            </p>
 </li></ul>
 <p>
       </p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.timezones.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.timezones.html
index 195acb4b6..70803a3d8 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.timezones.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.manage.timezones.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Gérer les rendez-vous">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Modifier l'organisateur">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Utiliser les couleurs de l'agenda">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Utiliser des catégories pour les rendez-vous">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Suivant</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Suivant</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.search.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.search.html
index c11ae8763..1f823ec66 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.search.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.search.html
@@ -89,7 +89,7 @@
             <a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Afficher des rendez-vous dans les différentes vues</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utiliser des catégories pour les rendez-vous</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.settings.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.settings.html
index b595a45b2..b01bba08b 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.settings.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.settings.html
@@ -103,7 +103,7 @@
 <p id="ox.appsuite.user.reference.calendar.settings.jitsi"></p>
 <h3 class="title">Réunions Jitsi</h3>
 <p><a class="indexterm" name="id-1.8.22.9.2"></a>Grâce à ces options, vous pouvez définir le comportement lorsque vous créez des rendez-vous et que vous sélectionnez <span class="guibutton"><strong>Réunion Jitsi</strong></span> dans la liste déroulante <span class="guibutton"><strong>Conférence</strong></span>. </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>Copier automatiquement le lien vers le lieu. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Définit si le lien de participation à la réunion Jitsi est copié vers le champ <span class="guibutton"><strong>Lieu</strong></span>.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>copier automatiquement le lien vers le lieu. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Définit si le lien de participation à la réunion Jitsi est copié vers le champ <span class="guibutton"><strong>Lieu</strong></span>.</p></li></ul>
 <p> Voir <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Planifier des conférences audio/vidéo</a></p>
 </div>
 <div id="ox.appsuite.user.reference.calendar.settings.zoom" class="feat-zoom">
@@ -115,8 +115,8 @@
 <p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments"><b>Rendez-vous. </b></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.password"><b>Toujours ajouter un mot de passe de réunion aléatoire. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.1.1.2"></a>Indique si la conférence est sécurisée par un mot de passe créé automatiquement.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>Copier automatiquement le lien vers le lieu. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Indique si le lien de participation à la réunion Zoom est copié vers le champ <span class="guibutton"><strong>Lieu</strong></span>.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>Copier les informations d'appel vers la description. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Indique si le lien de participation à la réunion Zoom est copié vers le champ <span class="guibutton"><strong>Lieu</strong></span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>copier automatiquement le lien vers le lieu. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Indique si le lien de participation à la réunion Zoom est copié vers le champ <span class="guibutton"><strong>Lieu</strong></span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>copier les informations d'appel vers la description. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Indique si le lien de participation à la réunion Zoom est copié vers le champ <span class="guibutton"><strong>Lieu</strong></span>.</p></li>
 </ul>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.dialinnumber"><b>Numéros d'appel. </b>Si vous disposez d'un compte Zoom Pro, Zoom propose des numéros d'appel par pays. Pour définir les pays à afficher dans les invitations à des rendez-vous, cliquez sur <span class="guibutton"><strong>Ouvrir le profil Zoom</strong></span>.</p></li>
@@ -128,8 +128,8 @@
 <p><a class="indexterm" name="id-1.8.22.11.2"></a>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>afficher l'agenda des anniversaires. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Définit si un calendrier des anniversaires apparaît dans la vue des dossiers.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>afficher les rappels pour les rendez-vous passés. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Indique si les rappels de rendez-vous doivent être affichés pour les rendez-vous passés.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>Afficher l'agenda des anniversaires. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Définit si un calendrier des anniversaires apparaît dans la vue des dossiers.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>Afficher les rappels pour les rendez-vous passés. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Indique si les rappels de rendez-vous doivent être affichés pour les rendez-vous passés.</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.calendar.settings.advanced.emailchanges"><b>Appliquer automatiquement à votre agenda les modifications de rendez-vous reçues par courriel. </b><a class="indexterm" name="id-1.8.22.11.3.1.3.1.2"></a>Définit dans quels cas les invitations à des rendez-vous émises par des contacts externes sont automatiquement ajoutées à votre agenda. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -143,7 +143,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.declined"><b>Afficher les rendez-vous déclinés. </b><a class="indexterm" name="id-1.8.22.11.3.1.6.1.2"></a>Indique si les rendez-vous que vous avez déclinés sont affichés. Voir aussi <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Répondre des invitations à des rendez-vous</a></p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.participantsedit"><b>Toujours cocher « Les participants peuvent modifier les rendez-vous » à la création ou la modification de rendez-vous. </b><a class="indexterm" name="id-1.8.22.11.3.1.7.1.2"></a>Définit si les participants d'un rendez-vous reçoivent par défaut l'autorisation de le modifier.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.wholeday"><b>Marquer automatiquement les rendez-vous sur la journée comme « Disponibles » à la création ou la modification de rendez-vous. </b><a class="indexterm" name="id-1.8.22.11.3.1.8.1.2"></a>Indique si les rendez-vous sur la journée entière sont affichés par défaut comme libres.</p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>utiliser la première couleur de catégorie pour les rendez-vous. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Définit si les rendez-vous auxquels vous avez attribué une catégorie sont affichés dans la couleur de cette catégorie. Lorsque vous attribuez plusieurs catégories à un rendez-vous, c'est la couleur de la première catégorie attribuée qui est utilisée. Voir aussi : <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>Utiliser la première couleur de catégorie pour les rendez-vous. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Définit si les rendez-vous auxquels vous avez attribué une catégorie sont affichés dans la couleur de cette catégorie. Lorsque vous attribuez plusieurs catégories à un rendez-vous, c'est la couleur de la première catégorie attribuée qui est utilisée. Voir aussi : <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a></p></li>
 </ul>
 <p>
       </p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.appointments.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.appointments.html
index f47a7b58b..6cf2fcc9d 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.appointments.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.appointments.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Afficher les rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.appointments">
 <div class="titlepage"><div><div><h3 class="title">Comment les rendez-vous sont-ils affichés dans la vue d'agenda ? </h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.9.2"></a><a class="indexterm" name="id-1.8.8.9.3"></a><a class="indexterm" name="id-1.8.8.9.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">Les propriétés de rendez-vous suivantes définissent la manière dont un rendez-vous est affiché dans la vue d'agenda : </p>
+<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><a class="indexterm" name="id-1.8.8.8.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">Les propriétés de rendez-vous suivantes définissent la manière dont un rendez-vous est affiché dans la vue d'agenda : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">La couleur du rendez-vous</p>
@@ -67,7 +67,7 @@
 <p role="presentation">Un rendez-vous que vous avez décliné sera affiché en gris. Son sujet sera précédé de l'icône <span class="guibutton"><strong>Décliné</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.declined"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span> et le texte du sujet est barré.</p>
 <p role="presentation">Dans les réglages de l'agenda, vous pouvez définir si les rendez-vous déclinés sont affichés ou non.</p>
 </li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.6.2.1.6"><p role="presentation">Un rendez-vous ayant été décliné par tous les autres participants sera identifié par l'icône <span class="guibutton"><strong>Décliné par tous</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>.</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.6.2.1.6"><p role="presentation">Un rendez-vous ayant été décliné par tous les autres participants sera identifié par l'icône <span class="guibutton"><strong>Décliné par tous</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>.</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.view.appointments.private"></p>
 <h4 class="title">Affichage des rendez-vous privés</h4>
@@ -94,7 +94,7 @@
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.secret"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span>rendez-vous secret</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.unconfirmed"><object type="image/svg+xml" data="../../images/question-circle.svg" height="15"></object></span>rendez-vous non confirmé</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.rejected"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>rendez-vous décliné</p></li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>rendez-vous décliné par tous les autres participants</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>rendez-vous décliné par tous les autres participants</p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.view.appointments">
         </p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.html
index 330369cb0..d5032b660 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.html
@@ -43,14 +43,6 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.timezones.html">Afficher plusieurs fuseaux horaires</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Comment les rendez-vous sont-ils affichés dans la vue d'agenda ? </a></p></li>
 </ul>
-<p id="ox.appsuite.user.related.calendar.view">
-      </p>
-<p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vue des dossiers de <span class="phrase">Agenda</span></a>
-          </p></li></ul>
-<p>
-    </p>
 <p id="ox.appsuite.user.parent.calendar.view">Sujet parent : <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
     <span class="phrase">Agenda</span>
     
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.timezones.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.timezones.html
index b16d247bb..1d04111b9 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.timezones.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.timezones.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Afficher les rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.timezones">
 <div class="titlepage"><div><div><h3 class="title">Afficher plusieurs fuseaux horaires</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">Outre le fuseau horaire par défaut, vous pouvez afficher des fuseaux horaires que vous avez ajoutés aux favoris. Le fuseau horaire par défaut peut être modifié dans les réglages de base.</p>
+<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">Outre le fuseau horaire par défaut, vous pouvez afficher des fuseaux horaires que vous avez ajoutés aux favoris. Le fuseau horaire par défaut peut être modifié dans les réglages de base.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.timezones">
 <p class="title">Pour afficher plusieurs fuseaux horaires dans une vue en calendrier :</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.views.html b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.views.html
index 0c6b7cd20..dce8b0c8e 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.views.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.calendar.view.views.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Afficher les rendez-vous</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.views">
 <div class="titlepage"><div><div><h3 class="title">Afficher des rendez-vous dans les différentes vues</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><a class="indexterm" name="id-1.8.8.7.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Découvrez comment afficher les rendez-vous d'un ou plusieurs agendas dans les différentes vues disponibles :</p>
+<a class="indexterm" name="id-1.8.8.6.2"></a><a class="indexterm" name="id-1.8.8.6.3"></a><a class="indexterm" name="id-1.8.8.6.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Découvrez comment afficher les rendez-vous d'un ou plusieurs agendas dans les différentes vues disponibles :</p>
 <div class="task" id="ox.appsuite.user.task.calendar.view.views">
 <p class="title">Pour afficher un rendez-vous :</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.create.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.create.html
index b706cfd86..2d38de839 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.create.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.create.html
@@ -50,8 +50,8 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">Image de contact, le cas échéant. Cliquez sur l'image de contact pour la modifier ou transférer une nouvelle image.</p>
-<p role="presentation">Nom, prénom</p>
-<p role="presentation">Le cas échéant : titre, informations professionnelles, résidence</p>
+<p role="presentation">nom, prénom</p>
+<p role="presentation">le cas échéant : titre, informations professionnelles, résidence</p>
 </li>
 <li class="listitem">
 <p role="presentation">Informations personnelles </p>
@@ -88,13 +88,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">La fenêtre d'édition</a></p></li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vue détaillée de <span class="phrase">Carnet d'adresses</span></a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Créer un nouveau contact</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Ajouter des contacts</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Modifier des contacts ou des listes de diffusion</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.create">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Les composants de <span class="phrase">Carnet d'adresses</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.detailview.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.detailview.html
index 38ddf9612..fabb75db6 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.detailview.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.detailview.html
@@ -46,12 +46,12 @@
 <p class="title">Contenu</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Une image de contact, le cas échéant</p>
-<p role="presentation">Nom, prénom</p>
-<p role="presentation">Le cas échéant : titre, informations professionnelles, résidence</p>
+<p role="presentation">une image de contact, le cas échéant</p>
+<p role="presentation">nom, prénom</p>
+<p role="presentation">le cas échéant : titre, informations professionnelles, résidence</p>
 </li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.7.11.4.1.3">
-<p role="presentation">Les catégories attribuées</p>
+<p role="presentation">les catégories attribuées</p>
 <p role="presentation">Un clic sur une catégorie recherche les contacts attribués à cette catégorie.</p>
 </li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.4"><p role="presentation">Suivant la configuration : la disponibilité actuelle du contact pour un appel</p></li>
@@ -84,7 +84,7 @@
 </li>
 <li class="listitem"><p role="presentation">Remarque</p></li>
 <li class="listitem"><p role="presentation">18 champs définis par l'utilisateur au maximum</p></li>
-<li class="listitem"><p role="presentation">pièces jointes</p></li>
+<li class="listitem"><p role="presentation">Pièces jointes</p></li>
 </ul>
 </li>
 </ul>
@@ -97,15 +97,11 @@
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vue en liste <span class="phrase">Carnet d'adresses</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.create.html">La fenêtre d'édition de contact</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Afficher les contacts d'un carnet d'adresses</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.attachments.html">Affichage ou enregistrement des pièces jointes du contact</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Appeler des contacts</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gérer les contacts</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gérer les contacts</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.detailview">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Les composants de <span class="phrase">Carnet d'adresses</span></a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.foldertree.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.foldertree.html
index b8de7527b..0a43cace5 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.foldertree.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.foldertree.html
@@ -62,6 +62,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Afficher les contacts d'un carnet d'adresses</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Ajout de carnet d'adresses</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gérer les contacts</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestion des données avec les dossiers</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.list.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.list.html
index 207e3072d..7e21df6d4 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.list.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.list.html
@@ -53,8 +53,8 @@
 <p role="presentation">Les détails suivants sont affichés pour chaque contact : </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">une image, le cas échéant</p></li>
-<li class="listitem"><p role="presentation">Nom, prénom</p></li>
-<li class="listitem"><p role="presentation">Données professionnelles, le cas échéant</p></li>
+<li class="listitem"><p role="presentation">nom, prénom</p></li>
+<li class="listitem"><p role="presentation">données professionnelles, le cas échéant</p></li>
 </ul>
 <p role="presentation">Les noms débutant par un chiffre ou un caractère spécial sont affichés sous <span class="guibutton"><strong>#</strong></span> en tête de la vue en liste. Les noms débutant par un signe spécial sont affichés sous <span class="guibutton"><strong>Ω</strong></span> en bas de la vue en liste.</p>
 </li>
@@ -66,11 +66,8 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.settingsmenu.html">Le menu des réglages de <span class="phrase">Carnet d'adresses</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vue détaillée de <span class="phrase">Carnet d'adresses</span></a></p>
-</li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Afficher les contacts d'un carnet d'adresses</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gérer les contacts</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.list">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Les composants de <span class="phrase">Carnet d'adresses</span></a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.new.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.new.html
index f2da7e7df..00d37d9ae 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.new.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.new.html
@@ -42,7 +42,7 @@
 <a class="indexterm" name="id-1.9.7.6.2"></a><p id="ox.appsuite.user.concept.contacts.gui.new">Crée un nouveau contact. Un clic sur l'icône <span class="guibutton"><strong>Actions supplémentaires</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> ouvre un menu comportant des fonctionnalités supplémentaires : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">nouvelle liste de diffusion</p></li>
-<li class="listitem"><p role="presentation">S'abonner à des carnets d'adresses partagés ou autres</p></li>
+<li class="listitem"><p role="presentation">s'abonner à des carnets d'adresses partagés ou autres</p></li>
 <li class="listitem"><p role="presentation">nouveau courriel, nouveau rendez-vous, nouveau contact</p></li>
 </ul>
 <p id="ox.appsuite.user.hint.contacts.gui.new">Remarque : si le dossier est fermé, le bouton est affiché en tant qu'icône. Dans ce cas, l'icône <span class="guibutton"><strong>Actions supplémentaires</strong></span> n'est pas disponible. Pour afficher la vue des dossiers, cliquez sur l'icône <span class="guibutton"><strong>Ouvrir la vue des dossiers</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.open"><object type="image/svg+xml" data="../../images/layout-split.svg" height="15"></object></span> en bas à gauche.</p>
@@ -52,7 +52,7 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Créer un nouveau contact</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Ajouter des contacts</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">Créer des listes de diffusion</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">S'abonner à des carnets d'adresses externes</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">S'abonner à des carnets d'adresses publics et partagés</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.settingsmenu.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
index dcb058307..d13e280e7 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
@@ -45,7 +45,7 @@
 <li class="listitem"><p role="presentation">Personnaliser tous les réglages</p></li>
 <li class="listitem"><p role="presentation">Sélectionner un thème pour l'interface utilisateur</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Options de liste</strong></span>. Définit si les images des contacts, les cases à cocher, ou aucun de ces éléments n'est affiché dans la vue en liste.</p></li>
-<li class="listitem"><p role="presentation">S'abonner à des carnets d'adresses partagés ou autres</p></li>
+<li class="listitem"><p role="presentation">s'abonner à des carnets d'adresses partagés ou autres</p></li>
 <li class="listitem"><p role="presentation">Suivant la configuration : <span class="guibutton"><strong>Connecter votre appareil</strong></span>. Lance un assistant de configuration des applications locales qui vous permettent d'accéder à vos données du collecticiel.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.contacts.gui.settingsmenu"></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.toolbar.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.toolbar.html
index 2f0089880..7be639b43 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.toolbar.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.gui.toolbar.html
@@ -64,13 +64,7 @@
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Modifier des contacts ou des listes de diffusion</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envoyer des courriels à partir du carnet d'adresses</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">invitation de contacts à un rendez-vous</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Déplacer ou copier des contacts</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envoyer des contacts sous forme de vCard</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exportation des contacts</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.print.html">Imprimer des contacts</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.delete.html">Suppression de contacts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gérer les contacts</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.toolbar">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Les composants de <span class="phrase">Carnet d'adresses</span></a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.categories.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.categories.html
new file mode 100644
index 000000000..1c7ef3d41
--- /dev/null
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Utiliser des catégories pour les contacts</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuel de l'utilisateur">
+<link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Gérer les contacts">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="invitation de contacts à un rendez-vous">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Déplacer ou copier des contacts">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Précédent</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Suivant</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Carnet d'adresses</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gérer les contacts</h2>
+<div class="sect2" id="ox.appsuite.user.sect.contacts.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Utiliser des catégories pour les contacts</h3></div></div></div>
+<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><p id="ox.appsuite.user.concept.contacts.manage.categories">Vous pouvez faire appel aux catégories pour organiser vos contacts indépendamment des agendas. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Vous pouvez attribuer des catégories aux contacts.</p></li>
+<li class="listitem"><p role="presentation">Vous pouvez afficher tous les contacts correspondant à une catégorie donnée.</p></li>
+</ul>
+<p> Vous pouvez créer, modifier ou supprimer vos catégories personnelles (voir <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>).</p>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories">
+<p class="title">Pour attribuer une catégorie à un contact :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Sélectionnez un contact. Cliquez sur l'icône <span class="guibutton"><strong>Modifier le contact</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> dans la barre d'outils.</p>
+<p role="presentation">La fenêtre d'édition de contact s'ouvre.</p>
+</li>
+<li class="step">
+<p role="presentation">Pour procéder, cliquez sur <span class="guibutton"><strong>Ajouter une catégorie</strong></span> à côté de <span class="guibutton"><strong>Catégories</strong></span>. Choisissez une catégorie.</p>
+<p role="presentation">Pour supprimer une catégorie du contact, cliquez sur l'icône <span class="guibutton"><strong>Supprimer la catégorie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> figurant à côté de son intitulé.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories.view">
+<p class="title">Pour afficher les contacts associés à une catégorie spécifique :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Sélectionnez un contact auquel une catégorie a été attribuée.</p></li>
+<li class="step"><p role="presentation">Cliquez sur la catégorie dans la vue détaillée.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Résultat : </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vue en liste affiche tous les contacts associés à cette catégorie. </p></li>
+<li class="listitem"><p role="presentation">Pour revenir à la liste précédente, cliquez sur l'icône <span class="guibutton"><strong>Annuler la recherche</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> dans le champ de recherche.</p></li>
+</ul>
+          <p>Conseil : vous pouvez aussi utiliser la fonction de recherche et ses options pour rechercher une catégorie.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.contacts.manage.categories">
+        </p>
+<p class="title">Voir aussi :</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Chercher des contacts</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Par défaut, utiliser PGP dans le corps pour tout nouveau courriel</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utiliser des catégories pour les rendez-vous</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utiliser des catégories pour les tâches</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.contacts.manage.categories">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gérer les contacts</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.delete.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.delete.html
index 36c00978a..a734144c4 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.delete.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Suppression de contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Attention :</strong></span> les contacts et listes de diffusion supprimés ne peuvent <span class="phrase"><strong>pas</strong></span> être restaurés.</p>
+<a class="indexterm" name="id-1.9.17.15.2"></a><a class="indexterm" name="id-1.9.17.15.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Attention :</strong></span> les contacts et listes de diffusion supprimés ne peuvent <span class="phrase"><strong>pas</strong></span> être restaurés.</p>
 <p id="ox.appsuite.user.concept.contacts.manage.delete">Vous pouvez supprimer des contacts ou listes de diffusion d'un carnet d'adresses si vous disposez des droits requis pour supprimer des éléments dans ce carnet d'adresses. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Vous ne pouvez pas supprimer des contacts figurant dans le carnet d'adresses <span class="guibutton"><strong>Tous les utilisateurs</strong></span>.</p></li>
@@ -55,9 +55,14 @@
 <p id="ox.appsuite.user.related.contacts.manage.delete">
         </p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barre d'outils <span class="phrase">Carnet d'adresses</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vue en liste <span class="phrase">Carnet d'adresses</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.delete">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gérer les contacts</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.export.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.export.html
index 33fab4d9e..b015b9532 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.export.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exportation des contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">Vous pouvez exporter des contacts et listes de diffusion vers ces formats :</p>
+<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><a class="indexterm" name="id-1.9.17.13.4"></a><a class="indexterm" name="id-1.9.17.13.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">Vous pouvez exporter des contacts et listes de diffusion vers ces formats :</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">vCard. Vous pouvez par exemple utiliser ce format pour échanger des contacts avec d'autres applications de courrier.</p></li>
 <li class="listitem"><p role="presentation">CSV. Vous pouvez utiliser ce format pour exporter des contacts vers des formats de feuilles de calcul.</p></li>
@@ -76,7 +76,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.export"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barre d'outils <span class="phrase">Carnet d'adresses</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Carnet d'adresses</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barre d'outils <span class="phrase">Carnet d'adresses</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vue en liste <span class="phrase">Carnet d'adresses</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -84,7 +88,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envoyer des contacts sous forme de vCard</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importer des contacts</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.9.17.12.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Télécharger les données personnelles</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.9.17.13.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Télécharger les données personnelles</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.export">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gérer les contacts</a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.html
index 1f8283f13..860f492a4 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem cap-webmail" id="id-1.9.17.4.1.1"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envoyer des courriels à partir du carnet d'adresses</a></p></li>
 <li class="listitem cap-calendar" id="id-1.9.17.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">invitation de contacts à un rendez-vous</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utiliser des catégories pour les contacts</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Déplacer ou copier des contacts</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envoyer des contacts sous forme de vCard</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importer des contacts</a></p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.import.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.import.html
index d949af3c9..af2ecdebf 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.import.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importer des contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><a class="indexterm" name="id-1.9.17.11.5"></a><a class="indexterm" name="id-1.9.17.11.6"></a><a class="indexterm" name="id-1.9.17.11.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">Vous pouvez importer des contacts depuis des fichiers aux formats suivants : </p>
+<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><a class="indexterm" name="id-1.9.17.12.6"></a><a class="indexterm" name="id-1.9.17.12.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">Vous pouvez importer des contacts depuis des fichiers aux formats suivants : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">vCard. Remarques : </p>
@@ -72,19 +72,15 @@
 <li class="step"><p role="presentation">Cliquez sur <span class="guibutton"><strong>Importer</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.contacts.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.contacts.manage.import"></p>
+<p class="title">Interface utilisateur :</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Carnet d'adresses</span></a></p></li></ul>
+<p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exportation des contacts</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Ajouter des contacts</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exportation des contacts</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Ajouter des contacts</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.contacts.manage.import">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gérer les contacts</a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.inviteappointment.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
index 3e452ee6f..49955b061 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Gérer les contacts">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.manage.sendmail.html" title="Envoyer des courriels à partir du carnet d'adresses">
-<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Déplacer ou copier des contacts">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Utiliser des catégories pour les contacts">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Suivant</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Suivant</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -53,7 +53,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.inviteappointment"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barre d'outils <span class="phrase">Carnet d'adresses</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barre d'outils <span class="phrase">Carnet d'adresses</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vue en liste <span class="phrase">Carnet d'adresses</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vue détaillée de <span class="phrase">Carnet d'adresses</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Créer de nouveaux rendez-vous</a></p></li></ul>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.movecopy.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.movecopy.html
index dfcb5be2f..fb1edf711 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.movecopy.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.movecopy.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Gérer les contacts">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="invitation de contacts à un rendez-vous">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Utiliser des catégories pour les contacts">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html" title="Envoyer des contacts sous forme de vCard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Suivant</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.movecopy">
 <div class="titlepage"><div><div><h3 class="title">Déplacer ou copier des contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><a class="indexterm" name="id-1.9.17.9.4"></a><a class="indexterm" name="id-1.9.17.9.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">Vous pouvez déplacer des contacts ou des listes de diffusion vers un autre carnet d'adresses.</p>
+<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><a class="indexterm" name="id-1.9.17.10.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">Vous pouvez déplacer des contacts ou des listes de diffusion vers un autre carnet d'adresses.</p>
 <p id="ox.appsuite.user.hints.contacts.manage.movecopy">Remarques : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Vous ne pouvez pas déplacer ou modifier des contacts ou des listes de diffusion vers le carnet d'adresses <span class="guibutton"><strong>Tous les utilisateurs</strong></span>.</p></li>
@@ -61,7 +61,10 @@
 <p id="ox.appsuite.user.tip.contacts.manage.movecopy">Conseil : vous pouvez également déplacer les objets sélectionnés en les faisant glisser-déposer depuis la vue des dossiers vers un carnet d'adresses.</p>
 <p id="ox.appsuite.user.related.contacts.manage.movecopy"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barre d'outils <span class="phrase">Carnet d'adresses</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barre d'outils <span class="phrase">Carnet d'adresses</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vue en liste <span class="phrase">Carnet d'adresses</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.personal.html">Ajouter des carnets d'adresses personnels</a></p></li></ul>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.print.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.print.html
index 56c259161..e0316ff39 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.print.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Imprimer des contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">Vous pouvez imprimer les données relatives à un contact unique ou à une liste de contacts. Vous pouvez choisir différentes dispositions d'impression.</p>
+<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">Vous pouvez imprimer les données relatives à un contact unique ou à une liste de contacts. Vous pouvez choisir différentes dispositions d'impression.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.print.list">
 <p class="title">Pour imprimer les données d'un contact :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,9 +54,17 @@
 <p id="ox.appsuite.user.related.contacts.manage.print">
         </p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Carnet d'adresses</span></a>
+            </p>
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barre d'outils <span class="phrase">Carnet d'adresses</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vue en liste <span class="phrase">Carnet d'adresses</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.print">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gérer les contacts</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.sendmail.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.sendmail.html
index 0dfbecd2f..910546c90 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.sendmail.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.sendmail.html
@@ -53,10 +53,14 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendmail"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barre d'outils <span class="phrase">Carnet d'adresses</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barre d'outils <span class="phrase">Carnet d'adresses</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vue en liste <span class="phrase">Carnet d'adresses</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vue détaillée de <span class="phrase">Carnet d'adresses</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p></li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendmail">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gérer les contacts</a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.sendvcard.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.sendvcard.html
index 34f8190a6..bd825221a 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.sendvcard.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.manage.sendvcard.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.sendvcard">
 <div class="titlepage"><div><div><h3 class="title">Envoyer des contacts sous forme de vCard</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">Vous pouvez envoyer des contacts ou des listes de diffusion au format vCard par le biais de pièces jointes à un courriel.</p>
+<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">Vous pouvez envoyer des contacts ou des listes de diffusion au format vCard par le biais de pièces jointes à un courriel.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.sendvcard">
 <p class="title">Pour envoyer un contact en tant que vCard jointe :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,12 +49,15 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendvcard"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barre d'outils <span class="phrase">Carnet d'adresses</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barre d'outils <span class="phrase">Carnet d'adresses</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vue en liste <span class="phrase">Carnet d'adresses</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Exportation des contacts</a></p></li>
-<li class="listitem cap-webmail" id="id-1.9.17.10.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p></li>
+<li class="listitem cap-webmail" id="id-1.9.17.11.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendvcard">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gérer les contacts</a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.search.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.search.html
index 1149501fb..bf4d43d4d 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.search.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Afficher les contacts d'un carnet d'adresses</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utiliser des catégories pour les contacts</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.settings.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.settings.html
index c3728e771..425137fc1 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.settings.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.settings.html
@@ -60,7 +60,7 @@
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>noms. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a>
+<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>Noms. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Indique l'ordre dans lequel il convient d'afficher le prénom et le nom de famille d'un contact dans le carnet d'adresses.</p></li></ul>
 <p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.useaddressbook.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.useaddressbook.html
index 4651e5340..a5252e923 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.useaddressbook.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.useaddressbook.html
@@ -70,7 +70,7 @@
 <p> </p>
 <p class="title">Actions de niveau supérieur :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Ajouter des participants ou des ressources</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utiliser la vue de planification</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Créer des ressources gérées</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.useaddressdirectory.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.useaddressdirectory.html
index c3cad12d1..8325811ef 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.useaddressdirectory.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.useaddressdirectory.html
@@ -77,7 +77,7 @@
 <p id="ox.appsuite.user.related.contacts.useaddressdirectory"></p>
 <p class="title">Actions de niveau supérieur :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Ajouter des participants ou des ressources</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utiliser la vue de planification</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Créer des ressources gérées</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.view.haloview.html b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.view.haloview.html
index 48d02b169..da5ba440c 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.view.haloview.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.contacts.view.haloview.html
@@ -48,9 +48,9 @@
 <li class="listitem"><p role="presentation">Sélectionnez un rendez-vous ou une tâche dans l'application <span class="phrase">Agenda</span> or <span class="phrase">Tâches</span>. Cliquez sur un participant dans la vue détaillée ou dans la fenêtre qui apparaît.</p></li>
 </ul></p>
 <p role="presentation">Suivant les informations du contact figurant dans le carnet d'adresses, ces données sont affichées dans une nouvelle fenêtre : <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Une image, le cas échéant</p></li>
-<li class="listitem"><p role="presentation">Nom, prénom</p></li>
-<li class="listitem"><p role="presentation">Données professionnelles, le cas échéant</p></li>
+<li class="listitem"><p role="presentation">une image, le cas échéant</p></li>
+<li class="listitem"><p role="presentation">nom, prénom</p></li>
+<li class="listitem"><p role="presentation">données professionnelles, le cas échéant</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.4"><p role="presentation">Suivant la configuration : la disponibilité actuelle du contact pour un appel</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">Suivant la configuration : des icônes permettant de communiquer avec le contact : <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Courriel</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>. Ouvre une fenêtre de rédaction d'un courriel.</p></li>
@@ -62,7 +62,7 @@
 <li class="listitem"><p role="presentation">Adresses électroniques. Un clic sur une adresse électronique ouvre une page de rédaction de courriel à cette adresse.</p></li>
 <li class="listitem"><p role="presentation">Numéros de téléphone professionnel et privé. Un clic sur un numéro de téléphone ouvre une fonction permettant de passer des appels (si disponible).</p></li>
 <li class="listitem"><p role="presentation">Adresses professionnelle et privée. Dans les réglages des carnets d'adresses, vous pouvez définir si un service de cartographie doit être utilisé pour l'affichage d'une adresse sur laquelle vous cliquez.</p></li>
-<li class="listitem"><p role="presentation">pièces jointes</p></li>
+<li class="listitem"><p role="presentation">Pièces jointes</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">Carnet d'adresses dans lequel le contact est enregistré</p></li>
 <li class="listitem"><p role="presentation">Vos conversations récentes avec ce contact. Si vous cliquez sur un courriel, son contenu s'affiche dans une nouvelle fenêtre.</p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.accounts.edit.html b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
index e3fce91b8..07a8af80b 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
@@ -94,7 +94,7 @@
               <a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utiliser la messagerie unifiée</a>
             </p>
 <p role="presentation" class="cap-webmail">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Sélectionner une adresse d'expéditeur</a>
+              <a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">sélectionner une adresse d'expéditeur</a>
             </p>
 <p role="presentation" class="cap-infostore">
               <a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Ajouter des comptes de stockage</a>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
index 4a1365197..7bd5cbe48 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
@@ -64,7 +64,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utiliser la messagerie unifiée</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Sélectionner une adresse d'expéditeur</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">sélectionner une adresse d'expéditeur</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.accounts.functionalmail">Sujet de niveau supérieur : <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Gérer les comptes</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.categories.html b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.categories.html
index 512430b3e..e5d4c5a44 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.categories.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.categories.html
@@ -32,15 +32,15 @@
   <h1 class="sr-only">Organisation des données et partages</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.categories">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Gérer les catégories</h2></div></div></div>
-<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Découvrez comment gérer les <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">catégories</a> qui vous permettent de classer vos rendez-vous, vos contacts et vos tâches. Les catégories possèdent les propriétés suivantes : </p>
+<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Découvrez comment gérer les <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">catégories</a> qui vous permettent d'organiser vos courriels, rendez-vous, contacts et tâches dans différentes applications, indépendamment de la structure des dossiers. Vous pouvez par exemple utiliser une catégorie personnalisée pour un projet ou un client spécifique. Les catégories possèdent les propriétés suivantes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Une catégorie est constituée d'un nom et d'une couleur.</p></li>
 <li class="listitem"><p role="presentation">Lorsque vous recherchez des objets, vous pouvez utiliser des catégories comme termes de recherche.</p></li>
 <li class="listitem"><p role="presentation">Suivant la configuration, certaines catégories sont prédéfinies. Ces catégories ne peuvent pas être éditées, ni supprimées.</p></li>
 <li class="listitem"><p role="presentation">Vous pouvez créer, modifier et supprimer vos propres catégories.</p></li>
-<li class="listitem"><p role="presentation">Vous pouvez attribuer une ou plusieurs catégories aux rendez-vous, contacts et tâches, et les supprimer ultérieurement.</p></li>
+<li class="listitem"><p role="presentation">Vous pouvez attribuer une ou plusieurs catégories aux courriels, rendez-vous, contacts et tâches, et les supprimer ultérieurement.</p></li>
 </ul>
-<p> Remarque : Ces catégories ne peuvent pas être utilisées pour les courriels. Pour les courriels, vous disposez des onglets de la boîte de réception (voir page <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Travailler avec les catégories de la boîte de réception</a>).</p>
+<p> Remarque : pour les courriels, vous pouvez aussi utiliser les onglets de la boîte de réception. Vous pouvez attribuer une catégorie de la boîte de réception à un courriel. La catégorie dépend de l'expéditeur (voir <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Travailler avec les catégories de la boîte de réception</a>).</p>
 <p id="ox.appsuite.user.concept.dataorganisation.categories">Vous disposez des options suivantes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">créer vos propres catégories</p></li>
@@ -51,9 +51,15 @@
 <p class="title">Pour gérer vos catégories :</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step help-hide-inline">
+<p role="presentation">Cliquer sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> à droite de la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>. La fenêtre <span class="guilabel"><strong>Réglages</strong></span> s'ouvre alors.</p>
+<p role="presentation">Cliquez sur <span class="guibutton"><strong>Réglages de base</strong></span> dans le panneau de gauche. Cliquez sur <span class="guibutton"><strong>Gérer les catégories</strong></span> sous <span class="guibutton"><strong>Réglages avancés</strong></span></p>
+<p role="presentation">Vous pouvez également utiliser l'une des méthodes suivantes : <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Cliquer sur l'icône <span class="guibutton"><strong>Ajouter une catégorie</strong></span>  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> dans la barre d'outils. Sélectionnez<span class="guibutton"><strong>Gérer les catégories</strong></span>.</p></li>
+<li class="listitem">
 <p role="presentation">Ouvrez la fenêtre d'édition d'un élément (rendez-vous, contact ou tâche), en créant ou en modifiant cet élément.</p>
 <p role="presentation">Pour ce faire, cliquez sur <span class="guibutton"><strong>Ajouter une catégorie</strong></span> à côté de <span class="guibutton"><strong>Catégories</strong></span>. Sélectionnez <span class="guibutton"><strong>Gérer les catégories</strong></span>.</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Vous pouvez également utiliser le bouton <span class="guibutton"><strong>Gérer les catégories</strong></span>  dans les réglages généraux sous <span class="guibutton"><strong>Réglages avancés</strong></span>.</p></li></ul>
+</li>
+</ul></p>
 <p role="presentation">La fenêtre <span class="guilabel"><strong>Gérer les catégories</strong></span> s'ouvre alors.</p>
 </li>
 <li class="step">
@@ -69,41 +75,22 @@
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Créer de nouveaux rendez-vous</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Créer un nouveau contact</a>
+<p role="presentation" class="cap-webmail">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Par défaut, utiliser PGP dans le corps pour tout nouveau courriel</a>
           </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Créer une nouvelle tâche</a>
-          </p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modifier un rendez-vous</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utiliser des catégories pour les rendez-vous</a>
           </p>
 <p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Modifier des contacts ou des listes de diffusion</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utiliser des catégories pour les contacts</a>
           </p>
 <p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Modifier des tâches</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utiliser des catégories pour les tâches</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuster les réglages généraux</a>
           </p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Rechercher des rendez-vous</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Chercher des contacts</a>
-          </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Rechercher des tâches</a>
-          </p>
-</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.deputy.add.html b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.deputy.add.html
index 06abf4df6..b10fcf4ac 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.deputy.add.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.deputy.add.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Gérer les délégués">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Gérer les délégués">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="gérer les délégués">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="gérer les délégués">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html" title="Afficher, modifier, supprimer des délégués">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Organisation des données et partages</h1>
-<h2 class="sr-only">Gérer les délégués</h2>
+<h2 class="sr-only">gérer les délégués</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.add">
 <div class="titlepage"><div><div><h3 class="title">Ajout de délégués</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.8.2"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.add">Vous disposez des options suivantes : </p>
@@ -86,7 +86,7 @@
             </p></li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gérer les délégués</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gérer les délégués</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.deputy.edit.html b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
index fc82afe42..c5f863b66 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Gérer les délégués">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="gérer les délégués">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.add.html" title="Ajout de délégués">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.accounts.html" title="Gérer les comptes">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Organisation des données et partages</h1>
-<h2 class="sr-only">Gérer les délégués</h2>
+<h2 class="sr-only">gérer les délégués</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.edit">
 <div class="titlepage"><div><div><h3 class="title">Afficher, modifier, supprimer des délégués</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.9.2"></a><a class="indexterm" name="id-1.12.6.9.3"></a><a class="indexterm" name="id-1.12.6.9.4"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.edit">Vous disposez des options suivantes : </p>
@@ -81,7 +81,7 @@
             </p></li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gérer les délégués</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gérer les délégués</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.deputy.html b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.deputy.html
index a2c417387..5dd4c1e0d 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.deputy.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.deputy.html
@@ -1,7 +1,7 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Gérer les délégués</title>
+<title>gérer les délégués</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Organisation des données et partages</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.deputy">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Gérer les délégués</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">gérer les délégués</h2></div></div></div>
 <a class="indexterm" name="id-1.12.6.2"></a><a class="indexterm" name="id-1.12.6.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.deputy">Vous pouvez désigner d'autres utilisateurs comme <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">délégués</a>. Vous pouvez accorder différents niveaux de droits à un ou plusieurs délégués afin qu'ils puissent gérer en votre nom la communication par courriel et la planification des rendez-vous.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.deputy">Vous disposez des options suivantes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.sharing.examples.html b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
index 366cc9905..e09768e7d 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.dataorganisation.sharing.html" title="Partager des données">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html" title="Quels droits peuvent être accordés ?">
-<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Gérer les délégués">
+<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="gérer les délégués">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.sharing.share.html b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.sharing.share.html
index 1e0be5fb6..ad6171e08 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.sharing.share.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.dataorganisation.sharing.share.html
@@ -37,7 +37,7 @@
 <p class="title">Vous disposez des options suivantes :</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Dossiers de courrier électronique </p>
+<p role="presentation">dossiers de courrier électronique </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">Le dossier <span class="guibutton"><strong>Boîte de réception</strong></span>, ainsi que tous les dossiers et sous-dossiers de <span class="guibutton"><strong>Mes dossiers</strong></span>, peuvent être partagés avec les utilisateurs internes avec des droits d'accès en lecture.</p>
@@ -48,7 +48,7 @@
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">agenda </p>
+<p role="presentation">Agenda </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Les dossiers figurant dans <span class="guibutton"><strong>Mes agendas</strong></span> peuvent être partagés avec des utilisateurs internes, avec accès en lecture ou en écriture.</p></li>
 <li class="listitem"><p role="presentation">Le dossier <span class="guibutton"><strong>Mes agendas</strong></span> ne peut pas être partagé.</p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.content.html b/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.content.html
index aa71d108b..58f8c58b4 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.content.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.content.html
@@ -76,6 +76,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Afficher le contenu des dossiers <span class="phrase">Fichiers</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Afficher le contenu d'un fichier</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organisation des fichiers et dossiers <span class="phrase">Fichiers</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestion des données avec les dossiers</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Partager des données</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.foldertree.html b/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.foldertree.html
index aeb65b241..f408cd240 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.foldertree.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.foldertree.html
@@ -73,6 +73,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html">Créer des dossiers <span class="phrase">Fichiers</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">S'abonner à des dossiers <span class="phrase">Fichiers</span>public et partagés</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organisation des fichiers et dossiers <span class="phrase">Fichiers</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestion des données avec les dossiers</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Partager des données</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.toolbar.html b/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.toolbar.html
index b7ae089ca..85bf28363 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.toolbar.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.toolbar.html
@@ -76,20 +76,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Afficher le contenu des dossiers <span class="phrase">Fichiers</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Afficher le contenu d'un fichier</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.send.html">Envoyer des fichiers comme pièces jointes à un courriel</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Modifier des noms de fichiers</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Créer ou modifier des descriptions</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.move.html">Déplacer des fichiers ou dossiers <span class="phrase">Fichiers</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.copy.html">Copier des fichiers</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Enregistrer des fichiers en tant que PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Imprimer des fichiers au format PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.addportal.html">Ajouter des fichiers au portail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.favorite.html">Ajouter des fichiers ou dossiers <span class="phrase">Fichiers</span> aux favoris</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.delete.html">Supprimer des fichiers ou dossiers <span class="phrase">Fichiers</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.lock.html">Verrouiller ou déverrouiller des fichiers</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Travailler avec des versions</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organisation des fichiers et dossiers <span class="phrase">Fichiers</span></a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Chiffre ou déchiffrer des fichiers</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.toolbar">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.drive.gui.html">Les composants de <span class="phrase">Fichiers</span></a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.viewer.html b/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.viewer.html
index 14500a971..8ba856231 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.viewer.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.drive.gui.viewer.html
@@ -106,23 +106,9 @@
               <a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">Faire une présentation</a>
             </p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Modifier des noms de fichiers</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Créer ou modifier des descriptions</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Enregistrer des fichiers en tant que PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Imprimer des fichiers au format PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Travailler avec des versions</a>
-            </p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organisation des fichiers et dossiers <span class="phrase">Fichiers</span></a>
+            </p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-share_links cap-share_mail_attachments">
               <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Partager des données</a>
             </p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.drive.settings.html b/help/l10n/fr_FR/ox.appsuite.user.sect.drive.settings.html
index aded19ef6..ec905514b 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.drive.settings.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.drive.settings.html
@@ -51,13 +51,13 @@
 </div>
 <p id="ox.appsuite.user.reference.drive.settings">Suivant la configuration, vous disposez des réglages suivants :</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">ajouter des fichiers</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">Ajouter des fichiers</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.versionhistory">Historique des versions</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.advanced">Réglages avancés</a></p></li>
 </ul>
 <p>Voir aussi : <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Chercher des réglages</a></p>
 <p id="ox.appsuite.user.reference.drive.settings.adddrive"></p>
-<h3 class="title">ajouter des fichiers</h3>
+<h3 class="title">Ajouter des fichiers</h3>
 <p><a class="indexterm" name="id-1.11.17.6.2"></a>Définit si un nouveau fichier ou une nouvelle version d'un fichier potentiellement existant du même nom doit être créé. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><b>Ajouter une nouvelle version. </b>Une nouvelle version du fichier sera créée.</p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.accounts.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.accounts.html
index 69d0fff3b..7a6be3681 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.accounts.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.accounts.html
@@ -76,7 +76,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utiliser la messagerie unifiée</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Sélectionner une adresse d'expéditeur</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">sélectionner une adresse d'expéditeur</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Définir une adresse de réponse</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.attachments.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.attachments.html
index 5dd3f68a9..1377cfaf9 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.attachments.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="Courriel">
 <link rel="prev" href="ox.appsuite.user.sect.email.view.html" title="Afficher les courriels">
-<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
+<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.deputy.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.deputy.html
index aef882a39..96b59926b 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.deputy.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.deputy.html
@@ -91,12 +91,12 @@
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Créer, modifier ou gérer des rendez-vous en tant que délégué</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gérer les délégués</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gérer les délégués</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.email.deputy">Sujet parent : <a class="xref" href="ox.appsuite.user.chap.email.html"><i>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.create.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.create.html
index 5d5abe621..e7f77e0d7 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.create.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.create.html
@@ -62,7 +62,7 @@
 </li>
 <li class="listitem"><p role="presentation">Boutons <span class="guibutton"><strong>CC</strong></span>, <span class="guibutton"><strong>BCC</strong></span>. Ouvre les champ de saisie <span class="guibutton"><strong>CC</strong></span> ou <span class="guibutton"><strong>BCC</strong></span>.</p></li>
 <li class="listitem">
-<p role="presentation">Bouton <span class="guibutton"><strong>RE</strong></span>. Ouvre le champ de saisie <span class="guibutton"><strong>Rép. à</strong></span></p>
+<p role="presentation">Bouton <span class="guibutton"><strong>AW</strong></span>. Ouvre le champ de saisie <span class="guibutton"><strong>Rép. à</strong></span></p>
 <p role="presentation">Les réponses à votre courriel seront envoyées aux adresses électroniques saisies dans ce champ.</p>
 </li>
 <li class="listitem">
@@ -83,6 +83,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Envoyer</strong></span>. Envoie le courriel aux destinataires renseignés.</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.13.5.1.5"><p role="presentation"><span class="guibutton"><strong>Envoyer ultérieurement</strong></span>. Ouvre un menu qui vous permet de définir quand envoyer le courriel.</p></li>
 <li class="listitem">
 <p role="presentation">Barre de boutons </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -116,17 +117,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">La fenêtre d'édition</a></p></li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Répondre à des courriels</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Transmettre des courriels</a></p>
-<p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Utiliser les fonctions d'IA pour rédiger des courriels</a></p>
-<p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Envoyer ou recevoir des courriels en tant que délégué</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 <p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Envoyer des courriels chiffrés</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.email.gui.create">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Les composants de <span class="phrase">Courriel</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.detailview.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.detailview.html
index 357c1b177..78e25fe04 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.detailview.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.detailview.html
@@ -63,6 +63,7 @@
 <li class="listitem">
 <p role="presentation">Suivant la configuration, l'une des fonctions suivantes est disponible : </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">L'icône <span class="guibutton"><strong>Définir la catégorie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Ouvre un menu comportant des fonctions d'attribution et de gestion des catégories.</p></li>
 <li class="listitem"><p role="presentation">L'icône <span class="guibutton"><strong>Définir la couleur</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Ouvre un menu vous permettant d'attribuer une étiquette de couleur au courriel.</p></li>
 <li class="listitem"><p role="presentation">L'icône <span class="guibutton"><strong>Drapeau</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Affecte un drapeau au courriel.</p></li>
 </ul>
@@ -80,6 +81,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation">Si vous sélectionnez un courriel avec une pièce jointe dans le dossier des <span class="guibutton"><strong>Envoyé</strong></span>, des informations sur la pièce jointe sont affichées en haut du courriel.</p></li>
+<li class="listitem"><p role="presentation">Suivant la configuration et le cas échéant, les catégories attribuées sont affichées.</p></li>
 <li class="listitem">
 <p role="presentation">Texte du courriel</p>
 <p role="presentation">Les éléments cités des messages précédents sont marqués en début de ligne.</p>
@@ -95,15 +97,11 @@
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">Les fenêtres de <span class="phrase">Courriel</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">La fenêtre de rédaction de courrier</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Afficher les courriels</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Répondre à des courriels</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Afficher ou enregistrer les pièces jointes à un courriel</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.detailview">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Les composants de <span class="phrase">Courriel</span></a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.foldertree.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.foldertree.html
index 994342a6c..cee410577 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.foldertree.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.foldertree.html
@@ -54,7 +54,9 @@
 </ul>
 <p>Suivant la configuration et les réglages de courriel, des dossiers supplémentaires peuvent être disponibles. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Dossiers des courriels non lus, dossiers des messages marqués.</p></li>
+<li class="listitem"><p role="presentation">Dossier contenant les courriels marqués</p></li>
+<li class="listitem"><p role="presentation">Dossier contenant les courriels non lus</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.7.5.2.3"><p role="presentation">Dossier contenant les courriels qui seront envoyés ultérieurement</p></li>
 <li class="listitem"><p role="presentation">Dossiers de courriel partagés et publics auxquels vous êtes abonné.</p></li>
 <li class="listitem"><p role="presentation">Dossiers de comptes de courrier électronique fonctionnels qui vous ont été attribués par l'administrateur.</p></li>
 </ul>
@@ -67,10 +69,10 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Afficher les courriels</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Ajouter des dossiers de courrier électronique</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Activer ou désactiver des comptes de courrier électronique fonctionnels</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Activer ou désactiver des comptes de courrier électronique fonctionnels</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestion des données avec les dossiers</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Partager des données</a></p>
 </li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.html
index 0e5c177ce..ba078999d 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">Le bouton Nouveau message</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Courriel</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barre d'onglets de <span class="phrase">Courriel</span></a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barre des catégories de la boîte de réception</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">Les fenêtres de <span class="phrase">Courriel</span></a></p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.list.html
index a65a26af7..bf4cf9c17 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.list.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.list.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="Les composants de Courriel">
-<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barre d'onglets de Courriel">
+<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barre des catégories de la boîte de réception">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.detailview.html" title="La vue détaillée de Courriel">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -52,6 +52,7 @@
 <li class="listitem"><p role="presentation">Les détails suivants sont affichés pour chaque courriel : expéditeur, sujet, date de réception. Les courriels non lus sont signalés par l'icône <span class="guibutton"><strong>Non lu</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span>.</p></li>
 <li class="listitem"><p role="presentation">Une infobulle sur le nom d'un expéditeur affiche l'adresse électronique correspondante.</p></li>
 <li class="listitem"><p role="presentation">Des informations supplémentaires, lorsqu'elles sont disponibles, peuvent être affichées : icônes de pièces jointes, étiquettes de couleur, drapeau, nombre de courriels dans la <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">conversation</a>, priorité.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.10.5.1.7"><p role="presentation">Le cas échéant, les catégories attribuées seront affichées. Vous pouvez spécifier dans les réglages de courriel si les catégories attribuées sont affichées dans la vue en liste.</p></li>
 <li class="listitem"><p role="presentation">Les courriels chiffrés sont identifiés par l'icône Chiffré <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.encrypted"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Si un message d'absence est activé, une notification est affichée au-dessus de la vue en liste.</p>
@@ -69,12 +70,9 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">Le menu des réglages de <span class="phrase">Courriel</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Afficher les courriels</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.list">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Les composants de <span class="phrase">Courriel</span></a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.new.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.new.html
index 1d5816332..556a96eea 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.new.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.new.html
@@ -52,7 +52,7 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Ajouter des comptes de courrier électronique</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Afficher ou enregistrer les pièces jointes à un courriel</a></p>
 </li></ul>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.popup.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.popup.html
index a40eb86a8..4934d7ab9 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.popup.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.popup.html
@@ -71,8 +71,7 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p></li>
-<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Appeler l'expéditeur ou un autre destinataire</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Appeler l'expéditeur ou un autre destinataire</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Afficher des contacts dans la vue en halo</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.popup">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Les composants de <span class="phrase">Courriel</span></a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.settingsmenu.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.settingsmenu.html
index 157699603..5ff4d9ef7 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.settingsmenu.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.settingsmenu.html
@@ -59,7 +59,6 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Ajouter des comptes de courrier électronique</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Afficher ou enregistrer les pièces jointes à un courriel</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.tabs.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.tabs.html
index 1a676653b..d6f6b1af4 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.tabs.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.tabs.html
@@ -1,7 +1,7 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>La barre d'onglets de Courriel</title>
+<title>La barre des catégories de la boîte de réception</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
@@ -38,15 +38,14 @@
 <h2 class="sr-only">Les composants de <span class="phrase">Courriel</span>
 </h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.tabs">
-<div class="titlepage"><div><div><h3 class="title">La barre d'onglets de <span class="phrase">Courriel</span>
-</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">La barre des catégories de la boîte de réception</h3></div></div></div>
 <a class="indexterm" name="id-1.7.8.9.2"></a><p id="ox.appsuite.user.concept.email.gui.tabs">Affiche des onglets prédéfinis pour les courriels du dossier <span class="guibutton"><strong>Boîte de réception</strong></span>. Cela vous permet d'affecter les courriels entrants à certains onglets classés par expéditeur.</p>
 <p id="ox.appsuite.user.reference.email.gui.tabs">
         </p>
 <p class="title">Remarques :</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Suivant la configuration, les onglets de la boîte de réception peuvent être indisponibles.</p></li>
-<li class="listitem"><p role="presentation">Si les onglets de la boîte de réception sont disponibles, vous pouvez afficher ou masquer la barre d'onglets. Pour cela, cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Catégories de la boîte de réception</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Si les catégories de la boîte de réception sont disponibles, vous pouvez afficher ou masquer la barre de catégories. Pour cela, cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Catégories de la boîte de réception</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">Le nombre d'onglets de la boîte de réception, ainsi que leurs noms et leur ordre, sont prédéfinis. Suivant la configuration, certains onglets de la boîte de réception peuvent être renommés ou désactivés.</p></li>
 </ul>
 <p>
@@ -54,14 +53,9 @@
 <p id="ox.appsuite.user.related.email.gui.tabs">
         </p>
 <p class="title">Voir aussi :</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Travailler avec les catégories de la boîte de réception</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a>
-            </p></li>
-</ul>
+            </p></li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.reference.email.gui.tabs.parent">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Les composants de <span class="phrase">Courriel</span></a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.toolbar.html
index cee7412ce..13b94b4db 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.toolbar.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.gui.toolbar.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="Les composants de Courriel">
 <link rel="prev" href="ox.appsuite.user.sect.email.gui.foldertree.html" title="La vue des dossiers dans Courriel">
-<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barre d'onglets de Courriel">
+<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barre des catégories de la boîte de réception">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -49,7 +49,8 @@
 <li class="listitem"><p role="presentation">L'icône <span class="guibutton"><strong>Archiver</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.archive"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span>. Archive les courriels que vous avez sélectionnés.</p></li>
 <li class="listitem"><p role="presentation">Des icônes permettant de <span class="guibutton"><strong>répondre</strong></span> aux courriels sélectionnés ou de les <span class="guibutton"><strong>transférer</strong></span> : <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">Suivant la configuration : l'icône <span class="guibutton"><strong>Intégration de l'IA</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>. Ouvre un menu comportant des fonctions d'IA pour éditer le contenu du courriel.</p></li>
-<li class="listitem"><p role="presentation">L'icône <span class="guibutton"><strong>Définir la catégorie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Ouvre un menu vous permettant de déplacer un courriel vers une catégorie. Cette icône n'est disponible que si la barre d'onglets de la boîte de réception est affichée.</p></li>
+<li class="listitem"><p role="presentation">Suivant la configuration : l'icône <span class="guibutton"><strong>Définir la catégorie de la boîte de réception</strong></span>  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.inboxcategories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Ouvre un menu vous permettant de déplacer un courriel vers une catégorie de la boîte de réception. Cette icône n'est disponible que si la barre d'onglets de la boîte de réception est affichée.</p></li>
+<li class="listitem"><p role="presentation">Suivant la configuration : l'icône <span class="guibutton"><strong>Définir la catégorie</strong></span>  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Ouvre un menu comportant des fonctions d'attribution et de gestion des catégories.</p></li>
 <li class="listitem"><p role="presentation">Suivant la configuation : l'icône <span class="guibutton"><strong>Définir la couleur</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Ouvre un menu vous permettant d'attribuer une étiquette de couleur aux courriels sélectionnés.</p></li>
 <li class="listitem"><p role="presentation">Suivant la configuration : l'icône <span class="guibutton"><strong>Drapeau</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Affecte un drapeau au courriel.</p></li>
 <li class="listitem"><p role="presentation">L'icône <span class="guibutton"><strong>Déplacer</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.moveto"><object type="image/svg+xml" data="../../images/folder-symlink.svg" height="15"></object></span>. Déplace les courriels sélectionnés vers un autre dossier.</p></li>
@@ -63,25 +64,12 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barre d'onglets de <span class="phrase">Courriel</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Répondre à des courriels</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Transmettre des courriels</a></p>
 </li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Utiliser les fonctions d'IA pour répondre à des courriels</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Déplacer ou copier des courriels</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marquer des courriels comme lus ou non lus</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Classement des courriels</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Afficher le code source d'un message</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Utiliser les brouillons de message</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Créer des rappels de courriel</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Ajouter un courriel au portail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Enregistrement des courriels</a></p>
-<p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporter des courriels au format PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Imprimer des courriels</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Suppression de courriels</a></p>
-</li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Utiliser les fonctions d'IA pour répondre à des courriels</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.toolbar">Sujet supérieur : <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Les composants de <span class="phrase">Courriel</span></a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.addportal.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.addportal.html
index a06a6f35c..b95dc882e 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.addportal.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.addportal.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.addportal">
 <div class="titlepage"><div><div><h3 class="title">Ajouter un courriel au portail</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.15.2"></a><a class="indexterm" name="id-1.7.15.15.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">Vous pouvez ajouter un courriel comme composant du portail.</p>
+<a class="indexterm" name="id-1.7.15.16.2"></a><a class="indexterm" name="id-1.7.15.16.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">Vous pouvez ajouter un courriel comme composant du portail.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.addportal">
 <p class="title">Pour ajouter un courriel au portail :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.addportal"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.add.html">Ajout de composants au portail</a></p></li></ul>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.archive.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.archive.html
index 6e4ef5ad5..1581f2cbc 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.archive.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.archive.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.archive">
 <div class="titlepage"><div><div><h3 class="title">Archiver des courriels</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.20.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">Lorsque vous archivez des courriels, ceux-ci sont déplacés vers le dossier <span class="guibutton"><strong>Archives</strong></span>. Le dossier <span class="guibutton"><strong>Archives</strong></span> contient un sous-dossier distinct pour chaque année calendaire. Les courriels archivés sont enregistrés dans ces sous-dossiers et classés par année de réception. Le dossier <span class="guibutton"><strong>Archives</strong></span> est créé lorsque vous utilisez cette fonctionnalité pour la première fois. Vous disposez des options suivantes : </p>
+<a class="indexterm" name="id-1.7.15.21.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">Lorsque vous archivez des courriels, ceux-ci sont déplacés vers le dossier <span class="guibutton"><strong>Archives</strong></span>. Le dossier <span class="guibutton"><strong>Archives</strong></span> contient un sous-dossier distinct pour chaque année calendaire. Les courriels archivés sont enregistrés dans ces sous-dossiers et classés par année de réception. Le dossier <span class="guibutton"><strong>Archives</strong></span> est créé lorsque vous utilisez cette fonctionnalité pour la première fois. Vous disposez des options suivantes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">archiver un dossier de courriels datant de plus de 90 jours</p></li>
 <li class="listitem"><p role="presentation">archiver des courriels individuels</p></li>
@@ -61,14 +61,16 @@
 </li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.archive">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.archive"></p>
+<p class="title">Interface utilisateur :</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">Voir aussi :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Imprimer des courriels</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Imprimer des courriels</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.archive">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.categories.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.categories.html
new file mode 100644
index 000000000..e1e436df0
--- /dev/null
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.categories.html
@@ -0,0 +1,95 @@
+<html lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Par défaut, utiliser PGP dans le corps pour tout nouveau courriel</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuel de l'utilisateur">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gérer les courriels">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Collecter des adresses">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Classement des courriels">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Précédent</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Suivant</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Courriel</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gérer les courriels</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Par défaut, utiliser PGP dans le corps pour tout nouveau courriel</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.categories">Vous pouvez faire appel aux catégories pour organiser vos courriels indépendamment des agendas. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Vous pouvez attribuer des catégories aux courriels.</p></li>
+<li class="listitem"><p role="presentation">Vous pouvez afficher tous les courriels correspondant à une catégorie donnée.</p></li>
+</ul>
+<p> Vous pouvez créer, modifier ou supprimer vos catégories personnelles (voir <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>).</p>
+<p id="ox.appsuite.user.tip.email.manage.categories">Indépendamment des catégories, vous pouvez utiliser les catégories de la boîte de réception. Celles-ci vous permettent d'organiser vos courriels en fonction de l'expéditeur (voir <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Travailler avec les catégories de la boîte de réception</a>).</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.mark">
+<p class="title">Pour attribuer une catégorie à un courriel :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Sélectionnez un ou plusieurs courriels.</p></li>
+<li class="step">
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Définir une catégorie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.mark.add"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> dans la barre d'outils. Sélectionnez une catégorie.</p>
+<p role="presentation">Pour retirer une catégorie du courriel, cliquez sur celle-ci.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.view">
+<p class="title">Pour afficher les courriels associés à une catégorie spécifique :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Sélectionnez un courriel auquel une catégorie a été attribuée.</p></li>
+<li class="step"><p role="presentation">Cliquez sur la catégorie dans la vue détaillée.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Résultat : </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vue en liste affiche tous les courriels associés à cette catégorie.</p></li>
+<li class="listitem"><p role="presentation">Pour chaque courriel, le dossier contenant le courriel est affiché.</p></li>
+<li class="listitem"><p role="presentation">Pour revenir à la liste précédente, cliquez sur l'icône <span class="guibutton"><strong>Annuler la recherche</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> dans le champ de recherche.</p></li>
+</ul>
+          <p>Conseil : vous pouvez aussi utiliser la fonction de recherche et ses options pour rechercher une catégorie.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.categories"></p>
+<p class="title">Interface utilisateur :</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">Voir aussi :</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">Chercher des courriels</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utiliser des catégories pour les rendez-vous</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utiliser des catégories pour les contacts</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utiliser des catégories pour les tâches</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.categories">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.collectaddress.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.collectaddress.html
index 8c2fb1519..7ef09f790 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.collectaddress.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.collectaddress.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gérer les courriels">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.mark.html" title="Marquer des courriels comme lus ou non lus">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Classement des courriels">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="Par défaut, utiliser PGP dans le corps pour tout nouveau courriel">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.mark.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Suivant</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.categories.html">Suivant</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -40,7 +40,7 @@
 <div class="titlepage"><div><div><h3 class="title">Collecter des adresses</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.10.2"></a><a class="indexterm" name="id-1.7.15.10.3"></a><p id="ox.appsuite.user.concept.email.manage.collectaddress">Vous disposez des options suivantes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Recueillir automatiquement les nouvelles adresses de courrier électronique lorsque vous envoyez et recevez des messages en activant cette fonctionnalité dans les Réglages de courrier.</p></li>
+<li class="listitem"><p role="presentation">Recueillez automatiquement les nouvelles adresses de courrier électronique lorsque vous envoyez et recevez des messages en activant cette fonctionnalité dans les réglages de courrier avancés.</p></li>
 <li class="listitem"><p role="presentation">Ajouter à la main les adresses de courrier électronique à un carnet d'adresses</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.collectaddress">
@@ -56,16 +56,10 @@
           <p>Remarque : cette fonction n'est disponible que pour les nouveaux contacts.</p>
         </div>
 </div>
-<p role="presentation" class="cap-contacts">
-        <p class="title">Voir aussi :</p><ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Créer un nouveau contact</a>
-            </p></li>
-</ul>
-      </p>
+<p role="presentation" class="cap-contacts"><p class="title">Interface utilisateur :</p><ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p></li></ul> <p class="title">Voir aussi :</p><ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Créer un nouveau contact</a></p></li>
+</ul></p>
 <p id="ox.appsuite.user.parent.email.manage.collectaddress">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.delete.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.delete.html
index 415238765..1eb31e7ea 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.delete.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.delete.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gérer les courriels">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.archive.html" title="Archiver des courriels">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Nettoyer les dossiers de courrier électronique">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.recover.html" title="Récupération de courriels">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.archive.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Suivant</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.recover.html">Suivant</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -38,20 +38,20 @@
 <h2 class="sr-only">Gérer les courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Suppression de courriels</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.21.2"></a><a class="indexterm" name="id-1.7.15.21.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">Vous disposez des options suivantes : </p>
+<a class="indexterm" name="id-1.7.15.22.2"></a><a class="indexterm" name="id-1.7.15.22.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">Vous disposez des options suivantes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Définit si la suppression des courriels consiste à les déplacer vers la corbeille ou à les supprimer de façon définitive.</p>
-<p role="presentation">Les courriels déplacés vers la corbeille peuvent être récupérés.</p>
+<p role="presentation">Vous pouvez définir si la suppression des courriels consiste à les déplacer vers la corbeille ou à les supprimer de façon définitive. </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Les courriels déplacés vers la corbeille peuvent être récupérés.</p></li>
+<li class="listitem"><p role="presentation"><span class="cap-dumpster">Les courriels supprimés de manière définitive peuvent être récupérés pendant 14 jours. À expiration de cette période : </span> les courriels supprimés définitivement <span class="phrase"><strong>ne peuvent plus</strong></span> être récupérés.</p></li>
+</ul>
 </li>
-<li class="listitem"><p role="presentation">Supprimer des messages individuels ou des fils de discussion complets.</p></li>
-<li class="listitem"><p role="presentation">Supprimer tous les courriels d'un dossier.</p></li>
-<li class="listitem"><p role="presentation">Récupérer des courriels depuis la corbeille.</p></li>
-<li class="listitem"><p role="presentation">Supprimer définitivement les courriels de la corbeille.</p></li>
-<li class="listitem"><p role="presentation">Supprimer définitivement les courriels de la corbeille en la vidant.</p></li>
+<li class="listitem"><p role="presentation">Vous pouvez supprimer des messages individuels ou des fils de discussion complets.</p></li>
+<li class="listitem"><p role="presentation">Vous pouvez supprimer tous les courriels d'un dossier de courriel.</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.delete.setting">
-<p class="title">Comment définir si la suppression des courriels consiste à les déplacer vers la corbeille ou à les supprimer de façon définitive.</p>
+<p class="title">Pour définir si la suppression des courriels consiste à les déplacer vers la corbeille ou à les supprimer de façon définitive :</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.setting"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
@@ -65,21 +65,21 @@
 <li class="listitem"><p role="presentation">Si les courriels doivent être déplacés vers la corbeille, décochez l'option <span class="guibutton"><strong>Effacer définitivement les messages supprimés</strong></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Si les courriels doivent être supprimés de façon définitive, cochez l'option <span class="guibutton"><strong>Effacer définitivement les messages supprimés</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Attention :</strong></span> les messages supprimés définitivement <span class="phrase"><strong>ne peuvent pas</strong></span> être récupérés.</p>
+<p role="presentation"><span class="phrase"><strong>Attention :</strong></span> suivant la configuration, les messages supprimés définitivement <span class="phrase"><strong>ne peuvent pas</strong></span> être récupérés.</p>
 </li>
 </ul></p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.delete">
-<p class="title">Pour supprimer un courriel :</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.single">
+<p class="title">Pour supprimer des courriels individuels :</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Sélectionnez un ou plusieurs courriels.</p></li>
 <li class="step">
-<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Supprimer</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> dans la barre d'outils.</p>
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Supprimer</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> dans la barre d'outils.</p>
 <p role="presentation">ou : <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Utilisez les touches [Suppr] ou [Retour] du clavier.</p></li>
 <li class="listitem"><p role="presentation">Dans le menu contextuel d'un courriel, cliquez sur <span class="guibutton"><strong>Supprimer</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Si vous avez sélectionné un courriel individuel, utilisez l'icône <span class="guibutton"><strong>Supprimer</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> dans la vue détaillée.</p></li>
+<li class="listitem"><p role="presentation">Si vous avez sélectionné un courriel individuel, utilisez l'icône <span class="guibutton"><strong>Supprimer</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> dans la vue détaillée.</p></li>
 </ul></p>
 </li>
 </ol></div>
@@ -87,7 +87,7 @@
           <p>Résultat : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Si le réglage <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Effacer définitivement les messages supprimés</strong></span></a> est désactivé :</p>
+<p role="presentation">Si le réglage <span class="guibutton"><strong>Effacer définitivement les messages supprimés</strong></span> est désactivé :</p>
 <p role="presentation">Les courriels sont déplacés vers la corbeille.</p>
 </li>
 <li class="listitem">
@@ -97,17 +97,17 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptyfolder">
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.emptyfolder">
 <p class="title">Pour supprimer tous les messages d'un dossier :</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Dans la vue des dossiers, sélectionnez le dossier dont vous voulez supprimer les messages.</p></li>
 <li class="step">
 <p role="presentation">Utilisez l'une des méthodes suivantes : <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Actions</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> à côté du nom du dossier.</p></li>
-<li class="listitem"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Actions supplémentaires</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> au-dessus de la liste.</p></li>
+<li class="listitem"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Actions</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> à côté du nom du dossier.</p></li>
+<li class="listitem"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Actions supplémentaires</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> au-dessus de la liste.</p></li>
 </ul></p>
 <p role="presentation">Cliquez sur le bouton <span class="guibutton"><strong>Supprimer tous les messages</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Avertissement :</strong></span> Si le réglage <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Effacer définitivement les messages supprimés</strong></span></a> est activé, les courriels supprimés ne peuvent pas être récupérés.</p>
+<p role="presentation"><span class="phrase"><strong>Attention :</strong></span> Si le réglage <span class="guibutton"><strong>Effacer définitivement les messages supprimés</strong></span> est activé, les messages supprimés <span class="phrase"><strong>ne peuvent pas</strong></span> être récupérés, suivant la configuration.</p>
 </li>
 <li class="step"><p role="presentation">Confirmez que vous voulez supprimer le contenu de ce dossier.</p></li>
 </ol></div>
@@ -115,7 +115,7 @@
           <p>Résultat : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Si le réglage <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Effacer définitivement les messages supprimés</strong></span></a> est désactivé :</p>
+<p role="presentation">Si le réglage <span class="guibutton"><strong>Effacer définitivement les messages supprimés</strong></span> est désactivé :</p>
 <p role="presentation">Les courriels sont déplacés vers la corbeille.</p>
 </li>
 <li class="listitem">
@@ -125,60 +125,22 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
-<p class="title">Pour récupérer des messages supprimés :</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Ouvrez le dossier <span class="guibutton"><strong>Corbeille</strong></span> dans la vue des dossiers.</p></li>
-<li class="step"><p role="presentation">Sélectionnez un ou plusieurs courriels.</p></li>
-<li class="step"><p role="presentation">Dans le menu contextuel d'un courriel, cliquez sur <span class="guibutton"><strong>Déplacer</strong></span>.</p></li>
-<li class="step"><p role="presentation">Sélectionnez un dossier dans la fenêtre <span class="guilabel"><strong>Déplacer</strong></span>. Cliquez sur le bouton <span class="guibutton"><strong>Déplacer</strong></span>.</p></li>
-</ol></div>
-<div class="taskrelated">
-          <p>ou : </p>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Pour récupérer tous les courriels de la corbeille, cliquez sur l'icône<span class="guibutton"><strong>Options supplémentaires</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> au-dessus de la liste. Cliquez sur le bouton <span class="guibutton"><strong>Déplacer tous les messages</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Si vous avez sélectionné un courriel individuel, utilisez l'icône <span class="guibutton"><strong>Actions supplémentaires</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> dans la vue détaillée. Cliquez sur <span class="guibutton"><strong>Déplacer</strong></span>.</p></li>
-</ul>
-        </div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever">
-<p class="title">Pour supprimer définitivement un courriel :</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Attention :</strong></span> les messages supprimés définitivement <span class="phrase"><strong>ne peuvent pas</strong></span> être récupérés.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Ouvrez le dossier <span class="guibutton"><strong>Corbeille</strong></span> dans la vue des dossiers.</p></li>
-<li class="step"><p role="presentation">Sélectionnez un ou plusieurs courriels.</p></li>
-<li class="step">
-<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Supprimer</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> dans la barre d'outils.</p>
-<p role="presentation">Si vous avez sélectionné un courriel individuel, vous pouvez aussi utiliser l'icône <span class="guibutton"><strong>Supprimer</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> dans la vue détaillée.</p>
-</li>
-<li class="step"><p role="presentation">Confirmez que vous voulez supprimer définitivement les courriels sélectionnés.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptytrash">
-<p class="title">Pour supprimer définitivement le contenu du dossier Corbeille :</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Attention :</strong></span> les messages supprimés définitivement <span class="phrase"><strong>ne peuvent pas</strong></span> être récupérés.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Sélectionnez le dossier <span class="guibutton"><strong>Corbeille</strong></span> dans la vue des dossiers.</p></li>
-<li class="step">
-<p role="presentation">Utilisez l'une des méthodes suivantes : <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Actions supplémentaires</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> à côté de l'élément <span class="guibutton"><strong>Corbeille</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Actions supplémentaires</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> au-dessus de la liste.</p></li>
-</ul></p>
-<p role="presentation">Cliquez sur <span class="guibutton"><strong>Vider le dossier</strong></span>.</p>
-</li>
-<li class="step"><p role="presentation">Confirmez que vous voulez supprimer le contenu de ce dossier.</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.email.manage.delete"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Nettoyer les dossiers de courrier électronique</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Récupération de courriels</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Suppression de courriels</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.22.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Récupérer des courriels supprimés définitivement</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Nettoyer les dossiers de courrier électronique</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.email.manage.delete">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.deleteforever.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.deleteforever.html
new file mode 100644
index 000000000..1127ea61f
--- /dev/null
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.deleteforever.html
@@ -0,0 +1,92 @@
+<html lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Suppression de courriels</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuel de l'utilisateur">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gérer les courriels">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.recover.html" title="Récupération de courriels">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Récupérer des courriels supprimés définitivement">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.recover.html">Précédent</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Suivant</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Courriel</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gérer les courriels</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.deleteforever">
+<div class="titlepage"><div><div><h3 class="title">Suppression de courriels</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.24.2"></a><a class="indexterm" name="id-1.7.15.24.3"></a><p id="ox.appsuite.user.concept.email.manage.deleteforever">Vous disposez des options suivantes : </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Supprimer définitivement les courriels individuels de la corbeille.</p></li>
+<li class="listitem"><p role="presentation">Supprimer définitivement les courriels de la corbeille en la vidant.</p></li>
+</ul>
+<p id="ox.appsuite.user.hint.email.manage.deleteforever.html"><span class="cap-dumpster">Les courriels supprimés de manière définitive peuvent être récupérés pendant 14 jours. À expiration de cette période : </span> les courriels supprimés définitivement <span class="phrase"><strong>ne peuvent plus</strong></span> être récupérés.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.single">
+<p class="title">Pour supprimer définitivement des courriels individuels :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Ouvrez le dossier <span class="guibutton"><strong>Corbeille</strong></span> dans la vue des dossiers.</p></li>
+<li class="step"><p role="presentation">Sélectionnez un ou plusieurs courriels.</p></li>
+<li class="step">
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Supprimer</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> dans la barre d'outils.</p>
+<p role="presentation">Si vous avez sélectionné un courriel individuel, vous pouvez aussi utiliser l'icône <span class="guibutton"><strong>Supprimer</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> dans la vue détaillée.</p>
+</li>
+<li class="step"><p role="presentation">Confirmez que vous voulez supprimer définitivement les courriels sélectionnés.</p></li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.emptytrash">
+<p class="title">Pour supprimer définitivement tous les courriels de la corbeille :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Sélectionnez le dossier <span class="guibutton"><strong>Corbeille</strong></span> dans la vue des dossiers.</p></li>
+<li class="step">
+<p role="presentation">Utilisez l'une des méthodes suivantes : <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Actions supplémentaires</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> à côté de l'élément <span class="guibutton"><strong>Corbeille</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Actions supplémentaires</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> au-dessus de la liste.</p></li>
+</ul></p>
+<p role="presentation">Cliquez sur <span class="guibutton"><strong>Vider le dossier</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Confirmez que vous voulez supprimer le contenu de ce dossier.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.deleteforever"></p>
+<p class="title">Interface utilisateur :</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">Voir aussi :</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Suppression de courriels</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Récupération de courriels</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.24.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Récupérer des courriels supprimés définitivement</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Nettoyer les dossiers de courrier électronique</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.deleteforever">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.draft.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.draft.html
index db919c710..a1a992c4f 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.draft.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.draft.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.draft">
 <div class="titlepage"><div><div><h3 class="title">Utiliser les brouillons de message</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">Lorsque vous rédigez un courriel, celui-ci est automatiquement enregistré en tant que brouillon à intervalles réguliers. Les options suivantes sont disponibles :</p>
+<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">Lorsque vous rédigez un courriel, celui-ci est automatiquement enregistré en tant que brouillon à intervalles réguliers. Les options suivantes sont disponibles :</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Modifier ou envoyer un brouillon.</p></li>
 <li class="listitem"><p role="presentation">Modifier ou envoyer une copie d'un brouillon.</p></li>
@@ -69,11 +69,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.draft"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Utiliser les modèles</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.manage.draft">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.expungefolder.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.expungefolder.html
index 436a7a133..a59061fb8 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.expungefolder.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.expungefolder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gérer les courriels">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Suppression de courriels">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Récupérer des courriels supprimés définitivement">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.unifiedmail.html" title="Utiliser la messagerie unifiée">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Suivant</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.expungefolder">
 <div class="titlepage"><div><div><h3 class="title">Nettoyer les dossiers de courrier électronique</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.22.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Suivant des réglages du client de messagerie, les courriels que vous avez supprimés dans un client tel que Apple Mail, MS Outlook ou Mozilla Thunderbird peuvent n'être effectivement effacés qu'après votre déconnexion du client de messagerie. Entre temps, tous ces courriels apparaîtront barrés dans le logiciel de travail collaboratif. Pour supprimer ces courriels, nettoyez le dossier de courrier électronique.</p>
+<a class="indexterm" name="id-1.7.15.26.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Suivant des réglages du client de messagerie, les courriels que vous avez supprimés dans un client tel que Apple Mail, MS Outlook ou Mozilla Thunderbird peuvent n'être effectivement effacés qu'après votre déconnexion du client de messagerie. Entre temps, tous ces courriels apparaîtront barrés dans le logiciel de travail collaboratif. Pour supprimer ces courriels, nettoyez le dossier de courrier électronique.</p>
 <p id="ox.appsuite.user.hint.email.manage.expungefolder">Remarque : la configuration du serveur détermine si cette fonction est disponible ou non, car les courriels correspondants ne sont pas affichés.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.expunge">
 <p class="title">Pour nettoyer un dossier de courrier électronique :</p>
@@ -47,14 +47,12 @@
 <li class="step"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Actions</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.expungefolder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> à côté du nom du dossier. Choisissez <span class="guibutton"><strong>Nettoyer</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.expungefolder">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.expungefolder"></p>
+<p class="title">Interface utilisateur :</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Courriel</span></a></p></li></ul>
+<p> </p>
 <p class="title">Voir aussi :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Suppression de courriels</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Suppression de courriels</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.expungefolder">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.html
index 3ef77968c..2c2482ecc 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.html
@@ -43,17 +43,21 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Déplacer ou copier des courriels</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marquer des courriels comme lus ou non lus</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecter des adresses</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Par défaut, utiliser PGP dans le corps pour tout nouveau courriel</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Classement des courriels</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Afficher le code source d'un message</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Utiliser les brouillons de message</a></p></li>
-<li class="listitem cap-tasks" id="id-1.7.15.4.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Créer des rappels de courriel</a></p></li>
+<li class="listitem cap-tasks" id="id-1.7.15.4.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Créer des rappels de courriel</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Ajouter un courriel au portail</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Enregistrement des courriels</a></p></li>
-<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporter des courriels au format PDF</a></p></li>
+<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporter des courriels au format PDF</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importer des courriels</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Imprimer des courriels</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archiver des courriels</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Suppression de courriels</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Récupération de courriels</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Suppression de courriels</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.4.1.19"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Récupérer des courriels supprimés définitivement</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Nettoyer les dossiers de courrier électronique</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utiliser la messagerie unifiée</a></p></li>
 </ul>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.import.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.import.html
index e88beb143..7a3939a9d 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.import.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importer des courriels</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><p id="ox.appsuite.user.concept.email.manage.import">Vous pouvez importer un message au format EML.</p>
+<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.import">Vous pouvez importer un message au format EML.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.import">
 <p class="title">Pour importer un courriel :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,14 +46,15 @@
 <li class="step"><p role="presentation">Faites glisser le fichier eml depuis un navigateur de fichiers ou depuis le bureau vers la vue en liste des courriels.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.import"></p>
+<p class="title">Interface utilisateur :</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">Voir aussi :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Enregistrement des courriels</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Enregistrement des courriels</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.import">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.inboxcategories.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.inboxcategories.html
index 770ace8bc..6a6cfcaef 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.inboxcategories.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.inboxcategories.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation">assigner des courriels entrants à une catégorie de la boîte de réception</p></li>
 <li class="listitem"><p role="presentation">modifier la vue des catégories de la boîte de réception</p></li>
 </ul>
-<p role="presentation" class="feat-io-ox-core-categories">Remarque : les catégories de la boîte de réception décrites ici ne peuvent être utilisées que pour les courriels. Suivant la configuration, vous pouvez utiliser un système de catégories distinct pour les rendez-vous, les contacts et les tâches (voir la page <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>).</p>
+<p role="presentation" class="feat-io-ox-core-categories">Remarque : les catégories de la boîte de réception décrites ici ne peuvent être utilisées que pour les courriels. Suivant la configuration, vous pouvez utiliser un système distinct de catégories pour les courriels, les rendez-vous, les contacts et les tâches (voir <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Par défaut, utiliser PGP dans le corps pour tout nouveau courriel</a>).</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.inboxcategories.activate">
 <p class="title">Pour activer ou désactiver les onglets de la boîte de réception :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,7 @@
 <p role="presentation">Pour activer les onglets de la boîte de réception, cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.activate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Catégories de la boîte de réception</strong></span>.</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Vous pouvez également utiliser le bouton <span class="guibutton"><strong>Configurer les catégories de la boîte de réception</strong></span> sous <span class="guibutton"><strong>Lecture</strong></span> dans les réglages des courriels.</p></li></ul>
 <p role="presentation">La fenêtre <span class="guilabel"><strong>Configurer les catégories</strong></span> s'ouvre alors. Elle affiche les catégories disponibles pour la boîte de réception. Cliquez sur <span class="guibutton"><strong>Activer les catégories</strong></span>.</p>
-<p role="presentation">La barre d'onglets sera alors affichée à droite, sous la barre de menu.</p>
+<p role="presentation">La barre des catégories sera alors affichée sous la barre de menu.</p>
 </li>
 <li class="step">
 <p role="presentation">Pour désactiver les onglets de la boîte de réception, cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.deactivate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Catégories de la boîte de réception</strong></span>.</p>
@@ -68,7 +68,7 @@
 <p role="presentation">Les courriels n'ayant pas encore été assignés à une catégoriede la boîte de réception figurent dans l'onglet <span class="guibutton"><strong>Général</strong></span>.</p>
 </li>
 <li class="step">
-<p role="presentation">Faites glisser un courriel de la vue en liste vers un onglet de la barre d'onglets pour l'y déposer.</p>
+<p role="presentation">Faites glisser un courriel de la vue en liste vers une catégorie de la barre de catégories de la boîte de réception pour l'y déposer.</p>
 <p role="presentation">Vous pouvez également sélectionner un courriel. Cliquez sur l'icône <span class="guibutton"><strong>Définir la catégorie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span> dans la barre d'outils. Choisissez un onglet dans le menu.</p>
 </li>
 <li class="step"><p role="presentation">Pour conclure le processus, effectuez l'une des actions suivantes : <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -82,14 +82,14 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Catégories de la boîte de réception</strong></span>.</p>
-<p role="presentation">Vos pouvez aussi cliquer sur l'icône <span class="guibutton"><strong>Configurer les catégories</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> dans la barre de catégories.</p>
+<p role="presentation">Vos pouvez aussi cliquer sur l'icône <span class="guibutton"><strong>Configurer les catégories</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> dans la barre de catégories de la boîte de réception.</p>
 <p role="presentation">La fenêtre <span class="guilabel"><strong>Configurer les catégories</strong></span> s'ouvre alors.</p>
 </li>
 <li class="step">
 <p role="presentation">Pour activer ou désactiver une catégorie de la boîte de réception, activez ou désactivez la case à cocher correspondante.</p>
 <p role="presentation">Pour renommer une catégorie de la boîte de réception, modifiez le texte correspondant.</p>
 <p role="presentation">Remarque : certaines catégories ne peuvent pas être modifiées.</p>
-<p role="presentation">Pour masquer la barre de catégories, cliquez sur <span class="guibutton"><strong>Désactiver les catégories</strong></span>.</p>
+<p role="presentation">Pour masquer la barre de catégories de la boîte de réception, cliquez sur <span class="guibutton"><strong>Désactiver les catégories</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">Cliquez sur <span class="guibutton"><strong>Enregistrer</strong></span>.</p></li>
 </ol></div>
@@ -98,14 +98,11 @@
 <p class="title">Interface utilisateur :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">Le menu des réglages de <span class="phrase">Courriel</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barre d'onglets de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barre des catégories de la boîte de réception</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Afficher les courriels</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.inboxcategories">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.label.html
index 13552ca61..0834adb7e 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.label.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.label.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gérer les courriels">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Collecter des adresses">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="Par défaut, utiliser PGP dans le corps pour tout nouveau courriel">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.source.html" title="Afficher le code source d'un message">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.categories.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.source.html">Suivant</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.label">
 <div class="titlepage"><div><div><h3 class="title">Classement des courriels</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Suivant la configuration, vous pouvez utiliser l'une des options suivantes pour classer vos courriels : </p>
+<a class="indexterm" name="id-1.7.15.12.2"></a><a class="indexterm" name="id-1.7.15.12.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Suivant la configuration, vous pouvez utiliser l'une des options suivantes pour classer vos courriels : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">des étiquettes de couleur</p></li>
 <li class="listitem"><p role="presentation">un drapeau</p></li>
@@ -69,7 +69,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.label"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.mark.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.mark.html
index 521ade96c..3b1069aad 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.mark.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.mark.html
@@ -62,7 +62,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.mark"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Afficher les courriels</a></p></li></ul>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.movecopy.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.movecopy.html
index 9194cd939..4a60961be 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.movecopy.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.movecopy.html
@@ -67,7 +67,11 @@
 </ul>
 <p id="ox.appsuite.user.related.email.manage.movecopy"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.pdfexport.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.pdfexport.html
index 1336969bc..6c70663b0 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.pdfexport.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.pdfexport.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.pdfexport">
 <div class="titlepage"><div><div><h3 class="title">Exporter des courriels au format PDF</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.17.2"></a><a class="indexterm" name="id-1.7.15.17.3"></a><a class="indexterm" name="id-1.7.15.17.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Remarque : cette fonction peut être indisponible suivant la configuration.</p>
+<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><a class="indexterm" name="id-1.7.15.18.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Remarque : cette fonction peut être indisponible suivant la configuration.</p>
 <p id="ox.appsuite.user.concept.email.manage.pdfexport">Vous pouvez exporter un courriel ainsi que ses pièces jointes (au format docx)  en tant que PDF. Dès que le fichier PDF est créé, il est enregistré dans un dossier <span class="phrase">Fichiers</span> que vous pouvez définir. Selon le volume de données, le téléchargement peut prendre un certain temps. Dès que le processus est terminé, vous recevez une notification.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.pdfexport">
 <p class="title">Pour exporter des courriels au format PDF :</p>
@@ -54,7 +54,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.pdfexport"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Enregistrement des courriels</a></p></li></ul>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.print.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.print.html
index 5426e4502..b707db856 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.print.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Imprimer des courriels</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.print">Vous pouvez imprimer le contenu d'un ou plusieurs courriels.</p>
+<a class="indexterm" name="id-1.7.15.20.2"></a><a class="indexterm" name="id-1.7.15.20.3"></a><p id="ox.appsuite.user.concept.email.manage.print">Vous pouvez imprimer le contenu d'un ou plusieurs courriels.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.print">
 <p class="title">Pour imprimer le contenu d'un courriel :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -56,7 +56,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.print"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archiver des courriels</a></p></li></ul>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.recover.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.recover.html
new file mode 100644
index 000000000..925b696a8
--- /dev/null
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.recover.html
@@ -0,0 +1,97 @@
+<html lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Récupération de courriels</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuel de l'utilisateur">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gérer les courriels">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Suppression de courriels">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Suppression de courriels">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Précédent</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Suivant</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Courriel</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gérer les courriels</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.recover">
+<div class="titlepage"><div><div><h3 class="title">Récupération de courriels</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.recover">Vous disposez des options suivantes : </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Récupérer des courriels individuels depuis la corbeille.</p></li>
+<li class="listitem"><p role="presentation">Récupérer tous les courriels depuis la corbeille.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.single">
+<p class="title">Pour récupérer des individuels courriels depuis la corbeille :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Ouvrez le dossier <span class="guibutton"><strong>Corbeille</strong></span> dans la vue des dossiers.</p></li>
+<li class="step">
+<p role="presentation">Sélectionnez un ou plusieurs courriels.</p>
+<p role="presentation">Dans le menu contextuel d'un courriel, cliquez sur <span class="guibutton"><strong>Déplacer</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Choisissez un dossier dans la fenêtre <span class="guilabel"><strong>Déplacer</strong></span>. Cliquez sur <span class="guibutton"><strong>Déplacer</strong></span>.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>ou : </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Utiliser le glisser / déposer pour déplacer les courriels de la corbeille vers un dossier dans la vue des dossiers.</p></li>
+<li class="listitem"><p role="presentation">Si vous avez sélectionné un courriel individuel, utilisez l'icône <span class="guibutton"><strong>Actions supplémentaires</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.single.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> dans la vue détaillée. Cliquez sur <span class="guibutton"><strong>Déplacer</strong></span>.</p></li>
+</ul>
+        </div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.all">
+<p class="title">Pour récupérer tous les courriels depuis la corbeille :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Sélectionnez le dossier <span class="guibutton"><strong>Corbeille</strong></span> dans la vue des dossiers.</p></li>
+<li class="step">
+<p role="presentation">Utilisez l'une des méthodes suivantes : <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Actions supplémentaires</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> à côté de l'élément <span class="guibutton"><strong>Corbeille</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Actions supplémentaires</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> au-dessus de la liste.</p></li>
+</ul></p>
+<p role="presentation">Cliquez sur le bouton <span class="guibutton"><strong>Déplacer tous les messages</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Sélectionnez un dossier dans la fenêtre <span class="guilabel"><strong>Déplacer</strong></span>. Cliquez sur le bouton <span class="guibutton"><strong>Tout déplacer</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.recover"></p>
+<p class="title">Interface utilisateur :</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">Voir aussi :</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Suppression de courriels</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Suppression de courriels</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.23.7.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Récupérer des courriels supprimés définitivement</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Nettoyer les dossiers de courrier électronique</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.recover">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.reminder.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.reminder.html
index 7bcf42419..8d3ab3fe6 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.reminder.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.reminder.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.reminder">
 <div class="titlepage"><div><div><h3 class="title">Créer des rappels de courriel</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">Vous pouvez demander un rappel pour un courriel. Cette fonctionnalité crée une tâche pour vous rappeler la date d'échéance.</p>
+<a class="indexterm" name="id-1.7.15.15.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">Vous pouvez demander un rappel pour un courriel. Cette fonctionnalité crée une tâche pour vous rappeler la date d'échéance.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.email.manage.reminder">
 <p class="title">Pour créer un rappel de courrier électronique :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.reminder"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Créer une nouvelle tâche</a></p></li></ul>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.save.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.save.html
index d90a5eb45..ebdb30409 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.save.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.save.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.save">
 <div class="titlepage"><div><div><h3 class="title">Enregistrement des courriels</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.16.2"></a><p id="ox.appsuite.user.concept.email.manage.save">Vous pouvez enregistrer le courriel comme fichier texte. Le fichier texte possède l'extension EML. Si vous sélectionnez plusieurs courriels, un fichier EML sera créé pour chaque message. Ils seront ensuite compressés dans une archive ZIP.</p>
+<a class="indexterm" name="id-1.7.15.17.2"></a><p id="ox.appsuite.user.concept.email.manage.save">Vous pouvez enregistrer le courriel comme fichier texte. Le fichier texte possède l'extension EML. Si vous sélectionnez plusieurs courriels, un fichier EML sera créé pour chaque message. Ils seront ensuite compressés dans une archive ZIP.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.save">
 <p class="title">Pour enregistrer un courriel :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.save"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -57,7 +60,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importer des courriels</a></p>
 <p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporter des courriels au format PDF</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.7.15.16.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Télécharger les données personnelles</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.7.15.17.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Télécharger les données personnelles</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.save">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.source.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.source.html
index b7f8deb35..676ee3828 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.source.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.source.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.source">
 <div class="titlepage"><div><div><h3 class="title">Afficher le code source d'un message</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.12.2"></a><p id="ox.appsuite.user.concept.email.manage.source">Le code source d'un message électronique représente son contenu complet, y compris toutes les données de ses en-têtes.</p>
+<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.source">Le code source d'un message électronique représente son contenu complet, y compris toutes les données de ses en-têtes.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.source">
 <p class="title">Pour afficher le code source du message :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.source"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barre d'outils de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.undelete.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.undelete.html
new file mode 100644
index 000000000..59de651e7
--- /dev/null
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.undelete.html
@@ -0,0 +1,75 @@
+<html lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Récupérer des courriels supprimés définitivement</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuel de l'utilisateur">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gérer les courriels">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Suppression de courriels">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Nettoyer les dossiers de courrier électronique">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Précédent</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Suivant</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Courriel</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gérer les courriels</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.undelete">
+<div class="titlepage"><div><div><h3 class="title">Récupérer des courriels supprimés définitivement</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.25.2"></a><a class="indexterm" name="id-1.7.15.25.3"></a><p id="ox.appsuite.user.concept.email.manage.undelete.html">Vous pouvez récupérer des courriels supprimés définitivement pendant 14 jours. À expiration de cette période, les courriels supprimés définitivement sont irrévocablement perdus.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
+<p class="title">Pour récupérer des courriels supprimés définitivement :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Sélectionnez le dossier <span class="guibutton"><strong>Corbeille</strong></span> dans la vue des dossiers.</p></li>
+<li class="step">
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Actions supplémentaires</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> à côté de l'élément <span class="guibutton"><strong>Corbeille</strong></span>.</p>
+<p role="presentation">Cliquez sur <span class="guibutton"><strong>Récupérer les éléments supprimés</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Sélectionnez les courriels à récupérer dans la fenêtre <span class="guilabel"><strong>Récupérer les éléments supprimés</strong></span>.</p>
+<p role="presentation">Cliquez sur <span class="guibutton"><strong>Déplacer les éléments sélectionnés</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Dans la fenêtre <span class="guilabel"><strong>Déplacer</strong></span>, spécifiez quel dossier doit héberger les courriels récupérés.</p>
+<p role="presentation">Cliquez sur <span class="guibutton"><strong>Déplacer</strong></span>.</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.undelete"></p>
+<p class="title">Interface utilisateur :</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Courriel</span></a></p></li></ul>
+<p> </p>
+<p class="title">Voir aussi :</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Suppression de courriels</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Récupération de courriels</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Suppression de courriels</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Nettoyer les dossiers de courrier électronique</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.undelete">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gérer les courriels</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.unifiedmail.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.unifiedmail.html
index 946d38b4b..f11373671 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.unifiedmail.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.manage.unifiedmail.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.unifiedmail">
 <div class="titlepage"><div><div><h3 class="title">Utiliser la messagerie unifiée</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">La messagerie unifiée vous permet d'afficher dans un seul dossier central les messages provenant de plusieurs comptes de courrier électronique. Cela vous donne une vue d'ensemble rapide sur les boîtes de réception de plusieurs comptes de courrier. La messagerie unifiée peut être décrite ainsi : </p>
+<a class="indexterm" name="id-1.7.15.27.2"></a><a class="indexterm" name="id-1.7.15.27.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">La messagerie unifiée vous permet d'afficher dans un seul dossier central les messages provenant de plusieurs comptes de courrier électronique. Cela vous donne une vue d'ensemble rapide sur les boîtes de réception de plusieurs comptes de courrier. La messagerie unifiée peut être décrite ainsi : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">En plus de la boîte de réception d'un compte de courrier électronique, le dossier <span class="guibutton"><strong>Messagerie unifiée</strong></span> reprend la vue existante des courriels de ce compte. Les messages n'existent donc qu'en un seul exemplaire.</p></li>
 <li class="listitem"><p role="presentation">Les messages des sous-dossiers de la boîte de réception ne s'affichent pas dans le dossier <span class="guibutton"><strong>Messagerie unifiée</strong></span>.</p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.openai.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.openai.html
index 48a970a65..a4e9a3a21 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.openai.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.openai.html
@@ -42,7 +42,7 @@
 <li class="listitem"><p role="presentation">modifier le contenu de courriels existants ou générer des suggestions de texte pour y répondre</p></li>
 <li class="listitem"><p role="presentation">générer des suggestions de texte pour de nouveaux courriels</p></li>
 </ul>
-<p> Remarque : lorsque vous utilisez l'intégration de l'IA, le contenu du courriel correspondant sera envoyé au service Azure OpenAI de Microsoft. </p>
+<p> Remarque : lorsque vous utilisez l'intégration de l'IA, le contenu du courriel correspondant sera envoyé à un service OpenAI. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">La première fois que vous utilisez une fonction d'IA, une boîte de dialogue s'ouvre afin de demander votre accord pour l'envoi de données. Vous ne pourrez utiliser les fonctions d'IA qu'après avoir consenti à l'envoi des données.</p></li>
 <li class="listitem"><p role="presentation">Vous pouvez à tout moment révoquer votre consentement à l'envoi des données. Pour ce faire, cliquez sur <span class="guibutton"><strong>Modifier le consentement</strong></span> sous <span class="guibutton"><strong>Intégration de l'IA</strong></span> dans les réglages de courriel.</p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.openai.send.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.openai.send.html
index 4babffeb4..b3b82b7f6 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.openai.send.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.openai.send.html
@@ -64,7 +64,7 @@
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Utiliser les fonctions d'IA pour répondre à des courriels</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.email.openai.send">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Utiliser l'intégration de l'IA</a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.search.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.search.html
index 6a3939ef8..4e62d765f 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.search.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.search.html
@@ -101,9 +101,14 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">Afficher les courriels</a>
           </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Classement des courriels</a>
-          </p></li>
+          </p>
+<p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Par défaut, utiliser PGP dans le corps pour tout nouveau courriel</a>
+          </p>
+</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attachmentexisting.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attachmentexisting.html
index 19bb7f454..5f633d806 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attachmentexisting.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attachmentexisting.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="Ajouter des pièces jointes">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Envoyer des pièces jointes sous forme de liens">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="ajouter des pièces jointes">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="envoyer des pièces jointes sous forme de liens">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envoyer des courriels</h2>
+<h2 class="sr-only">envoyer des courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentexisting">
 <div class="titlepage"><div><div><h3 class="title">Ajouter des pièces jointes de courriels existants</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.9.2"></a><a class="indexterm" name="id-1.7.11.9.3"></a><p id="ox.appsuite.user.concept.email.send.attachmentexisting">Suivant la configuration, vous pouvez ajouter des pièces jointes à un nouveau courriel à partir de courriels existants.</p>
@@ -59,14 +59,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachmentexisting"></p>
 <p class="title">Action de niveau supérieur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p></li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Ajouter des pièces jointes</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envoyer des pièces jointes sous forme de liens</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">ajouter des pièces jointes</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">envoyer des pièces jointes sous forme de liens</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attachmentlink.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attachmentlink.html
index 694f812f7..ff2d78597 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attachmentlink.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attachmentlink.html
@@ -1,11 +1,11 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Envoyer des pièces jointes sous forme de liens</title>
+<title>envoyer des pièces jointes sous forme de liens</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Ajouter des pièces jointes de courriels existants">
 <link rel="next" href="ox.appsuite.user.sect.email.send.templates.html" title="Utiliser les modèles">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Envoyer des courriels</h2>
+<h2 class="sr-only">envoyer des courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentlink">
-<div class="titlepage"><div><div><h3 class="title">Envoyer des pièces jointes sous forme de liens</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">envoyer des pièces jointes sous forme de liens</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.10.2"></a><p id="ox.appsuite.user.concept.email.send.attachmentlink">Cette fonction permet d'envoyer des pièces jointes très volumineuses par courriel. Voici comment elle fonctionne : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Les pièces jointes sont transférées vers un nouveau dossier apparaissant sous <span class="guibutton"><strong>Drive Mail</strong></span> dans l'application <span class="phrase">Fichiers</span>. Le nom de ce dossier correspond au sujet du courriel. Le dossier est partagé à travers un lien public.</p></li>
@@ -89,14 +89,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.attachmentlink"></p>
 <p class="title">Action de niveau supérieur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p></li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Ajouter des pièces jointes</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">ajouter des pièces jointes</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Ajouter des pièces jointes de courriels existants</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachmentlink">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachmentlink">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attachments.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attachments.html
index d4a40d2de..8b3fa338a 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attachments.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attachments.html
@@ -1,11 +1,11 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Ajouter des pièces jointes</title>
+<title>ajouter des pièces jointes</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.replyto.html" title="Définir une adresse de réponse">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Ajouter des pièces jointes de courriels existants">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Envoyer des courriels</h2>
+<h2 class="sr-only">envoyer des courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachments">
-<div class="titlepage"><div><div><h3 class="title">Ajouter des pièces jointes</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">ajouter des pièces jointes</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.8.2"></a><a class="indexterm" name="id-1.7.11.8.3"></a><p id="ox.appsuite.user.concept.emal.add.attachments">Suivant la configuration, vous pouvez joindre des fichiers enregistrés sur votre ordinateur ou dans l'application <span class="phrase">Fichiers</span>.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.attachments">
 <p class="title">Pour ajouter des pièces jointes dans la fenêtre de rédaction de courriel :</p>
@@ -62,14 +62,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachments"></p>
 <p class="title">Action de niveau supérieur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p></li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Ajouter des pièces jointes de courriels existants</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envoyer des pièces jointes sous forme de liens</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">envoyer des pièces jointes sous forme de liens</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachments">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachments">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attendees.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attendees.html
index 7797dd9ff..d88348d93 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attendees.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Faire suivre automatiquement des courriels">
 <link rel="next" href="ox.appsuite.user.sect.email.send.vacationnotice.html" title="Envoi automatique d'un message d'absence">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envoyer des courriels</h2>
+<h2 class="sr-only">envoyer des courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attendees">
 <div class="titlepage"><div><div><h3 class="title">Envoyer un courriel aux participants du rendez-vous</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.16.2"></a><div class="task" id="ox.appsuite.user.task.email.send.attendees">
@@ -51,25 +51,16 @@
 <li class="step"><p role="presentation">Saisissez les détails requis pour l'envoi du courriel.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.send.attendees">
-        </p>
+<p id="ox.appsuite.user.related.email.send.attendees"></p>
+<p class="title">Interface utilisateur :</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barre d'outils <span class="phrase">Agenda</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">Voir aussi :</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">Les fenêtres de <span class="phrase">Agenda</span></a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barre d'outils <span class="phrase">Agenda</span></a>
-            </p>
-</li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a>
-            </p></li>
-</ul>
-<p>
-      </p>
-<p id="ox.appsuite.user.parent.email.send.attendees">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p></li></ul>
+<p id="ox.appsuite.user.parent.email.send.attendees">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.autoforward.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.autoforward.html
index c7ad059db..6bbf5fb95 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.autoforward.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.autoforward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.forward.html" title="Transmettre des courriels">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attendees.html" title="Envoyer un courriel aux participants du rendez-vous">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envoyer des courriels</h2>
+<h2 class="sr-only">envoyer des courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.autoforward">
 <div class="titlepage"><div><div><h3 class="title">Faire suivre automatiquement des courriels</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.15.2"></a><p id="ox.appsuite.user.concept.email.send.autoforward">Vous pouvez faire suivre automatiquement les courriers électroniques à une autre adresse.</p>
@@ -67,7 +67,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a>
+              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Répondre à des courriels</a>
@@ -90,7 +90,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.email.send.autoforward">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p id="ox.appsuite.user.parent.email.send.autoforward">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.forward.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.forward.html
index 746f4ed79..bec904a8e 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.forward.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.forward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.reply.html" title="Répondre à des courriels">
 <link rel="next" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Faire suivre automatiquement des courriels">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envoyer des courriels</h2>
+<h2 class="sr-only">envoyer des courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.forward">
 <div class="titlepage"><div><div><h3 class="title">Transmettre des courriels</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.14.2"></a><p id="ox.appsuite.user.concept.email.send.forward">Si vous transférez un courriel, certains des champs de saisie du courriel sont pré-remplis :</p>
@@ -74,11 +74,11 @@
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Répondre à des courriels</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Faire suivre automatiquement des courriels</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.forward">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p id="ox.appsuite.user.parent.email.send.forward">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.html
index 116b20f58..872caefc2 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.html
@@ -1,13 +1,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Envoyer des courriels</title>
+<title>envoyer des courriels</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="Courriel">
 <link rel="prev" href="ox.appsuite.user.sect.email.attachments.html" title="Afficher ou enregistrer les pièces jointes à un courriel">
-<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Envoyer un nouveau message électronique">
+<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Envoyer un nouveau courriel">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -36,15 +36,15 @@
     
   </h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.send">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Envoyer des courriels</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">envoyer des courriels</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.email.send">Découvrez comment envoyer un courriel, ainsi que les fonctions disponibles pour personnaliser le contenu de vos courriels : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Sélectionner une adresse d'expéditeur</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">sélectionner une adresse d'expéditeur</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Définir une adresse de réponse</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Ajouter des pièces jointes</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">ajouter des pièces jointes</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Ajouter des pièces jointes de courriels existants</a></p></li>
-<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envoyer des pièces jointes sous forme de liens</a></p></li>
+<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">envoyer des pièces jointes sous forme de liens</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.11.2.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Utiliser les modèles</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Utiliser des signatures</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Répondre à des courriels</a></p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.new.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.new.html
index 7e0982590..ae8ee67de 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.new.html
@@ -1,13 +1,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Envoyer un nouveau message électronique</title>
+<title>Envoyer un nouveau courriel</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
-<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="Sélectionner une adresse d'expéditeur">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
+<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="sélectionner une adresse d'expéditeur">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Envoyer des courriels</h2>
+<h2 class="sr-only">envoyer des courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.new">
-<div class="titlepage"><div><div><h3 class="title">Envoyer un nouveau message électronique</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Envoyer un nouveau courriel</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.5.2"></a><a class="indexterm" name="id-1.7.11.5.3"></a><a class="indexterm" name="id-1.7.11.5.4"></a><div class="task" id="ox.appsuite.user.task.email.send.new">
 <p class="title">Pour envoyer un nouveau message :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -93,37 +93,26 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">Le bouton Nouveau message</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">La fenêtre de rédaction de courrier</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Actions subordonnées :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Ajouter automatiquement des contacts ou des ressources depuis un carnet d'adresses</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Ajouter automatiquement des contacts ou des ressources depuis le répertoire des adresses</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Sélectionner une adresse d'expéditeur</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">sélectionner une adresse d'expéditeur</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Définir une adresse de réponse</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Ajouter des pièces jointes</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">ajouter des pièces jointes</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Ajouter des pièces jointes de courriels existants</a></p>
-<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Envoyer des pièces jointes sous forme de liens</a></p>
+<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">envoyer des pièces jointes sous forme de liens</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Utiliser les modèles</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Utiliser des signatures</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Répondre à des courriels</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Transmettre des courriels</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Faire suivre automatiquement des courriels</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Envoyer un courriel aux participants du rendez-vous</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Envoi automatique d'un message d'absence</a></p>
-<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Envoyer des courriels chiffrés</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Envoyer des contacts sous forme de vCard</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Envoyer des courriels à partir du carnet d'adresses</a></p>
-</li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Utiliser les fonctions d'IA pour rédiger des courriels</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Utiliser les fonctions d'IA pour rédiger des courriels</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.new">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p id="ox.appsuite.user.parent.email.send.new">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.reply.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.reply.html
index b9ecbee5a..98f025fef 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.reply.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.reply.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.signatures.html" title="Utiliser des signatures">
 <link rel="next" href="ox.appsuite.user.sect.email.send.forward.html" title="Transmettre des courriels">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envoyer des courriels</h2>
+<h2 class="sr-only">envoyer des courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.reply">
 <div class="titlepage"><div><div><h3 class="title">Répondre à des courriels</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.13.2"></a><p id="ox.appsuite.user.concept.email.send.reply">Lorsque vous répondez à un courriel, certains des champs du message sont pré-remplis : </p>
@@ -70,13 +70,13 @@
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Transmettre des courriels</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Envoi automatique d'un message d'absence</a></p>
 </li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.11.13.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Utiliser les fonctions d'IA pour répondre à des courriels</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.reply">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p id="ox.appsuite.user.parent.email.send.reply">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.replyto.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.replyto.html
index 4fd0c851e..1463bac16 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.replyto.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.replyto.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="Sélectionner une adresse d'expéditeur">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="Ajouter des pièces jointes">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="sélectionner une adresse d'expéditeur">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="ajouter des pièces jointes">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envoyer des courriels</h2>
+<h2 class="sr-only">envoyer des courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.replyto">
 <div class="titlepage"><div><div><h3 class="title">Définir une adresse de réponse</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.7.2"></a><p id="ox.appsuite.user.concept.email.send.replyto">Par défaut, lorsqu'un destinataire répond à votre courriel, la réponse est envoyée au compte de courrier à partir duquel vous avez envoyé le courriel. Vous pouvez aussi utiliser la fenêtre de rédaction de courrier pour spécifier des adresses électroniques auxquelles envoyer toute réponse à votre courriel.</p>
@@ -43,8 +43,8 @@
 <p class="title">Pour sélectionner une adresse de réponse dans la fenêtre de rédaction de courrier :</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Dans la fenêtre de rédaction de courriel, cliquez sur <span class="guibutton"><strong>RE</strong></span> à côté de l'adresse de l'expéditeur. Le champ de saisie <span class="guibutton"><strong>Rép. à</strong></span> est alors affiché.</p>
-<p role="presentation">Si vous avez spécifié des adresses de réponse par défaut lorsque vous avez configuré votre compte de courrier principal, le champ de saisie <span class="guibutton"><strong>Rép. à</strong></span> s'affiche automatiquement, et il inclut les adresses de réponse prédéfinies.</p>
+<p role="presentation">Dans la fenêtre de rédaction de courriel, cliquez sur <span class="guibutton"><strong>Re</strong></span> à côté de l'adresse de l'expéditeur. Le champ de saisie <span class="guibutton"><strong>Rép. à</strong></span> est alors affiché.</p>
+<p role="presentation">Si vous avez spécifié des adresses de réponse prédéfinies lorsque vous avez configuré votre compte de courrier principal, le champ de saisie <span class="guibutton"><strong>Rép. à</strong></span> s'affiche automatiquement, et il inclut les adresses de réponse prédéfinies.</p>
 </li>
 <li class="step">
 <p role="presentation">Dans le champ <span class="guibutton"><strong>Rép. à</strong></span>, saisissez les adresses électroniques auxquelles doivent être envoyées les réponses à votre courriel. <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -57,11 +57,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.replyto"></p>
 <p class="title">Action de niveau supérieur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p></li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">Modifier le compte de courrier principal</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.replyto">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p id="ox.appsuite.user.parent.email.send.replyto">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.sender.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.sender.html
index 7cb9899ed..d9d5ecad5 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.sender.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.sender.html
@@ -1,12 +1,12 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Sélectionner une adresse d'expéditeur</title>
+<title>sélectionner une adresse d'expéditeur</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Envoyer un nouveau message électronique">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Envoyer un nouveau courriel">
 <link rel="next" href="ox.appsuite.user.sect.email.send.replyto.html" title="Définir une adresse de réponse">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Envoyer des courriels</h2>
+<h2 class="sr-only">envoyer des courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.sender">
-<div class="titlepage"><div><div><h3 class="title">Sélectionner une adresse d'expéditeur</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">sélectionner une adresse d'expéditeur</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.6.2"></a><p id="ox.appsuite.user.concept.email.send.sender">À l'envoi d'un courriel, vous pouvez définir l'adresse d'expéditeur à afficher aux destinataires dans la fenêtre de rédaction de courriel.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.sender">
 <p class="title">Pour sélectionner votre adresse d'expéditeur dans la fenêtre de rédaction de courriel :</p>
@@ -59,11 +59,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.sender"></p>
 <p class="title">Action de niveau supérieur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p></li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Ajouter des comptes de courrier électronique</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.sender">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p id="ox.appsuite.user.parent.email.send.sender">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.signatures.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.signatures.html
index d7ac75eeb..206de54e5 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.signatures.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.signatures.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.templates.html" title="Utiliser les modèles">
 <link rel="next" href="ox.appsuite.user.sect.email.send.reply.html" title="Répondre à des courriels">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envoyer des courriels</h2>
+<h2 class="sr-only">envoyer des courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.signatures">
 <div class="titlepage"><div><div><h3 class="title">Utiliser des signatures</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.12.2"></a><a class="indexterm" name="id-1.7.11.12.3"></a><p id="ox.appsuite.user.concept.email.send.signatures">Une signature de courrier est un texte qui sera ajouté automatiquement lorsque vous rédigez un courriel, une réponse à un courriel ou un transfert de courriel. Elle sert généralement à insérer le nom, l'entreprise et l'adresse de contact en dessous du texte du courriel. Vous pouvez créer des signatures aux formats texte brut ou HTML. Les fonctions suivantes sont disponibles : </p>
@@ -91,7 +91,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.signatures"></p>
 <p class="title">Action de niveau supérieur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p></li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -99,7 +99,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Ajouter des comptes de courrier électronique</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Utiliser les modèles</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.signatures">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p id="ox.appsuite.user.parent.email.send.signatures">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.templates.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.templates.html
index 438581768..73b5ff878 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.templates.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.templates.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Envoyer des pièces jointes sous forme de liens">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="envoyer des pièces jointes sous forme de liens">
 <link rel="next" href="ox.appsuite.user.sect.email.send.signatures.html" title="Utiliser des signatures">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envoyer des courriels</h2>
+<h2 class="sr-only">envoyer des courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.templates">
 <div class="titlepage"><div><div><h3 class="title">Utiliser les modèles</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.11.2"></a><a class="indexterm" name="id-1.7.11.11.3"></a><p id="ox.appsuite.user.concept.email.send.templates">Les modèles sont des modules de texte que vous pouvez rédiger, puis insérer dans vos courriels aussi souvent que vous le souhaitez. Ainsi, vous n'avez à écrire qu'une seule fois les phrases que vous utilisez fréquemment. Les modèles, les signatures et les brouillons de courriel diffèrent sur les points suivants : </p>
@@ -88,7 +88,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.templates"></p>
 <p class="title">Action de niveau supérieur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p></li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -96,7 +96,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Utiliser des signatures</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Utiliser les brouillons de message</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.templates">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p id="ox.appsuite.user.parent.email.send.templates">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.vacationnotice.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.vacationnotice.html
index 71d8a65e7..d5aa17601 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.vacationnotice.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.send.vacationnotice.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Envoyer des courriels">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="envoyer des courriels">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attendees.html" title="Envoyer un courriel aux participants du rendez-vous">
 <link rel="next" href="ox.appsuite.user.sect.email.openai.html" title="Utiliser l'intégration de l'IA">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Envoyer des courriels</h2>
+<h2 class="sr-only">envoyer des courriels</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.vacationnotice">
 <div class="titlepage"><div><div><h3 class="title">Envoi automatique d'un message d'absence</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.17.2"></a><a class="indexterm" name="id-1.7.11.17.3"></a><p id="ox.appsuite.user.concept.email.send.vacationnotice">Un message d'absence informe l'expéditeur d'un courrier électronique que vous n'aurez pas accès à vos messages pendant un certain temps. Vous pouvez régler les options suivantes : </p>
@@ -81,14 +81,14 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Répondre à des courriels</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Transmettre des courriels</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Faire suivre automatiquement des courriels</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">Utiliser les filtres de courriel</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.vacationnotice">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">Envoyer des courriels</a></p>
+<p id="ox.appsuite.user.parent.email.send.vacationnotice">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.email.send.html">envoyer des courriels</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.settings.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.settings.html
index 8e6feee9c..3b1bb9f16 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.settings.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.settings.html
@@ -55,8 +55,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.composereply">Rédiger et répondre</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.20.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">Modèles</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.rules">Règles</a></p></li>
-<li class="listitem feat-zoom" id="id-1.7.20.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">Intégration de l'IA</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.7.20.5.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Réglages avancés</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">Intégration de l'IA</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Réglages avancés</a></p></li>
 </ul>
 <p>Voir aussi : <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Chercher des réglages</a></p>
 <p id="ox.appsuite.user.reference.email.settings.reading"></p>
@@ -64,31 +64,32 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>disposition. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Définit la mise en page de la vue en liste et de la vue détaillée dans la zone d'affichage.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>Disposition. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Définit la mise en page de la vue en liste et de la vue détaillée dans la zone d'affichage.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>liste de messages. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a>
+<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>Liste de messages. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.list"><b>Images des contacts, cases à cocher, simple. </b>Définit si les images des contacts, les cases à cocher, ou aucun de ces éléments ne sont affichés dans la vue en liste.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.preview"><b>Afficher l'aperçu du texte. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.2.1.2"></a>Définit si les premiers mots du contenu du message sont affichés dans la vue en liste des courriels.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Toujours afficher la date et l'heure complètes. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Définit si, en plus de la date, l'heure de réception est affichée dans la vue en liste des courriels.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Afficher la taille des messages. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Indique si la taille des courriels doit être affichée dans la vue en liste.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.20.6.2.1.2.1.3.1.3"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>Afficher les catégories. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Définit si les catégories attribuées au courriel seront affichées dans la vue en liste des courriels.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Toujours afficher la date et l'heure complètes. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Définit si, en plus de la date, l'heure de réception est affichée dans la vue en liste des courriels.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Afficher la taille des messages. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.5.1.2"></a>Indique si la taille des courriels doit être affichée dans la vue en liste.</p></li>
 </ul>
 <p>
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>volet de lecture. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a>
+<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>Volet de lecture. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>afficher le texte cité dans une autre couleur. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Indique si le texte du message original est mis en exergue et introduit par une ligne verticale. Cette option pré-suppose que le texte du message initial n'est pas mis en pièce jointe, mais repris dans le message.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>Afficher le texte cité dans une autre couleur. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Indique si le texte du message original est mis en exergue et introduit par une ligne verticale. Cette option pré-suppose que le texte du message initial n'est pas mis en pièce jointe, mais repris dans le message.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.fixedfont"><b>Utiliser une police à chasse fixe pour les courriels en texte pur. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.2.1.2"></a>Indique si une police de caractères à chasse fixe doit être utilisée à l'affichage de courriers en texte brut.</p></li>
 </ul>
 <p>
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>marquer comme lu. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Définit le délai au bout duquel un courriel est automatiquement marqué comme lu après sélection. </p>
+<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>Marquer comme lu. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Définit le délai au bout duquel un courriel est automatiquement marqué comme lu après sélection. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.immediately"><b>Immédiatement. </b>Le courriel est immédiatement marqué comme lu.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.seconds"><b>Après 5 secondes, après 20 secondes. </b>Le courriel sera marqué comme lu au bout du délai défini.</p></li>
@@ -126,7 +127,7 @@
 <p role="presentation">Remarque : le nom de l'expéditeur est affiché devant l'adresse électronique. Si vous saisissez un nom dans le champ <span class="guibutton"><strong>Votre nom</strong></span> dans les Réglages du compte, ce nom écrase le nom d'expéditeur pré-défini.</p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>format de message. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Définit la mise en forme des messages envoyés : </p>
+<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>Format de message. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Définit la mise en forme des messages envoyés : </p>
 <ul class="itemizedlist" style="list-style-type: square; ">
 <li class="listitem"><p><b>en HTML. </b>Le courriel est envoyé balisé en HTML. Cela vous permet de mettre en forme le texte.</p></li>
 <li class="listitem"><p><b>Texte pur. </b>Le courriel est envoyé en texte pur, sans aucune mise en forme.</p></li>
@@ -173,10 +174,10 @@
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.html"><b>Autoriser l'affichage des courriels mis en forme avec HTML. </b><a class="indexterm" name="id-1.7.20.12.2.1.1.1.2"></a>Indique si l'affichage des courriels au format HTML est autorisé ou non.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>afficher les demandes d'accusé de réception. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Détermine si un accusé de réception est affiché lorsqu'un message reçu comporte une demande d'accusé de réception.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>Afficher les demandes d'accusé de réception. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Détermine si un accusé de réception est affiché lorsqu'un message reçu comporte une demande d'accusé de réception.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>effacer définitivement les messages supprimés. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Définit si les courriels supprimés le sont de manière définitive ou s'ils transitent d'abord par la corbeille.</p>
-<p role="presentation"><span class="phrase"><strong>Remarque :</strong></span> les courriels supprimés de manière définitive ne peuvent pas être restaurés.</p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>Supprimer définitivement les messages effacés. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Définit si les courriels supprimés le sont de manière définitive ou s'ils transitent d'abord par la corbeille.</p>
+<p role="presentation"><span class="phrase"><strong>Attention :</strong></span> suivant la configuration, les messages supprimés définitivement <span class="bold">ne peuvent pas</span> être récupérés.</p>
 <p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Suppression de courriels</a></p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.selectrecent"><b>Au lancement, sélectionner automatiquement le dernier message lu. </b><a class="indexterm" name="id-1.7.20.12.2.1.4.1.2"></a>Définit si le dernier courriel lu est sélectionné automatiquement au démarrage de l'application.</p></li>
@@ -187,7 +188,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.mailinglist"><b>Demander avant de répondre à une liste de diffusion. </b><a class="indexterm" name="id-1.7.20.12.2.1.9.1.2"></a>Définit si vous devez confirmer le destinataire lorsque vous répondez à une liste de diffusion.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.appendvcard"><b>Toujours joindre mes données de contact détaillées au format vCard. </b><a class="indexterm" name="id-1.7.20.12.2.1.10.1.2"></a>Indique si vos informations de contact sont jointes au format vCard à un nouveau message.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>transférer les messages en tant que. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Indique comment le texte d'un message est envoyé lorsque vous transmettez un message. </p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>Transférer les messages en tant que. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Indique comment le texte d'un message est envoyé lorsque vous transmettez un message. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p><b>dans le corps du message. </b>Le texte est envoyé dans le corps du nouveau message.</p></li>
 <li class="listitem"><p><b>en pièce jointe. </b>Le texte est envoyé en pièce jointe au nouveau message.</p></li>
@@ -204,7 +205,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
@@ -224,7 +225,7 @@
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Réglages de courriel</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">Afficher les courriels</a>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.email.view.html b/help/l10n/fr_FR/ox.appsuite.user.sect.email.view.html
index cfe10cce6..24fed62cd 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.email.view.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.email.view.html
@@ -82,11 +82,10 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vue en liste de <span class="phrase">Courriel</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vue détaillée de <span class="phrase">Courriel</span></a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Travailler avec les catégories de la boîte de réception</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Afficher ou enregistrer les pièces jointes à un courriel</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Afficher le code source d'un message</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marquer des courriels comme lus ou non lus</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.firststeps.gui.notificationarea.html b/help/l10n/fr_FR/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
index 91ab301f7..2946bb9b4 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
@@ -83,7 +83,7 @@
               <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuster les réglages généraux</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Utiliser la zone de notification</a>
+              <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">utiliser la zone de notification</a>
             </p>
 <p role="presentation" class="cap-calendar">
               <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Répondre des invitations à des rendez-vous</a>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.createencrypted.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.createencrypted.html
index 456c0a935..c728ed1f9 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.createencrypted.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.createencrypted.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Chiffrer des documents Office">
-<link rel="prev" href="ox.appsuite.user.sect.guard.documents.html" title="Chiffrer des documents Office">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Chiffrement des documents Office">
+<link rel="prev" href="ox.appsuite.user.sect.guard.documents.html" title="Chiffrement des documents Office">
 <link rel="next" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html" title="Enregistrement des documents sélectionnés sous un format chiffré">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Chiffrer les données avec <span class="phrase">Sécurité</span>
 </h1>
-<h2 class="sr-only">Chiffrer des documents Office</h2>
+<h2 class="sr-only">Chiffrement des documents Office</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.createencrypted">
 <div class="titlepage"><div><div><h3 class="title">Création de nouveaux documents chiffrés</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.8.2"></a><a class="indexterm" name="id-1.14.10.8.3"></a><a class="indexterm" name="id-1.14.10.8.4"></a><p id="ox.appsuite.user.concept.guard.documents.createencrypted">Lors de la création d'un nouveau document, vous avez la possibilité de créer un document qui sera enregistré sous forme chiffrée. Vous disposez des options suivantes : </p>
@@ -84,7 +84,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.guard.documents.createencrypted">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Chiffrer des documents Office</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.createencrypted">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Chiffrement des documents Office</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.html
index 24d103f91..77b6ad486 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.html
@@ -1,7 +1,7 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Chiffrer des documents Office</title>
+<title>Chiffrement des documents Office</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
@@ -32,7 +32,7 @@
   <h1 class="sr-only">Chiffrer les données avec <span class="phrase">Sécurité</span>
 </h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.documents">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Chiffrer des documents Office</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Chiffrement des documents Office</h2></div></div></div>
 <a class="indexterm" name="id-1.14.10.2"></a><a class="indexterm" name="id-1.14.10.3"></a><a class="indexterm" name="id-1.14.10.4"></a><a class="indexterm" name="id-1.14.10.5"></a><p id="ox.appsuite.user.concept.guard.documents">Vous disposez des options suivantes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.createencrypted.html">Création de nouveaux documents chiffrés</a></p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.open.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.open.html
index 73c0f1b44..87de3cdb1 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.open.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.open.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Chiffrer des documents Office">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Chiffrement des documents Office">
 <link rel="prev" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html" title="Enregistrement des documents sélectionnés sous un format chiffré">
 <link rel="next" href="ox.appsuite.user.sect.guard.logout.html" title="Se déconnecter de Sécurité">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Chiffrer les données avec <span class="phrase">Sécurité</span>
 </h1>
-<h2 class="sr-only">Chiffrer des documents Office</h2>
+<h2 class="sr-only">Chiffrement des documents Office</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.open">
 <div class="titlepage"><div><div><h3 class="title">Ouvrir des documents chiffrés</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.10.2"></a><a class="indexterm" name="id-1.14.10.10.3"></a><p id="ox.appsuite.user.concept.guard.documents.open">Vous pouvez ouvrir un document chiffré pour : </p>
@@ -75,7 +75,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.guard.documents.open">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Chiffrer des documents Office</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.open">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Chiffrement des documents Office</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.saveencrypted.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.saveencrypted.html
index 0b22c82ff..4f5168d01 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.saveencrypted.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.documents.saveencrypted.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Chiffrer des documents Office">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Chiffrement des documents Office">
 <link rel="prev" href="ox.appsuite.user.sect.guard.documents.createencrypted.html" title="Création de nouveaux documents chiffrés">
 <link rel="next" href="ox.appsuite.user.sect.guard.documents.open.html" title="Ouvrir des documents chiffrés">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Chiffrer les données avec <span class="phrase">Sécurité</span>
 </h1>
-<h2 class="sr-only">Chiffrer des documents Office</h2>
+<h2 class="sr-only">Chiffrement des documents Office</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.saveencrypted">
 <div class="titlepage"><div><div><h3 class="title">Enregistrement des documents sélectionnés sous un format chiffré</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.9.2"></a><a class="indexterm" name="id-1.14.10.9.3"></a><p id="ox.appsuite.user.concept.guard.documents.saveencrypted">Lorsqu'un document texte, une feuille de calcul ou une présentation est ouvert, il vous est possible de l'enregistrer sous une forme chiffrée.</p>
@@ -68,7 +68,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.guard.documents.saveencrypted">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Chiffrer des documents Office</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.saveencrypted">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Chiffrement des documents Office</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.drive.decrypt.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.drive.decrypt.html
index c78b86d1f..0044a7438 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.drive.decrypt.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.drive.decrypt.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.guard.drive.html" title="Chiffre ou déchiffrer des fichiers">
 <link rel="prev" href="ox.appsuite.user.sect.guard.drive.download.html" title="Télécharger des fichiers chiffrés">
-<link rel="next" href="ox.appsuite.user.sect.guard.documents.html" title="Chiffrer des documents Office">
+<link rel="next" href="ox.appsuite.user.sect.guard.documents.html" title="Chiffrement des documents Office">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.email.send.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.email.send.html
index 8bd69effd..031faa278 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.email.send.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.email.send.html
@@ -49,7 +49,7 @@
 <p role="presentation">Vous pouvez également cliquer sur <span class="guibutton"><strong>Réglages</strong></span> dans le lanceur d'applications.</p>
 <p role="presentation">La fenêtre <span class="guilabel"><strong>Réglages</strong></span> s'ouvre alors.</p>
 </li>
-<li class="step"><p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>.</p></li>
+<li class="step"><p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>   . Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>S/MIME</strong></span>.</p></li>
 <li class="step">
 <p role="presentation">Cliquez sur <span class="guibutton"><strong>Activer S/MIME</strong></span>.</p>
 <p role="presentation">Si le chiffrement S/MIME doit être appliqué par défaut, activez l'option <span class="guibutton"><strong>Utiliser par défaut S/MIME pour la signature et le chiffrement</strong></span> sous <span class="guibutton"><strong>Réglages par défaut</strong></span>.</p>
@@ -75,7 +75,7 @@
 <li class="listitem"><p role="presentation">Pour permettre au destinataire du courriel d'envoyer une réponse chiffrée, celui-ci doit détenir votre clé publique. Vous pouvez envoyer votre clé publique en tant que pièce jointe. Pour cela, activez l'option <span class="guibutton"><strong>Joindre ma clé publique</strong></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Lorsque vous utilisez PGP, l'option suivante s'applique :</p>
-<p role="presentation">Si l'option <span class="guibutton"><strong>Afficher les réglages avancés</strong></span> est activée dans les réglages de <span class="phrase">Sécurité</span>, vous pouvez définir le format PGP.</p>
+<p role="presentation">Vous pouvez définir le format PGP si l'option <span class="guibutton"><strong>Afficher les réglages avancés à la rédaction d'un courriel</strong></span> est activée dans les réglages de <span class="phrase">Sécurité</span> sous <span class="guibutton"><strong>Avancé</strong></span>.</p>
 <p role="presentation">Par défaut, les courriels chiffrés sont envoyés au format <span class="guibutton"><strong>Mime</strong></span>. Certains clients plus anciens ne prennent en charge que PGP dans le corps. Si le destinataire utilise un tel client, activez l'option <span class="guibutton"><strong>Dans le corps du message</strong></span>.</p>
 <p role="presentation">Remarque : si vous utilisez l'option <span class="guibutton"><strong>Dans le corps du message</strong></span>, vous ne pouvez pas envoyer de courriels au format HTML.</p>
 </li>
@@ -98,7 +98,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.read.html">Lire des courriels chiffrés</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.external.html">Comment un destinataire externe peut-il lire un courriel chiffrée ?</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau message électronique</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Envoyer un nouveau courriel</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Réglages de <span class="phrase">Sécurité</span></a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.email.send">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.email.html">Chiffrer les conversations par courriel</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.html
index 48adaacbb..35fd0ecbe 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Chiffrer les données avec Sécurité">
-<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Gestion des mots de passe">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Supprimer la fonction de réinitialisation du mot de passe">
 <link rel="next" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Gérer vos clés PGP personnelles">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Suivant</a></li>
@@ -44,9 +44,24 @@
 <p id="ox.appsuite.user.possibilities.guard.keys">Vous disposez des options suivantes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gérer vos clés PGP personnelles</a></p></li>
-<li class="listitem cap-smime" id="id-1.14.13.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gérer vos clés S/MIME personnelles</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gérer les clés publiques</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gérer les clés PGP des destinataires</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gérer vos clés S/MIME personnelles</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Gérer les clés S/MIME des destinataires</a></p></li>
 </ul>
+<p id="ox.appsuite.user.related.guard.keys">
+      </p>
+<p class="title">Voir aussi :</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Réglages de <span class="phrase">Sécurité</span></a>
+          </p></li>
+</ul>
+<p>
+    </p>
+<p id="ox.appsuite.user.parent.guard.keys">Sujet parent : <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Chiffrer les données avec <span class="phrase">Sécurité</span></i></a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.pgppublickeys.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
index 99758fb96..a0d87cfb1 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
@@ -1,13 +1,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Gérer les clés publiques</title>
+<title>Gérer les clés PGP des destinataires</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestion des clés">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gérer vos clés S/MIME personnelles">
-<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Réglages de Sécurité">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Gérer vos clés PGP personnelles">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gérer vos clés S/MIME personnelles">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Suivant</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Suivant</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,55 +33,36 @@
 </h1>
 <h2 class="sr-only">Gestion des clés</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.pgppublickeys">
-<div class="titlepage"><div><div><h3 class="title">Gérer les clés publiques</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">La page <span class="phrase"><span class="guilabel"><strong>Réglages de sécurité Sécurité</strong></span></span> vous permet d'effectuer les actions suivantes : </p>
+<div class="titlepage"><div><div><h3 class="title">Gérer les clés PGP des destinataires</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.8.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">Vous disposez des options suivantes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">afficher les clés publiques</p></li>
+<li class="listitem"><p role="presentation">afficher ou supprimer des clés publiques</p></li>
 <li class="listitem"><p role="presentation">transférer des clés publiques</p></li>
-<li class="listitem"><p role="presentation">supprimer une clé publique personnelle</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.guard.pgppublickeys">
-<p class="title">Pour utiliser les fonctions de gestion des clés :</p>
+<p class="title">Pour afficher les clés PGP des destinataires :</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
-<p role="presentation">Vous pouvez également cliquer sur <span class="guibutton"><strong>Réglages</strong></span> dans le lanceur d'applications.</p>
-<p role="presentation">La fenêtre <span class="guilabel"><strong>Réglages</strong></span> s'ouvre alors.</p>
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
+<p role="presentation">Dans le panneau de gauche, cliquez sur  <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>. Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>Clés PGP des destinataires</strong></span>.</p>
+<p role="presentation">Les clés PGP publiques des destinataires s'affichent.</p>
 </li>
 <li class="step">
-<p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>.</p>
-<p role="presentation">La page <span class="phrase"><span class="guilabel"><strong>Réglages de sécurité Sécurité</strong></span></span>  s'affiche alors.</p>
-</li>
-<li class="step">
-<p role="presentation">Activez l'option <span class="guibutton"><strong>Afficher les réglages avancés</strong></span>.</p>
-<p role="presentation">Les fonctions de gestion des clés sont affichées.</p>
+<p role="presentation">Pour afficher les détails d'une clé, cliquez sur son identifiant.</p>
+<p role="presentation">Pour supprimer une clé, cliquez sur l'icône <span class="guibutton"><strong>Supprimer</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> à côté de la clé.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.display">
-<p class="title">Pour afficher les clés publiques :</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
+<p class="title">Pour transférer la clé publique d'un destinataire :</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Cliquez sur <span class="guibutton"><strong>Clés publiques des destinataires</strong></span>. La fenêtre <span class="guilabel"><strong>Clés publiques</strong></span> s'ouvre.</p>
-<p role="presentation">Les clés publiques que vous ou d'autres utilisateurs partagez sont affichées. Si la clé publique d'un utilisateur est affichée dans la liste, vous pouvez alors lui envoyer des courriels chiffrés et vérifier les courriels signés envoyés par cet utilisateur.</p>
-</li>
-<li class="step">
-<p role="presentation">Pour afficher les détails d'une clé, cliquez sur l'icône <span class="guibutton"><strong>Détails</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> à côté de la clé. La fenêtre <span class="guilabel"><strong>Détails des clés publiques</strong></span> s'affiche.</p>
-<p role="presentation">Vous pouvez partager des clés publiques en activant <span class="guibutton"><strong>Partager la clé</strong></span>. Les autres utilisateurs peuvent voir et télécharger vos clés partagées. Les clés publiques ne sont disponibles que pour les utilisateurs du collecticiel.</p>
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
+<p role="presentation">Dans le panneau de gauche, cliquez sur  <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>. Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>Clés PGP des destinataires</strong></span>.</p>
 </li>
+<li class="step"><p role="presentation">Cliquez sur <span class="guibutton"><strong>Transférer la clé du destinataire</strong></span>. Sélectionnez un fichier contenant une clé publique.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
-<p class="title">Pour envoyer la clé publique d'un destinataire depuis la fenêtre des <span class="guilabel"><strong>Clés publiques</strong></span> :</p>
-<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Ajouter</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.upload.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> à côté de <span class="guilabel"><strong>Liste des clés publiques PGP</strong></span> . Sélectionnez un fichier contenant une clé publique.</p></li></ul></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.delete">
-<p class="title">Pour supprimer une clé publique dans la fenêtre des <span class="guilabel"><strong>Clés publiques</strong></span> :</p>
-<div class="procedure"><ul class="procedure"><li class="step">
-<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Supprimer</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> à côté de la clé publique.</p>
-<p role="presentation">Confirmez la suppression de la clé publique.</p>
-</li></ul></div>
-</div>
 <p id="ox.appsuite.user.related.guard.keys.pgppublickeys">
         </p>
 <p class="title">Voir aussi :</p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.smimepublickeys.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
new file mode 100644
index 000000000..0c14f323c
--- /dev/null
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
@@ -0,0 +1,85 @@
+<html lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Gérer les clés S/MIME des destinataires</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuel de l'utilisateur">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestion des clés">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gérer vos clés S/MIME personnelles">
+<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Réglages de Sécurité">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Précédent</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Suivant</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Chiffrer les données avec <span class="phrase">Sécurité</span>
+</h1>
+<h2 class="sr-only">Gestion des clés</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.keys.smimepublickeys">
+<div class="titlepage"><div><div><h3 class="title">Gérer les clés S/MIME des destinataires</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.10.2"></a><p id="ox.appsuite.user.concept.guard.keys.smimepublickeys">Vous disposez des options suivantes : </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">afficher les clés publiques</p></li>
+<li class="listitem"><p role="presentation">transférer des clés publiques</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.smimepublickeys">
+<p class="title">Pour afficher la clé S/MIME d'un destinataire :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
+<p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>   . Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>Destinataires S/MIME</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Saisissez une adresse électronique dans <span class="guibutton"><strong>Rechercher un certificat</strong></span>. Cliquez sur <span class="guibutton"><strong>Chercher</strong></span>.</p>
+<p role="presentation">Si un certificat est trouvé, ses données sont affichées.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.guard.keys.smimepublickeys.upload">
+<p class="title">Pour transférer la clé publique d'un destinataire :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
+<p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>   . Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>Destinataires S/MIME</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Cliquez sur <span class="guibutton"><strong>Transférer le certificat du destinataire</strong></span>.Sélectionnez un fichier contenant une clé publique.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.keys.smimepublickeys">
+        </p>
+<p class="title">Voir aussi :</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gérer vos clés PGP personnelles</a>
+            </p>
+<p role="presentation" class="cap-smime">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gérer vos clés S/MIME personnelles</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a>
+            </p>
+</li></ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.keys.smimepublickeys">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
index 789252f17..155e5467f 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestion des clés">
 <link rel="prev" href="ox.appsuite.user.sect.guard.keys.html" title="Gestion des clés">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gérer vos clés S/MIME personnelles">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gérer les clés PGP des destinataires">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Suivant</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Suivant</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,121 +34,93 @@
 <h2 class="sr-only">Gestion des clés</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yourpgpkeys">
 <div class="titlepage"><div><div><h3 class="title">Gérer vos clés PGP personnelles</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.5.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">La page <span class="phrase"><span class="guilabel"><strong>Réglages de sécurité Sécurité</strong></span></span>    vous permet d'effectuer les actions suivantes : </p>
+<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">Vous disposez des options suivantes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">ajouter de nouvelles clés PGP</p></li>
 <li class="listitem"><p role="presentation">afficher les clés PGP personnelles, afficher les détails</p></li>
-<li class="listitem">
-<p role="presentation">ajouter de nouvelles clés PGP</p>
-<p role="presentation">Si vous possédez plusieurs clés, vous pouvez définir la clé courante. La clé courante est utilisée pour le chiffrement des données.</p>
-</li>
-<li class="listitem">
-<p role="presentation">ajouter des identifiants utilisateurs</p>
-<p role="presentation">Lors de l'ajout d'identifiants d'utilisateurs supplémentaires à une clé, vous pouvez utiliser cette clé pour plusieurs comptes de courrier électronique.</p>
-</li>
-<li class="listitem"><p role="presentation">télécharger des clés</p></li>
-<li class="listitem"><p role="presentation">supprimer des clés</p></li>
+<li class="listitem"><p role="presentation">gérer vos propres clés PGP : utiliser comme clé courante, modifier les identifiants, révoquer, télécharger, supprimer </p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys">
-<p class="title">Pour utiliser les fonctions de gestion des clés PGP :</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.add">
+<p class="title">Pour ajouter une nouvelle clé PGP :</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
-<p role="presentation">Vous pouvez également cliquer sur <span class="guibutton"><strong>Réglages</strong></span> dans le lanceur d'applications.</p>
-<p role="presentation">La fenêtre <span class="guilabel"><strong>Réglages</strong></span> s'ouvre alors.</p>
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.addkey"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
+<p role="presentation">Dans le panneau de gauche, cliquez sur  <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>. Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>Vos clés PGP</strong></span>.</p>
 </li>
 <li class="step">
-<p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>.</p>
-<p role="presentation">La page <span class="phrase"><span class="guilabel"><strong>Réglages de sécurité Sécurité</strong></span></span>  s'affiche alors.</p>
+<p role="presentation">Vous disposez des options suivantes : <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">Pour créer une nouvelle paire de clés, cliquez sur <span class="guibutton"><strong>Créer de nouvelles clés</strong></span>. La fenêtre <span class="phrase"><span class="guilabel"><strong>Créer des clés de sécurité Sécurité</strong></span></span> s'ouvre alors.</p>
+<p role="presentation">Saisissez un mot de passe pour la nouvelle clé. Confirmez le mot de passe.</p>
+<p role="presentation">La nouvelle clé consiste en une clé principale et une sous-clé correspondante.</p>
 </li>
-<li class="step">
-<p role="presentation">Activez l'option <span class="guibutton"><strong>Afficher les réglages avancés</strong></span>.</p>
-<p role="presentation">Les fonctions de gestion des clés sont affichées.</p>
+<li class="listitem">
+<p role="presentation">Pour ajouter une clé privée existante, cliquez sur <span class="guibutton"><strong>Transférer une clé privée</strong></span>. Sélectionnez un fichier contenant une clé privée. La fenêtre <span class="guilabel"><strong>Transférer des clés privées</strong></span> s'ouvre alors.</p>
+<p role="presentation">Pour transférer la nouvelle clé, saisissez votre mot de passe de sécurité <span class="phrase">Sécurité</span>. Saisissez un nouveau mot de passe pour la nouvelle clé.</p>
+</li>
+<li class="listitem"><p role="presentation">Pour ajouter une clé publique existante, cliquez sur <span class="guibutton"><strong>Transférer une clé publique</strong></span>. Sélectionnez un fichier contenant une clé publique.</p></li>
+</ul></p>
+<p role="presentation">La nouvelle clé sera ajoutée en haut de votre liste de clés. La nouvelle clé devient donc la clé courante.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.display">
-<p class="title">Pour afficher vos propres clés PGP ou faire d'une clé PGP la clé courante :</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.display">
+<p class="title">Pour afficher vos clés PGP existantes :</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Cliquez sur <span class="guibutton"><strong>Vos clés</strong></span> sous <span class="guilabel"><strong>Clés</strong></span>.</p>
-<p role="presentation" class="cap-smime">Suivant la configuration, la fenêtre <span class="guilabel"><strong>Sélectionner le type de clés à modifier</strong></span> s'ouvre alors. Sélectionnez <span class="guibutton"><strong>PGP</strong></span>.</p>
-<p role="presentation">La fenêtre <span class="guilabel"><strong>Vos clés</strong></span> s'ouvre alors.</p>
-<p role="presentation">
-              <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Vos clés PGP existantes s'affichent. Chaque clé PGP est constituée d'une clé principale et d'une sous-clé. <ul class="itemizedlist" style="list-style-type: circle; ">
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
+<p role="presentation">Dans le panneau de gauche, cliquez sur  <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>. Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>Vos clés PGP</strong></span>.</p>
+<p role="presentation">Vos clés PGP s'affichent. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Chaque clé PGP est constituée d'une clé principale et d'une sous-clé. <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Entre autres choses, la clé principale permet de signer vos courriels.</p></li>
 <li class="listitem"><p role="presentation">La sous-clé sera utilisée pour le chiffrement et déchiffrement.</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">Suivant les besoins, <span class="phrase">Sécurité</span> utilise automatiquement la clé principale ou la sous-clé.</p></li>
-</ul>
-            </p>
+</ul></p>
 </li>
-<li class="step"><p role="presentation">Si votre liste de clés contient plusieurs clés, vous pouvez définir la clé courante. Pour ce faire, cochez la case <span class="guibutton"><strong>Courante</strong></span> à côté de la clé. La clé courante sera utilisée pour le chiffrement à partir de maintenant.</p></li>
-<li class="step"><p role="presentation">Pour afficher les détails d'une clé, cliquez sur l'icône <span class="guibutton"><strong>Détails</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> à côté de la clé. La fenêtre <span class="guilabel"><strong>Détails d'une clé</strong></span> s'ouvre. Pour afficher les signatures d'une clé, cliquez sur <span class="guibutton"><strong>Signatures</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addkey">
-<p class="title">Pour ajouter une nouvelle clé PGP dans la fenêtre <span class="guilabel"><strong>Vos clés</strong></span> :</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Ajouter une clé utilisateur</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> à côté de <span class="guibutton"><strong>Votre liste de clés</strong></span>. La fenêtre <span class="guilabel"><strong>Ajout des clés</strong></span> s'ouvre alors.</p></li>
 <li class="step">
-<p role="presentation">Vous disposez des options suivantes : <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-<p role="presentation">Pour ajouter une clé privée, cliquez sur <span class="guibutton"><strong>Télécharger une clé privée</strong></span>. Sélectionnez un fichier contenant une clé privée. La fenêtre <span class="guilabel"><strong>Télécharger une clé privée</strong></span> s'ouvre alors.</p>
-<p role="presentation">Pour transférer la nouvelle clé, saisissez votre mot de passe de sécurité <span class="phrase">Sécurité</span>. Saisissez un nouveau mot de passe pour la nouvelle clé.</p>
-</li>
-<li class="listitem"><p role="presentation">Pour ajouter une clé publique, cliquez sur <span class="guibutton"><strong>Télécharger une clé publique seulement</strong></span>. Sélectionnez un fichier contenant une clé publique.</p></li>
-<li class="listitem">
-<p role="presentation">Pour créer une nouvelle paire de clés, cliquez sur <span class="guibutton"><strong>Créer de nouvelles clés</strong></span>. La fenêtre <span class="phrase"><span class="guilabel"><strong>Créer des clés de sécurité Sécurité</strong></span></span> s'ouvre alors.</p>
-<p role="presentation">Saisissez un mot de passe pour la nouvelle clé. Confirmez le mot de passe.</p>
-<p role="presentation">La nouvelle clé consiste en une clé principale et une sous-clé correspondante.</p>
-</li>
-</ul></p>
-<p role="presentation">La nouvelle clé sera ajoutée en haut de votre liste de clés. La nouvelle clé devient donc la clé courante.</p>
+<p role="presentation">Pour afficher les détails d'une clé, cliquez sur l'icône <span class="guibutton"><strong>Gérer les clés</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> à côté de la clé. La fenêtre <span class="guilabel"><strong>Détails des clés</strong></span> s'affiche.</p>
+<p role="presentation">Pour afficher les signatures d'une clé, cliquez sur <span class="guibutton"><strong>Signatures</strong></span>.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addaccount">
-<p class="title">Pour ajouter un nouvel identifiant utilisateur dans la fenêtre <span class="guilabel"><strong>Vos clés</strong></span> :</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.manage">
+<p class="title">Pour gérer vos clés PGP existantes :</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Modifier les IDs</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addaccount.edit"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> à côté d'une clé. La fenêtre <span class="guilabel"><strong>Ajouter des identifiants utilisateur</strong></span> s'ouvre alors.</p></li>
 <li class="step">
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
+<p role="presentation">Dans le panneau de gauche, cliquez sur  <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>. Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>Vos clés PGP</strong></span>.</p>
+<p role="presentation">Vos clés PGP s'affichent.</p>
+</li>
+<li class="step"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Gérer les clés</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> à côté d'une clé principale. Utilisez les fonctions suivantes. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Si votre liste de clés contient plusieurs clés, vous pouvez définir la clé courante. Pour ce faire, cochez la case <span class="guibutton"><strong>Utiliser comme clé courante</strong></span>. La clé courante sera utilisée à partir de maintenant pour le chiffrement.</p></li>
+<li class="listitem">
+<p role="presentation">Si vous souhaitez utiliser la clé pour un autre compte de courriel, cliquez sur<span class="guibutton"><strong>Modifier les ID</strong></span>. La fenêtre <span class="guilabel"><strong>Ajouter des identifiants utilisateur</strong></span> s'ouvre alors.</p>
 <p role="presentation">Saisissez un nom pour l'identifiant utilisateur. Saisissez l'adresse électronique que vous souhaitez coupler à cette clé.</p>
 <p role="presentation">Saisissez votre mot de passe pour cette clé.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.download">
-<p class="title">Pour télécharger une clé depuis la fenêtre <span class="guilabel"><strong>Vos clés</strong></span> :</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Télécharger</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> à côté d'une clé.</p></li>
-<li class="step">
+<li class="listitem">
+<p role="presentation">Pour télécharger une clé privée, cliquez sur <span class="guibutton"><strong>Télécharger</strong></span>.</p>
 <p role="presentation">Choisissez si vous souhaitez télécharger votre clé privée uniquement, votre clé publique uniquement, ou les deux clés.</p>
 <p role="presentation"><span class="phrase"><strong>Attention :</strong></span> votre clé privée sera téléchargée sous forme chiffrée. Vous ne devriez toutefois pas télécharger votre clé privée sur un système en accès public.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.delete">
-<p class="title">Pour supprimer une clé depuis la fenêtre <span class="guilabel"><strong>Vos clés</strong></span> :</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Attention :</strong></span> si vous supprimez une clé privée, vous ne pourrez plus déchiffrer les objets ayant été chiffrés avec cette clé. Si vous n'êtes pas certain, vous ne devriez pas supprimer la clé mais la révoquer. Une clé révoquée ne peut plus être utilisée pour le chiffrement, mais vous pouvez toujours déchiffrer des objets ayant été chiffrés à l'aide de cette clé.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Supprimer</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> à côté d'une clé. La fenêtre <span class="guilabel"><strong>Supprimer la clé privée</strong></span> s'ouvre.</p></li>
-<li class="step"><p role="presentation">Vous disposez des options suivantes :<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Pour révoquer ou supprimer une clé privée, cliquez sur <span class="guibutton"><strong>Supprimer</strong></span>. La fenêtre <span class="guilabel"><strong>Supprimer la clé privée</strong></span> s'ouvre alors. Remarques :<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Si vous révoquez une clé, elle ne peut plus être utilisée. Vous pouvez toutefois toujours déchiffrer des objets ayant été chiffrés avec cette clé. Pour cette raison, il est préférable de révoquer une clé plutôt que de la supprimer.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Attention :</strong></span>si vous supprimez une clé privée, vous ne pourrez plus déchiffrer les objets ayant été chiffrés à l'aide de cette clé. </p></li>
+</ul> <p role="presentation">Vous disposez des options suivantes :</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
-<p role="presentation">Pour révoquer une clé privée, cliquez sur <span class="guibutton"><strong>Révoquer</strong></span>. </p>
-<p role="presentation">Si vous révoquez une clé, elle ne peut plus être utilisée. Vous pouvez toutefois toujours déchiffrer des objets ayant été chiffrés avec cette clé. Pour cette raison, il est préférable de révoquer une clé plutôt que de la supprimer.</p>
-<p role="presentation">Saisissez le mot de passe de la clé privée. Si cela est nécessaire, sélectionnez la raison de la révocation.</p>
+<p role="presentation">Pour révoquer une clé privée, cliquez sur <span class="guibutton"><strong>Révoquer</strong></span>.</p>
+<p role="presentation">Saisissez le mot de passe de la clé privée. Si nécessaire, sélectionnez la raison de la révocation.</p>
 <p role="presentation">Cliquez sur <span class="guibutton"><strong>Révoquer</strong></span>.</p>
+<p role="presentation">Vous pouvez aussi cliquer sur <span class="guibutton"><strong>Révoquer</strong></span> dans le menu.</p>
 </li>
 <li class="listitem">
 <p role="presentation">Pour supprimer une clé privée, cliquez sur <span class="guibutton"><strong>Supprimer</strong></span>. </p>
-<p role="presentation"><span class="phrase"><strong>Attention :</strong></span> si vous supprimez une clé privée, vous ne pourrez plus déchiffrer les objets ayant été chiffrés à l'aide de cette clé.</p>
 <p role="presentation">Saisissez le mot de passe de la clé privée.</p>
 <p role="presentation">Cliquez sur le bouton <span class="guibutton"><strong>Supprimer</strong></span>.</p>
 </li>
-</ul>Lorsque la clé principale est supprimée, la sous-clé correspondante est également supprimée.</p></li>
+</ul>Lorsque vous supprimez une clé principale, la sous-clé correspondante est également supprimée.</p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yourpgpkeys">
@@ -156,7 +128,7 @@
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gérer les clés publiques</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gérer les clés PGP des destinataires</a>
             </p>
 <p role="presentation" class="cap-smime">
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gérer vos clés S/MIME personnelles</a>
@@ -167,7 +139,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yourpgpkeys">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yourpgpkeys">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
index bfa9a1bdd..a0ad5fe21 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestion des clés">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Gérer vos clés PGP personnelles">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gérer les clés publiques">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gérer les clés PGP des destinataires">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Gérer les clés S/MIME des destinataires">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Suivant</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Suivant</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,46 +34,27 @@
 <h2 class="sr-only">Gestion des clés</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yoursmimekeys">
 <div class="titlepage"><div><div><h3 class="title">Gérer vos clés S/MIME personnelles</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.6.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">La page <span class="phrase"><span class="guilabel"><strong>Réglages de sécurité Sécurité</strong></span></span>    vous permet d'effectuer les actions suivantes : </p>
+<a class="indexterm" name="id-1.14.13.9.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">Vous disposez des options suivantes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">ajouter de nouvelles clés S/MIME</p>
 <p role="presentation">Si vous possédez plusieurs clés, vous pouvez définir la clé courante. La clé courante est utilisée pour le chiffrement des données.</p>
 </li>
 <li class="listitem"><p role="presentation">afficher les clés S/MIME personnelles, afficher les détails</p></li>
-<li class="listitem"><p role="presentation">télécharger des clés</p></li>
-<li class="listitem"><p role="presentation">supprimer des clés</p></li>
+<li class="listitem"><p role="presentation">gérer vos propres clés S/MIME : utiliser comme clé courante, modifier les identifiants, révoquer, télécharger, supprimer</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys">
-<p class="title">Pour utiliser les fonctions de gestion des clés S/MIME :</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.add">
+<p class="title">Pour ajouter une nouvelle clé S/MIME :</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
-<p role="presentation">Vous pouvez également cliquer sur <span class="guibutton"><strong>Réglages</strong></span> dans le lanceur d'applications.</p>
-<p role="presentation">La fenêtre <span class="guilabel"><strong>Réglages</strong></span> s'ouvre alors.</p>
-</li>
-<li class="step">
-<p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>.</p>
-<p role="presentation">La page <span class="phrase"><span class="guilabel"><strong>Réglages de sécurité Sécurité</strong></span></span>  s'affiche alors.</p>
-</li>
-<li class="step">
+<p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>   . Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>S/MIME</strong></span>.</p>
 <p role="presentation">Cliquez sur <span class="guibutton"><strong>Activer S/MIME</strong></span>.</p>
-<p role="presentation">Activez l'option <span class="guibutton"><strong>Afficher les réglages avancés</strong></span>.</p>
-<p role="presentation">Les fonctions de gestion des clés sont affichées.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.addkey">
-<p class="title">Pour ajouter une nouvelle clé S/MIME :</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Cliquez sur <span class="guibutton"><strong>Vos clés</strong></span> sous <span class="guibutton"><strong>Clés</strong></span>. La fenêtre <span class="guilabel"><strong>Sélectionner le type de clés à modifier</strong></span> s'ouvre alors.</p>
-<p role="presentation">Sélectionnez <span class="guibutton"><strong>S/MIME</strong></span>. La fenêtre <span class="guilabel"><strong>Vos certificats</strong></span> s'ouvre alors.</p>
 </li>
-<li class="step"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Ajouter</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> à côté de <span class="guilabel"><strong>Votre liste de clés</strong></span>. La fenêtre <span class="guilabel"><strong>Transférer des clés S/MIME</strong></span> s'ouvre alors.</p></li>
 <li class="step">
+<p role="presentation">Cliquez sur <span class="guibutton"><strong>Transférer le certificat privé</strong></span>. La fenêtre <span class="guilabel"><strong>Transférer des clés S/MIME</strong></span> s'ouvre alors.</p>
 <p role="presentation">Saisissez l'un des mots de passe suivants : <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Pour transférer la nouvelle clé, saisissez votre mot de passe de sécurité <span class="phrase">Sécurité</span>. Saisissez un nouveau mot de passe pour la nouvelle clé.</p></li>
+<li class="listitem"><p role="presentation">Votre mot de passe de sécurité <span class="phrase">Sécurité</span> pour transférer la nouvelle clé.</p></li>
 <li class="listitem">
 <p role="presentation">Un nouveau mot de passe pour le chiffrement des courriels.</p>
 <p role="presentation">Confirmez le nouveau mot de passe.</p>
@@ -85,48 +66,51 @@
 </ol></div>
 </div>
 <div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.display">
-<p class="title">Pour afficher vos propres clés S/MIME ou faire d'une clé S/MIME la clé courante :</p>
+<p class="title">Pour afficher vos propres clés S/MIME :</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Cliquez sur <span class="guibutton"><strong>Vos clés</strong></span> sous <span class="guilabel"><strong>Clés</strong></span>. La fenêtre <span class="guilabel"><strong>Sélectionner le type de clés à modifier</strong></span> s'ouvre alors.</p>
-<p role="presentation">Sélectionnez <span class="guibutton"><strong>S/MIME</strong></span>.</p>
-<p role="presentation">La fenêtre <span class="guilabel"><strong>Vos certificats</strong></span> s'ouvre alors. Vos clés S/MIME seront affichées.</p>
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
+<p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>   . Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>S/MIME</strong></span>.</p>
+<p role="presentation">Cliquez sur <span class="guibutton"><strong>Activer S/MIME</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Pour afficher les détails d'une clé, cliquez sur l'icône <span class="guibutton"><strong>Gérer les clés</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> à côté de la clé. La fenêtre <span class="guilabel"><strong>Détails des clés</strong></span> s'affiche.</p>
+<p role="presentation">Pour afficher les signatures d'une clé, cliquez sur <span class="guibutton"><strong>Signatures</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Si votre liste de clés contient plusieurs clés, vous pouvez définir la clé courante. Pour ce faire, cochez la case <span class="guibutton"><strong>Courante</strong></span> à côté de la clé. La clé courante sera utilisée pour le chiffrement à partir de maintenant.</p></li>
-<li class="step"><p role="presentation">Pour afficher les détails d'une clé, cliquez sur l'icône <span class="guibutton"><strong>Détails</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> à côté de la clé. La fenêtre <span class="guilabel"><strong>Détails d'une clé</strong></span> s'ouvre. Pour afficher les signatures d'une clé, cliquez sur <span class="guibutton"><strong>Signatures</strong></span>.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.download">
-<p class="title">Pour télécharger une clé depuis la fenêtre <span class="guilabel"><strong>Vos clés</strong></span> :</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.manage">
+<p class="title">Pour gérer vos clés S/MIME existantes :</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Télécharger</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> à côté d'une clé.</p></li>
 <li class="step">
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
+<p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>   . Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>S/MIME</strong></span>.</p>
+<p role="presentation">Cliquez sur <span class="guibutton"><strong>Activer S/MIME</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Gérer les clés</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> à côté d'une clé principale. Utilisez les fonctions suivantes. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Si votre liste de clés contient plusieurs clés, vous pouvez définir la clé courante. Pour ce faire, cochez la case <span class="guibutton"><strong>Utiliser comme clé courante</strong></span>. La clé courante sera utilisée à partir de maintenant pour le chiffrement.</p></li>
+<li class="listitem">
+<p role="presentation">Pour télécharger une clé privée, cliquez sur <span class="guibutton"><strong>Télécharger</strong></span>.</p>
 <p role="presentation">Choisissez si vous souhaitez télécharger votre clé privée uniquement, votre clé publique uniquement, ou les deux clés.</p>
 <p role="presentation"><span class="phrase"><strong>Attention :</strong></span> votre clé privée sera téléchargée sous forme chiffrée. Vous ne devriez toutefois pas télécharger votre clé privée sur un système en accès public.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.delete">
-<p class="title">Pour supprimer une clé depuis la fenêtre <span class="guilabel"><strong>Vos clés</strong></span> :</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Attention :</strong></span> si vous supprimez une clé privée, vous ne pourrez plus déchiffrer les objets ayant été chiffrés avec cette clé. Si vous n'êtes pas certain, vous ne devriez pas supprimer la clé mais la révoquer. Une clé révoquée ne peut plus être utilisée pour le chiffrement, mais vous pouvez toujours déchiffrer des objets ayant été chiffrés à l'aide de cette clé.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Supprimer</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> à côté d'une clé. La fenêtre <span class="guilabel"><strong>Supprimer la clé privée</strong></span> s'ouvre.</p></li>
-<li class="step"><p role="presentation">Vous disposez des options suivantes : <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Pour révoquer ou supprimer une clé privée, cliquez sur <span class="guibutton"><strong>Supprimer</strong></span>. La fenêtre <span class="guilabel"><strong>Supprimer la clé privée</strong></span> s'ouvre alors. Remarques : <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Si vous révoquez une clé, celle-ci n'est plus utilisée. Vous pouvez toutefois toujours déchiffrer les objets qui ont été chiffrés avec cette clé. Pour cette raison, il set préférable de révoquer une clé plutôt que de la supprimer.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Avertissement :</strong></span> si vous supprimez une clé privée, vous ne pourrez plus déchiffrer les objets ayant été chiffrés avec cette clé.</p></li>
+</ul> <p role="presentation">Vous disposez des options suivantes :</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">Pour révoquer la clé, cliquez sur <span class="guibutton"><strong>Révoquer</strong></span>.</p>
-<p role="presentation">Si vous révoquez une clé, celle-ci n'est plus utilisée. Vous pouvez toutefois toujours déchiffrer les objets qui ont été chiffrés avec cette clé. Pour cette raison, il set préférable de révoquer une clé plutôt que de la supprimer.</p>
 <p role="presentation">Saisissez le mot de passe de la clé privée. Si nécessaire, sélectionnez une raison justifiant la révocation de la clé.</p>
 <p role="presentation">Cliquez sur <span class="guibutton"><strong>Révoquer</strong></span>.</p>
+<p role="presentation">Vous pouvez également cliquer sur <span class="guibutton"><strong>Révoquer</strong></span> dans le menu.</p>
 </li>
 <li class="listitem">
 <p role="presentation">Pour supprimer une clé privée, cliquez sur l'icône <span class="guibutton"><strong>Supprimer</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Avertissement :</strong></span> si vous supprimez une clé privée, vous ne pourrez plus déchiffrer les objets ayant été chiffrés avec cette clé.</p>
 <p role="presentation">Saisissez le mot de passe de la clé privée.</p>
 <p role="presentation">Cliquez sur le bouton <span class="guibutton"><strong>Supprimer</strong></span>.</p>
 </li>
 </ul></p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yoursmimekeys">
@@ -137,7 +121,7 @@
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gérer vos clés PGP personnelles</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gérer les clés publiques</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gérer les clés PGP des destinataires</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a>
@@ -145,7 +129,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yoursmimekeys">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yoursmimekeys">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.change.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.change.html
new file mode 100644
index 000000000..5d90562ea
--- /dev/null
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.change.html
@@ -0,0 +1,75 @@
+<html lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Changer le mot de passe</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuel de l'utilisateur">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Gestion des mots de passe">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Gestion des mots de passe">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.reset.html" title="réinitialiser le mot de passe">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Précédent</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.reset.html">Suivant</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Chiffrer les données avec <span class="phrase">Sécurité</span>
+</h1>
+<h2 class="sr-only">Gestion des mots de passe</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.change">
+<div class="titlepage"><div><div><h3 class="title">Changer le mot de passe</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.6.2"></a><a class="indexterm" name="id-1.14.12.6.3"></a><p role="presentation" class="cap-smime">Suivant la configuration, vous pouvez aussi utiliser S/MIME pour le chiffrement au lieu de PGP. Des mots de passe distincts seront utilisés pour PGP et S/MIME.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.change">
+<p class="title">Pour changer le mot de passe de sécurité <span class="phrase">Sécurité</span> :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.change"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
+<p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>. Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>Gestion des mots de passe (PGP)</strong></span><span class="cap-smime"> ou sur <span class="guibutton"><strong>Gestion des mots de passe (S/MIME)</strong></span></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Dans le champ <span class="guibutton"><strong>Ancien mot de passe</strong></span>, saisissez le mot de passe utilisé jusqu'à présent pour chiffrer vos données.</p>
+<p role="presentation">Dans le champ <span class="guibutton"><strong>Nouveau mot de passe</strong></span>, saisissez le mot de passe à utiliser à partir de maintenant pour chiffrer vos données.</p>
+<p role="presentation">Saisissez une deuxième fois le nouveau mot de passe dans le champ <span class="guibutton"><strong>Confirmer le nouveau mot de passe</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Cliquez sur <span class="guibutton"><strong>Changer le mot de passe</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.change">
+        </p>
+<p class="title">Voir aussi :</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">réinitialiser le mot de passe</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Supprimer la fonction de réinitialisation du mot de passe</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.change">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.deleterecovery.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.deleterecovery.html
new file mode 100644
index 000000000..b7d786f6c
--- /dev/null
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.deleterecovery.html
@@ -0,0 +1,74 @@
+<html lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Supprimer la fonction de réinitialisation du mot de passe</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuel de l'utilisateur">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Gestion des mots de passe">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.reset.html" title="réinitialiser le mot de passe">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Gestion des clés">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.reset.html">Précédent</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Suivant</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Chiffrer les données avec <span class="phrase">Sécurité</span>
+</h1>
+<h2 class="sr-only">Gestion des mots de passe</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.deleterecovery">
+<div class="titlepage"><div><div><h3 class="title">Supprimer la fonction de réinitialisation du mot de passe</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.8.2"></a><p id="ox.appsuite.user.concept.guard.password.deleterecovery">Pour être en mesure de réinitialiser votre mot de passe si nécessaire, celui-ci doit être enregistré sur le serveur en version chiffrée. Si vous ne souhaitez pas que votre mot de passe soit enregistré sur le serveur, vous pouvez supprimer la récupération du mot de passe.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
+<p class="title">Pour supprimer la fonction de réinitialisation du mot de passe :</p>
+<div class="taskprerequisites">
+          <p><span class="phrase"><strong>Attention :</strong></span> si vous supprimez la fonction de réinitialisation du mot de passe, vous ne pourrez plus le réinitialiser. Si vous oubliez un jour votre mot de passe, il ne sera plus possible de déchiffrer vos données chiffrées.</p>
+        </div>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.remove"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
+<p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>. Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>Avancé</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Sous <span class="guibutton"><strong>Options de réinitialisation</strong></span>, cliquez sur <span class="guibutton"><strong>Supprimer la récupération du mot de passe</strong></span>. La fenêtre <span class="guilabel"><strong>Supprimer la récupération</strong></span> s'ouvre.</p></li>
+<li class="step"><p role="presentation">Cliquez sur le bouton <span class="guibutton"><strong>Supprimer</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.deleterecovery">
+        </p>
+<p class="title">Voir aussi :</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Changer le mot de passe</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">réinitialiser le mot de passe</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.deleterecovery">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.html
index 849c20239..f877b4115 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Chiffrer les données avec Sécurité">
 <link rel="prev" href="ox.appsuite.user.sect.guard.logout.html" title="Se déconnecter de Sécurité">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Gestion des clés">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.change.html" title="Changer le mot de passe">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.logout.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Suivant</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.change.html">Suivant</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,102 +33,24 @@
 </h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.password">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Gestion des mots de passe</h2></div></div></div>
-<a class="indexterm" name="id-1.14.12.2"></a><a class="indexterm" name="id-1.14.12.3"></a><a class="indexterm" name="id-1.14.12.4"></a><a class="indexterm" name="id-1.14.12.5"></a><a class="indexterm" name="id-1.14.12.6"></a><p id="ox.appsuite.user.concept.guard.password">Vous disposez des options suivantes :</p>
+<a class="indexterm" name="id-1.14.12.2"></a><p id="ox.appsuite.user.concept.guard.password">Vous disposez des options suivantes : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Modifier le mot de passe de sécurité <span class="phrase">Sécurité</span> </p></li>
-<li class="listitem"><p role="presentation">Lorsque vous avez oublié votre mot de passe de sécurité <span class="phrase">Sécurité</span>,  vous pouvez obtenir un mot de passe de sécurité <span class="phrase">Sécurité</span> temporaire en réinitialisant le mot de passe de sécurité <span class="phrase">Sécurité</span> </p></li>
-<li class="listitem"><p role="presentation">Définir une adresse électronique pour réinitialiser le mot de passe.</p></li>
-<li class="listitem"><p role="presentation">Pour être en mesure de réinitialiser votre mot de passe si nécessaire, celui-ci doit être enregistré sous forme chiffrée sur le serveur. Si vous souhaitez pas que votre mot de passe soit enregistré sur le serveur, vous pouvez supprimer la fonction de récupération du mot de passe. </p></li>
-<li class="listitem cap-smime" id="id-1.14.12.7.1.5"><p role="presentation">Suivant la configuration, vous pouvez également utiliser S/MIME pour le chiffrement au lieu de PGP. Dans ce cas, des mots de passe distincts sont utilisés pour PGP et S/MIME.</p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Changer le mot de passe</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">réinitialiser le mot de passe</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Supprimer la fonction de réinitialisation du mot de passe</a></p></li>
 </ul>
-<p>Remarque : suivant la configuration, certaines fonctions peuvent ne pas être disponibles.</p>
-<div class="task help-hide-inline" id="ox.appsuite.user.task.guard.password">
-<p class="title">Pour ouvrir les fonctions de gestion des mots de passe :</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
-<p role="presentation">Vous pouvez également cliquer sur <span class="guibutton"><strong>Réglages</strong></span> dans le lanceur d'applications.</p>
-<p role="presentation">La fenêtre <span class="guilabel"><strong>Réglages</strong></span> s'ouvre alors.</p>
-</li>
-<li class="step">
-<p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>.</p>
-<p role="presentation">La page <span class="phrase"><span class="guilabel"><strong>Réglages de sécurité Sécurité</strong></span></span>  s'affiche alors.</p>
-<p role="presentation">Les fonctions de gestion des mots de passe sont affichées.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.change">
-<p class="title">Pour changer le mot de passe de sécurité <span class="phrase">Sécurité</span> :</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Cliquez sur <span class="guibutton"><strong>Changer le mot de passe</strong></span>.</p>
-<p role="presentation" class="cap-smime">Suivant la configuration, la fenêtre <span class="guilabel"><strong>Sélectionnez le type de clés à modifier</strong></span> s'ouvre. Suivant le type de chiffrement pour lequel vous souhaitez réinitialiser le mot de passe, sélectionnez <span class="guibutton"><strong>PGP</strong></span> ou <span class="guibutton"><strong>S/MIME</strong></span>. La fenêtre <span class="guilabel"><strong>Réinitialiser le mot de passe</strong></span> s'ouvre alors.</p>
-</li>
-<li class="step">
-<p role="presentation">Dans le champ <span class="phrase"><span class="guibutton"><strong>Saisissez votre mot de passe Sécurité actuel</strong></span></span>, saisissez le mot de passe que vous avez utilisé jusqu'à présent pour chiffrer vos données.</p>
-<p role="presentation">Dans le champ <span class="phrase"><span class="guibutton"><strong>Saisissez votre nouveau mot de passe Sécurité</strong></span></span>, saisissez le mot de passe que vous souhaitez dorénavant utiliser pour chiffrer vos données.</p>
-<p role="presentation">Confirmez le mot de passe en le saisissant à nouveau dans le champ <span class="phrase"><span class="guibutton"><strong>Vérifiez votre nouveau mot de passe Sécurité</strong></span></span>.</p>
-</li>
-<li class="step"><p role="presentation">Cliquez sur <span class="guibutton"><strong>Modifier</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.reset">
-<p class="title">Pour réinitialiser le mot de passe de sécurité <span class="phrase">Sécurité</span> :</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Cliquez sur <span class="guibutton"><strong>Réinitialiser le mot de passe</strong></span>.</p>
-<p role="presentation" class="cap-smime">Suivant la configuration, la fenêtre <span class="guilabel"><strong>Sélectionnez le type de clés à modifier</strong></span> s'ouvre. Suivant le type de chiffrement pour lequel vous souhaitez réinitialiser le mot de passe, sélectionnez <span class="guibutton"><strong>PGP</strong></span> ou <span class="guibutton"><strong>S/MIME</strong></span>. La fenêtre <span class="guilabel"><strong>Réinitialiser le mot de passe</strong></span> s'ouvre alors.</p>
-<p role="presentation">Cliquez sur <span class="guibutton"><strong>Réinitialiser</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Un nouveau mot de passe sera envoyé à votre adresse électronique secondaire.</p>
-<p role="presentation">Si vous n'avez pas saisi d'adresse de courriel secondaire, le nouveau mot de passe vous sera envoyé à votre adresse de courriel principale.</p>
-<p role="presentation">Ce nouveau mot de passe est maintenant votre mot de passe de sécurité <span class="phrase">Sécurité</span> courant. Vous devriez immédiatement le <a class="link" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.task.guard.settings">modifier</a>.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.secondarymail">
-<p class="title">Pour modifier votre adresse électronique secondaire permettant de réinitialiser le mot de passe :</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Cliquez sur <span class="guibutton"><strong>Définir l'adresse électronique de réinitialisation</strong></span>.</p>
-<p role="presentation" class="cap-smime">Suivant la configuration, la fenêtre <span class="guilabel"><strong>Sélectionnez le type de clés à modifier</strong></span> s'ouvre. Suivant le type de chiffrement pour lequel vous souhaitez réinitialiser le mot de passe, sélectionnez <span class="guibutton"><strong>PGP</strong></span> ou <span class="guibutton"><strong>S/MIME</strong></span>. La fenêtre <span class="guilabel"><strong>Adresse électronique secondaire</strong></span> s'ouvre alors.</p>
-</li>
-<li class="step">
-<p role="presentation">Dans le champ <span class="phrase"><span class="guibutton"><strong>Saisissez votre mot de passe Sécurité actuel</strong></span></span>, saisissez le mot de passe que vous avez utilisé jusqu'à présent pour chiffrer vos données.</p>
-<p role="presentation">Dans le champ <span class="guibutton"><strong>Saisissez une adresse électronique secondaire</strong></span>, saisissez l'adresse de courriel à utiliser pour recevoir un mot de passe temporaire permettant de réinitialiser votre mot de passe de sécurité <span class="phrase">Sécurité</span>.</p>
-<p role="presentation">Saisissez à nouveau l'adresse électronique dans <span class="guibutton"><strong>Vérification de l'adresse électronique</strong></span>.</p>
-<p role="presentation">Cliquez sur <span class="guibutton"><strong>Modifier l'adresse électronique</strong></span>.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
-<p class="title">Pour supprimer la fonction de réinitialisation du mot de passe :</p>
-<div class="taskprerequisites">
-        <p><span class="phrase"><strong>Attention :</strong></span> si vous supprimez la fonction de réinitialisation du mot de passe, vous ne pourrez plus le réinitialiser. Si vous oubliez un jour votre mot de passe, il ne sera plus possible de déchiffrer vos données chiffrées.</p>
-      </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Activez l'option <span class="guibutton"><strong>Afficher les réglages avancés</strong></span>.</p>
-<p role="presentation">Cliquez sur <span class="guibutton"><strong>Supprimer la récupération de mot de passe</strong></span>. La fenêtre <span class="guilabel"><strong>Supprimer la récupération</strong></span> s'ouvre.</p>
-</li>
-<li class="step"><p role="presentation">Cliquez sur le bouton <span class="guibutton"><strong>Supprimer</strong></span>.</p></li>
-</ol></div>
-</div>
+<p> Remarque : suivant la configuration, certaines de ces fonctions peuvent être indisponibles.</p>
 <p id="ox.appsuite.user.related.guard.password">
       </p>
 <p class="title">Voir aussi :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gérer vos clés PGP personnelles</a>
-          </p>
-<p role="presentation" class="cap-smime">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gérer vos clés S/MIME personnelles</a>
-          </p>
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gérer les clés publiques</a>
-          </p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Réglages de <span class="phrase">Sécurité</span></a>
+          </p></li>
+</ul>
 <p>
     </p>
 <p id="ox.appsuite.user.parent.guard.password">Sujet parent : <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Chiffrer les données avec <span class="phrase">Sécurité</span></i></a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.reset.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.reset.html
new file mode 100644
index 000000000..732853126
--- /dev/null
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.password.reset.html
@@ -0,0 +1,91 @@
+<html lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>réinitialiser le mot de passe</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuel de l'utilisateur">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Gestion des mots de passe">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.change.html" title="Changer le mot de passe">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Supprimer la fonction de réinitialisation du mot de passe">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.change.html">Précédent</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Suivant</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Chiffrer les données avec <span class="phrase">Sécurité</span>
+</h1>
+<h2 class="sr-only">Gestion des mots de passe</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.reset">
+<div class="titlepage"><div><div><h3 class="title">réinitialiser le mot de passe</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.7.2"></a><a class="indexterm" name="id-1.14.12.7.3"></a><p id="ox.appsuite.user.concept.guard.password.reset">Vous disposez des options suivantes : </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Si vous perdez votre mot de passe <span class="phrase">Sécurité</span>, vous pouvez demander un mot de passe <span class="phrase">Sécurité</span> temporaire en réinitialisant le mot de passe <span class="phrase">Sécurité</span>.</p></li>
+<li class="listitem"><p role="presentation">Vous pouvez définir une adresse électronique pour la réinitialisation du mot de passe.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.password.reset">
+<p class="title">Pour réinitialiser le mot de passe de sécurité <span class="phrase">Sécurité</span> :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Cliquez sur l'icône <span class="guibutton"><strong>Réglages</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.reset"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> dans la barre de menu. Cliquez sur <span class="guibutton"><strong>Tous les réglages</strong></span>.</p>
+<p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>. Dans le panneau de droite, cliquez sur <span class="guibutton"><strong>Gestion des mots de passe (PGP)</strong></span><span class="cap-smime"> ou sur <span class="guibutton"><strong>Gestion des mots de passe (S/MIME)</strong></span></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Pour définir une adresse électronique secondaire à laquelle est envoyé le mot de passe temporaire, cliquez sur <span class="guibutton"><strong>Définir l'adresse électronique pour la réinitialisation</strong></span>. La fenêtre <span class="guilabel"><strong>Adresse électronique secondaire</strong></span> s'ouvre alors.</p>
+<p role="presentation">Saisissez votre mot de passe actuel, ainsi que l'adresse électronique que vous souhaitez utiliser en cas de réinitialisation du mot de passe.</p>
+</li>
+<li class="step">
+<p role="presentation">Cliquez sur <span class="guibutton"><strong>Réinitialiser le mot de passe</strong></span>. La fenêtre <span class="guilabel"><strong>Réinitialiser le mot de passe</strong></span> s'ouvre.</p>
+<p role="presentation">Cliquez sur <span class="guibutton"><strong>Réinitialiser</strong></span>.</p>
+</li>
+</ol></div>
+<div class="taskrelated">
+          <p>Résultat : </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">Un nouveau mot de passe sera envoyé à votre adresse électronique secondaire.</p>
+<p role="presentation">Si vous n'avez pas saisi d'adresse de courriel secondaire, le nouveau mot de passe vous sera envoyé à votre adresse de courriel principale.</p>
+</li>
+<li class="listitem"><p role="presentation">Ce nouveau mot de passe est maintenant votre mot de passe de sécurité <span class="phrase">Sécurité</span> actuel. Vous devriez le modifier immédiatement.</p></li>
+</ul>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.reset">
+        </p>
+<p class="title">Voir aussi :</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Changer le mot de passe</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Supprimer la fonction de réinitialisation du mot de passe</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.reset">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.settings.html b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.settings.html
index eba7b58fe..46c3cc5d0 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.guard.settings.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.guard.settings.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Chiffrer les données avec Sécurité">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gérer les clés publiques">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Gérer les clés S/MIME des destinataires">
 <link rel="next" href="ox.appsuite.user.index.html" title="Index">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.index.html">Suivant</a></li>
@@ -44,84 +44,170 @@
 </li>
 <li class="step"><p role="presentation">Dans le panneau de gauche, cliquez sur <span class="phrase"><span class="guibutton"><strong>Sécurité</strong></span></span>.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>La page <span class="phrase"><span class="guilabel"><strong>Réglages de sécurité Sécurité</strong></span></span>  s'affiche alors.</p>
-      </div>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings">Les réglages suivants sont disponibles :</p>
+<p id="ox.appsuite.user.reference.guard.settings">Suivant la configuration, les réglages suivants sont disponibles :</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.default">Réglages par défaut de <span class="phrase">Sécurité</span></a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.pgppasswords">Gestion des mots de passe (PGP)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.smimepasswords">Gestion des mots de passe (S/MIME)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yourpgpkeys">Vos clés PGP</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientpgpkeys">Clés PGP des destinataires</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yoursmime">S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientsmime">Destinataires S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.advanced">Avancé</a></p></li>
+</ul>
+<p>Voir aussi : <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Chercher des réglages</a></p>
 <p id="ox.appsuite.user.reference.guard.settings.default"></p>
-<h3 class="title">Réglages par défaut</h3>
+<h3 class="title">Réglages par défaut de <span class="phrase">Sécurité</span>
+</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.encrypt"><b>chiffrer par défaut à la rédaction d'un nouveau message. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>Définit si un nouveau courriel est chiffré par défaut.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.sign"><b>Signer par défaut les courriels sortants. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Définit si un nouveau courriel est chiffré par défaut.</p></li>
-<li class="listitem cap-smime" id="id-1.14.14.7.2.1.3">
-<p id="ox.appsuite.user.task.guard.settings.default.smime"><b>Utiliser par défaut S/MIME pour la signature et le chiffrement. </b><a class="indexterm" name="id-1.14.14.7.2.1.3.1.2"></a>
+<li class="listitem">
+<p id="ox.appsuite.user.reference.guard.settings.default.create"><b>Options de rédaction. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>
                 </p>
-<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p role="presentation">Définit si S/MIME est utilisé par défaut pour le chiffrement et la signature. </p></li></ul>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.encrypt"><b>chiffrer par défaut à la rédaction d'un nouveau message. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.1.1.2"></a>Définit si un nouveau courriel est chiffré par défaut.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.sign"><b>Signer par défaut les courriels sortants. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.2.1.2"></a>Définit si un nouveau courriel est chiffré par défaut.</p></li>
+<li class="listitem cap-smime" id="id-1.14.14.7.2.1.1.1.3.1.3">
+<p id="ox.appsuite.user.task.guard.settings.default.create.smime"><b>Utiliser par défaut S/MIME pour la signature et le chiffrement. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.3.1.2"></a>
+                        </p>
+<ul class="itemizedlist" style="list-style-type: square; "><li class="listitem"><p role="presentation">Définit si S/MIME est utilisé par défaut pour le chiffrement et la signature.</p></li></ul>
 <p>
-              </p>
+                      </p>
 </li>
-<li class="listitem">
-<p id="ox.appsuite.user.task.guard.settings.default.inline"><b>Utiliser par défaut PGP dans le corps pour les nouveaux courriels. </b><a class="indexterm" name="id-1.14.14.7.2.1.4.1.2"></a>Remarque : cette fonction n'est disponible que si vous avez coché la case <span class="guibutton"><strong>Réglages avancés</strong></span>. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">Définit si PGP dans le corps (PGP/Inline) est utilisé par défaut pour le chiffrement.</p></li>
-<li class="listitem"><p role="presentation">Ces réglages ne sont à utiliser que si le client de courrier du destinataire ne prend pas en charge PGP. Avec PGP dans le corps, le destinataire peut dans tous les cas déchiffrer le message.</p></li>
-<li class="listitem"><p role="presentation">Si vous utilisez ce réglage, vous ne pouvez pas envoyer vos courriels au format HTML.</p></li>
 </ul>
+<p>
+              </p>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Mémorisation par défaut du mot de passe. </b><a class="indexterm" name="id-1.14.14.7.2.1.5.1.2"></a>Définit la durée par défaut pendant laquelle <span class="phrase">Sécurité</span> mémorise le mot de passe. Vous pouvez modifier ce délai lorsque votre mot de passe <span class="phrase">Sécurité</span> est demandé.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Mémorisation par défaut du mot de passe. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Définit la durée par défaut pendant laquelle <span class="phrase">Sécurité</span> mémorise le mot de passe. Vous pouvez modifier ce délai lorsque votre mot de passe <span class="phrase">Sécurité</span> est demandé.</p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.pgppasswords"></p>
+<h3 class="title">Gestion des mots de passe (PGP)</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contient des fonctions de modification ou de réinitialisation du mot de passe PGP.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a></p></li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.reference.guard.settings.password"></p>
-<h3 class="title">Gestion du mot de passe</h3>
+<div id="ox.appsuite.user.reference.guard.settings.smimepasswords" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.smimepasswords"></p>
+<h3 class="title">Gestion des mots de passe (S/MIME)</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">Contient des fonctions de modification ou de réinitialisation du mot de passe.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contient des fonctions de modification ou de réinitialisation du mot de passe S/MIME.</p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestion des mots de passe</a></p></li>
 </ul>
 <p>
       </p>
-<div id="ox.appsuite.user.reference.guard.settings.smime" class="cap-smime">
-<p id="ox.appsuite.user.reference.guard.settings.smime"></p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.yourpgpkeys"></p>
+<h3 class="title">Vos clés PGP</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contient des fonctions de gestion de vos clés PGP.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gérer vos clés PGP personnelles</a></p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.recipientpgpkeys"></p>
+<h3 class="title">Clés PGP des destinataires</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contient des fonctions de gestion des clés PGP de vos destinataires.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gérer les clés PGP des destinataires</a></p></li>
+</ul>
+<p>
+      </p>
+<div id="ox.appsuite.user.reference.guard.settings.yoursmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.yoursmime"></p>
 <h3 class="title">S/MIME</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.smime.enable"><b>Activer S/MIME. </b><a class="indexterm" name="id-1.14.14.9.2.1.1.1.2"></a>Définit si vous pouvez envoyer et recevoir des courriels avec chiffrement S/MIME.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">Contient des fonctions de gestion du chiffrement de type S/MIME.</p>
+<p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a></p>
+</li></ul>
 <p>
       </p>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings.extended"></p>
+<div id="ox.appsuite.user.reference.guard.settings.recipientsmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.recipientsmime"></p>
+<h3 class="title">Destinataires S/MIME</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contient des fonctions d'affichage et d'ajout des certificats des destinataires de type S/MIME. </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a></p></li>
+</ul>
+<p>
+      </p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.advanced"></p>
 <h3 class="title">Avancé</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<p id="ox.appsuite.user.reference.guard.settings.extended.advanced"><b>Réglages avancés. </b><a class="indexterm" name="id-1.14.14.10.2.1.1.1.2"></a>Si l'option <span class="guibutton"><strong>Afficher les réglages avancés</strong></span> est activée, les fonctions et réglages suivants sont disponibles. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
+<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Cache du courrier</strong></span></p>
-<p role="presentation">Définit si un courriel déchiffré est conservé dans le cache du navigateur sous une forme lisible lorsque vous basculez vers autre courriel ou vers une autre application du collecticiel.</p>
-<p role="presentation">Pour supprimer le courriel déchiffré du cache du navigateur, activez l'option <span class="guibutton"><strong>Ne pas conserver les courriels déchiffrés</strong></span>.</p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.email"><b>Afficher les réglages avancés pour la rédaction d'un courriel. </b>
+                </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<a class="indexterm" name="id-1.14.14.14.2.1.1.1.2.1.1.1"></a><p role="presentation">Si cette option est activée, vous pouvez utiliser des options supplémentaires pour l'envoi de courriels chiffrés.</p>
+<p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Envoyer des courriels chiffrés</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Section <span class="guibutton"><strong>Clés</strong></span></p>
-<p role="presentation">Gérer vos propres clés, vos clés publiques et vos clés Autocrypt.</p>
-<p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestion des clés</a></p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.inline"><b>Utiliser par défaut PGP dans le corps pour les nouveaux courriels. </b><a class="indexterm" name="id-1.14.14.14.2.1.2.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Définit si PGP dans le corps (PGP/Inline) est utilisé par défaut pour le chiffrement.</p></li>
+<li class="listitem"><p role="presentation">Ces réglages ne sont à utiliser que si le client de courrier du destinataire ne prend pas en charge PGP. Avec PGP dans le corps, le destinataire peut dans tous les cas déchiffrer le message.</p></li>
+<li class="listitem"><p role="presentation">Si vous utilisez ce réglage, vous ne pouvez pas envoyer vos courriels au format HTML.</p></li>
+</ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Section <span class="guibutton"><strong>Autocrypt</strong></span></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.autocrypt"><b>Réglage Autocrypt. </b><a class="indexterm" name="id-1.14.14.14.2.1.3.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
 <p role="presentation">Configure l'utilisation d'Autocrypt pour les courriels entrants. Vous permet de transférer des clés Autocrypt vers d'autres clients.</p>
 <p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">Chiffrer les conversations par courriel à l'aide d'Autocrypt</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Des options supplémentaires sont disponibles pour l'envoi de courriels chiffrés.</p>
-<p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Envoyer des courriels chiffrés</a></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.cache"><b>Cache du courrier. </b><a class="indexterm" name="id-1.14.14.14.2.1.4.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation">Définit si un courriel déchiffré est conservé dans le cache du navigateur sous une forme lisible lorsque vous basculez vers autre courriel ou vers une autre application du collecticiel.</p>
+<p role="presentation">Pour supprimer le courriel déchiffré du cache du navigateur, activez l'option <span class="guibutton"><strong>Ne pas conserver les courriels déchiffrés</strong></span>.</p>
+</li></ul>
+<p>
+              </p>
 </li>
-</ul>
+<li class="listitem">
+<p id="ox.appsuite.user.task.guard.settings.advanced.reset"><b>Options de réinitialisation. </b><a class="indexterm" name="id-1.14.14.14.2.1.5.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation"><span class="guibutton"><strong>Supprimer la récupération de mot de passe</strong></span>. Supprime la fonction permettant de récupérer un mot de passe perdu.</p>
+<p role="presentation"><span class="phrase"><strong>Attention :</strong></span> si vous supprimez la fonction de réinitialisation du mot de passe, vous ne pourrez plus le réinitialiser. Si vous oubliez un jour votre mot de passe, il ne sera plus possible de déchiffrer vos données chiffrées.</p>
+<p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Supprimer la fonction de réinitialisation du mot de passe</a></p>
 </li></ul>
+<p>
+              </p>
+</li>
+</ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.guard.settings">Sujet parent : <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Chiffrer les données avec <span class="phrase">Sécurité</span></i></a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.settings.commonsettings.html b/help/l10n/fr_FR/ox.appsuite.user.sect.settings.commonsettings.html
index 021bccbc7..46afd5d96 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.settings.commonsettings.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.settings.commonsettings.html
@@ -167,7 +167,7 @@
 <li class="listitem cap-deputy" id="id-1.4.6.11.2.1.3">
 <p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Gérer les délégués. </b>
                 </p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gérer les délégués</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Voir aussi : <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gérer les délégués</a></p></li></ul>
 <p>
               </p>
 </li>
@@ -193,7 +193,7 @@
             <a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser le compte à rebours pour les rendez-vous</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser des comptes à rebours pour les rendez-vous</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.settings.countdown.html b/help/l10n/fr_FR/ox.appsuite.user.sect.settings.countdown.html
index 8bdc5f1f9..d67b18f8a 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.settings.countdown.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.settings.countdown.html
@@ -1,13 +1,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Utiliser le compte à rebours pour les rendez-vous</title>
+<title>Utiliser des comptes à rebours pour les rendez-vous</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Réglages personnalisés">
 <link rel="prev" href="ox.appsuite.user.sect.settings.notifications.html" title="Personnaliser les notifications">
-<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Utiliser la zone de notification">
+<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="utiliser la zone de notification">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Réglages personnalisés</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.countdown">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Utiliser le compte à rebours pour les rendez-vous</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Utiliser des comptes à rebours pour les rendez-vous</h2></div></div></div>
 <a class="indexterm" name="id-1.4.8.2"></a><a class="indexterm" name="id-1.4.8.3"></a><a class="indexterm" name="id-1.4.8.4"></a><p id="ox.appsuite.user.concept.settings.countdown">Vous pouvez activer un compte à rebours pour les rendez-vous à venir. Avant le début du rendez-vous, une fenêtre de compte à rebours bien visible vous rappellera ce rendez-vous. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.settings.notificationarea.html b/help/l10n/fr_FR/ox.appsuite.user.sect.settings.notificationarea.html
index 9b3c48b45..14c8a5986 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.settings.notificationarea.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.settings.notificationarea.html
@@ -1,12 +1,12 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Utiliser la zone de notification</title>
+<title>utiliser la zone de notification</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Réglages personnalisés">
-<link rel="prev" href="ox.appsuite.user.sect.settings.countdown.html" title="Utiliser le compte à rebours pour les rendez-vous">
+<link rel="prev" href="ox.appsuite.user.sect.settings.countdown.html" title="Utiliser des comptes à rebours pour les rendez-vous">
 <link rel="next" href="ox.appsuite.user.sect.settings.personaldata.html" title="Modifier les données personnelles de contact">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Réglages personnalisés</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.notificationarea">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Utiliser la zone de notification</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">utiliser la zone de notification</h2></div></div></div>
 <a class="indexterm" name="id-1.4.9.2"></a><a class="indexterm" name="id-1.4.9.3"></a><p id="ox.appsuite.user.concept.settings.notificationarea">Vous serez notifié dans la zone de notification pour les événements suivants : </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Rappels pour les rendez-vous ou tâches à venir</p></li>
@@ -61,10 +61,10 @@
 <li class="listitem"><p role="presentation">Pour afficher les suggestions d'invitations à des rendez-vous, cliquez sur la date.</p></li>
 <li class="listitem"><p role="presentation">Pour accepter ou décliner un rendez-vous, cliquez sur le bouton correspondant.</p></li>
 </ul></p>
-<p role="presentation" class="feat-io-ox-core-managedResources">Lorsque vous recevez des demandes de réservation pour des ressources gérées, vous pouvez utiliser les fonctions suivantes : <ul class="itemizedlist" style="list-style-type: disc; ">
+<p role="presentation" class="feat-io-ox-core-managedResources">Lorsque vous recevez des demandes de réservation de ressources gérées, vous pouvez utiliser les fonctions suivantes :  <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Pour afficher la demande de réservation dans l'agenda de la ressource, cliquez sur la date.</p></li>
 <li class="listitem"><p role="presentation">Pour accepter ou décliner la demande de réservation, cliquez sur le bouton correspondant.</p></li>
-</ul></p>
+</ul> </p>
 <p role="presentation">S'il y a des tâches en retard, vous pouvez utiliser les fonctions suivantes : <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Pour afficher les détails dans une nouvelle fenêtre, cliquez sur le rappel.</p></li>
 <li class="listitem"><p role="presentation">Pour modifier la tâche, utilisez les fonctions disponibles dans la nouvelle fenêtre.</p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.settings.notifications.html b/help/l10n/fr_FR/ox.appsuite.user.sect.settings.notifications.html
index e0cf2db3a..60a76b3dd 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.settings.notifications.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.settings.notifications.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Réglages personnalisés">
 <link rel="prev" href="ox.appsuite.user.sect.settings.commonsettings.html" title="Ajuster les réglages généraux">
-<link rel="next" href="ox.appsuite.user.sect.settings.countdown.html" title="Utiliser le compte à rebours pour les rendez-vous">
+<link rel="next" href="ox.appsuite.user.sect.settings.countdown.html" title="Utiliser des comptes à rebours pour les rendez-vous">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -60,7 +60,7 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>afficher les notifications de bureau. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Détermine si vous recevrez une notification de bureau en cas de courriel entrant si le collecticiel est en arrière-plan.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>Afficher les notifications de bureau. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Détermine si vous recevrez une notification de bureau en cas de courriel entrant si le collecticiel est en arrière-plan.</p></li>
 <li class="listitem">
 <p role="presentation">Suivant les réglages du navigateur, le bouton <span class="guibutton"><strong>Gérer les droits du navigateur maintenant</strong></span> s'affiche. Cliquez sur le bouton. Votre navigateur vous demande alors si la réception de notifications est autorisée. Accordez ce droit.</p>
 <p role="presentation">Remarque : suivant votre navigateur, il peut être nécessaire d'autoriser la réception de notifications dans les réglages du navigateur proprement dit pour que ce paramètre prenne effet. Vous trouverez plus d'informations dans les pages d'aide de votre navigateur.</p>
@@ -74,7 +74,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.show"><b>Ouvrir automatiquement la zone de notification en cas de nouveaux rappels. </b><a class="indexterm" name="id-1.4.7.8.2.1.1.1.2"></a>Détermine si la zone de notification s'ouvre automatiquement à réception d'un rappel pour un rendez-vous ou une tâche.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.birthdays"><b>Afficher les anniversaires dans la zone de notification. </b>Définit si la zone de notification affiche également les anniversaires à venir.</p></li>
 </ul>
-<p>Voir <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Utiliser la zone de notification</a></p>
+<p>Voir <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">utiliser la zone de notification</a></p>
 <p id="ox.appsuite.user.reference.settings.notifications.email"></p>
 <h3 class="title">courriel</h3>
 <p>
@@ -93,14 +93,14 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem feat-io-ox-core-countdown" id="id-1.4.7.10.2.1.1"><p id="ox.appsuite.user.reference.settings.notifications.calendar.countdown"><b>Compte à rebours. </b><a class="indexterm" name="id-1.4.7.10.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.3"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.4"></a>Définit si une fenêtre de compte à rebours est affichée pour les rendez-vous à venir. Voir <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser le compte à rebours pour les rendez-vous</a></p></li>
+<li class="listitem feat-io-ox-core-countdown" id="id-1.4.7.10.2.1.1"><p id="ox.appsuite.user.reference.settings.notifications.calendar.countdown"><b>Compte à rebours. </b><a class="indexterm" name="id-1.4.7.10.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.3"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.4"></a>Définit si une fenêtre de compte à rebours est affichée pour les rendez-vous à venir. Voir <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser des comptes à rebours pour les rendez-vous</a></p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.settings.notifications.calendar.email"><b>Notifications par courriel. </b>Indique si vous recevez une notification par courriel dans le cas suivant : </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.changes"><b>Recevoir des notifications lorsqu'un rendez-vous auquel vous participez est créé, modifié ou supprimé. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.1.1.2"></a>Un rendez-vous auquel vous participez a été re-créé, modifié ou supprimé.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>recevoir des notifications en tant que créateur du rendez-vous lorsque des participants acceptent ou déclinent. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Un participant a accepté ou décliné un rendez-vous que vous avez créé.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>recevoir des notifications en tant que participant au rendez-vous lorsque d'autres participants acceptent ou déclinent. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>un participant a accepté ou décliné un rendez-vous auquel vous participez.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>supprimer automatiquement le courriel d'invitation une fois que le rendez-vous a été accepté ou décliné. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Détermine si la notification par courriel d'une invitation à un rendez-vous est automatiquement supprimée une fois le rendez-vous accepté ou décliné. Voir aussi : <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Répondre des invitations à des rendez-vous</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>Recevoir des notifications en tant que créateur du rendez-vous lorsque des participants acceptent ou déclinent. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Un participant a accepté ou décliné un rendez-vous que vous avez créé.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>Recevoir des notifications en tant que créateur du rendez-vous lorsque des participants acceptent ou déclinent. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>un participant a accepté ou décliné un rendez-vous auquel vous participez.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>Supprimer automatiquement le courriel d'invitation une fois que le rendez-vous a été accepté ou décliné. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Détermine si la notification par courriel d'une invitation à un rendez-vous est automatiquement supprimée une fois le rendez-vous accepté ou décliné. Voir aussi : <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Répondre des invitations à des rendez-vous</a></p></li>
 </ul>
 </li>
 </ul>
@@ -141,14 +141,14 @@
             <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Chercher des réglages</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser le compte à rebours pour les rendez-vous</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser des comptes à rebours pour les rendez-vous</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Ajuster les réglages généraux</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Utiliser la zone de notification</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">utiliser la zone de notification</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.settings.personaldata.html b/help/l10n/fr_FR/ox.appsuite.user.sect.settings.personaldata.html
index 57f1a7f76..46f682f44 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.settings.personaldata.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.settings.personaldata.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Réglages personnalisés">
-<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Utiliser la zone de notification">
+<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="utiliser la zone de notification">
 <link rel="next" href="ox.appsuite.user.sect.settings.wizard.html" title="Utiliser un assistant pour configurer les applications locales">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.settings.search.html b/help/l10n/fr_FR/ox.appsuite.user.sect.settings.search.html
index a43af1479..73e266630 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.settings.search.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.settings.search.html
@@ -64,7 +64,7 @@
             <a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personnaliser les notifications</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser le compte à rebours pour les rendez-vous</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utiliser des comptes à rebours pour les rendez-vous</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none">
@@ -80,6 +80,9 @@
 <p role="presentation" class="cap-infostore">
             <a class="xref" href="ox.appsuite.user.sect.drive.settings.html">Réglages de <span class="phrase">Fichiers</span></a>
           </p>
+<p role="presentation" class="cap-guard">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Réglages de <span class="phrase">Sécurité</span></a>
+          </p>
 </li>
 </ul>
 <p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.add.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.add.html
index bbaf6f944..3c2250153 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.add.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.add.html
@@ -52,7 +52,7 @@
             <a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importer des tâches</a>
           </p>
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">créer des rendez-vous</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Créer des rendez-vous</a>
           </p>
 </li></ul>
 <p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.detailview.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.detailview.html
index 177d2ff47..4ab685faf 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.detailview.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.detailview.html
@@ -55,7 +55,7 @@
 <li class="listitem"><p role="presentation">Le sujet de la tâche</p></li>
 <li class="listitem"><p role="presentation">La date de rappel de la tâche, le cas échéant</p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.7.10.4.1.5">
-<p role="presentation">Les catégories attribuées</p>
+<p role="presentation">les catégories attribuées</p>
 <p role="presentation">Un clic sur une catégorie recherche les tâches auxquelles cette catégorie a été attribuée.</p>
 </li>
 <li class="listitem"><p role="presentation">Si la tâche se répète, les paramètres de la série s'affichent.</p></li>
@@ -70,7 +70,7 @@
 <li class="listitem"><p role="presentation">la date de début</p></li>
 <li class="listitem"><p role="presentation">définition</p></li>
 <li class="listitem"><p role="presentation">informations de facturation</p></li>
-<li class="listitem"><p role="presentation">pièces jointes</p></li>
+<li class="listitem"><p role="presentation">Pièces jointes</p></li>
 <li class="listitem">
 <p role="presentation">les noms des participants</p>
 <p role="presentation">Si vous cliquez sur un nom, une nouvelle fenêtre s'ouvre. Elle affiche la <span class="guibutton"><strong>vue en halo</strong></span> associée au participant.</p>
@@ -87,14 +87,11 @@
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vue en liste <span class="phrase">Tâches</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.create.html">La fenêtre d'édition</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Afficher les tâches</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Afficher ou enregistrer les pièces jointes à la tâche</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">Appeler les participants à la tâche</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gérer les tâches</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Afficher des contacts dans la vue en halo</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.gui.detailview">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Les composants de <span class="phrase">Tâches</span></a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.foldertree.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.foldertree.html
index 26be54c02..9bfcc4351 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.foldertree.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.foldertree.html
@@ -59,6 +59,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Afficher les tâches</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Ajouter des listes de tâches</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gérer les tâches</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestion des données avec les dossiers</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.list.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.list.html
index edaecc848..45f566605 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.list.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.list.html
@@ -59,17 +59,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.list.html">La vue en liste</a></p></li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.settingsmenu.html">Le menu des réglages de <span class="phrase">Tâches</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.detailview.html">La vue détaillée de <span class="phrase">Tâches</span></a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Afficher les tâches</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Afficher ou enregistrer les pièces jointes à la tâche</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gérer les tâches</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.list">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Les composants de <span class="phrase">Tâches</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.settingsmenu.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
index 42d5e55d8..f8913bbba 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
@@ -53,10 +53,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.menubar.html">La barre de menu</a></p></li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vue en liste <span class="phrase">Tâches</span></a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">S'abonner à des listes de tâches publiques et partagées</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">S'abonner à des listes de tâches publiques et partagées</a></p></li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.settingsmenu">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Les composants de <span class="phrase">Tâches</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.toolbar.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.toolbar.html
index 795e33965..4191d9ccd 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.toolbar.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.gui.toolbar.html
@@ -60,13 +60,7 @@
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Modifier des tâches</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Changer la date d'échéance d'une tâche</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marquer des tâches comme terminées</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Déplacer des tâches vers un autre dossier</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Modifier l'état de confirmation d'une tâche</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Exportation de tâches</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.print.html">Imprimer des tâches</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.delete.html">Suppression de tâches</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gérer les tâches</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.toolbar">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Les composants de <span class="phrase">Tâches</span></a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.categories.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.categories.html
new file mode 100644
index 000000000..37746bc23
--- /dev/null
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Utiliser des catégories pour les tâches</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuel de l'utilisateur">
+<link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Gérer les tâches">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Changer la date d'échéance d'une tâche">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Déplacer des tâches vers un autre dossier">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Précédent</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Suivant</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Tâches</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gérer les tâches</h2>
+<div class="sect2" id="ox.appsuite.user.sect.tasks.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Utiliser des catégories pour les tâches</h3></div></div></div>
+<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.categories">Vous pouvez faire appel aux catégories pour organiser vos tâches indépendamment des agendas. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Vous pouvez attribuer des catégories aux tâches.</p></li>
+<li class="listitem"><p role="presentation">Vous pouvez afficher toutes les tâches correspondant à une catégorie donnée.</p></li>
+</ul>
+<p> Vous pouvez créer, modifier ou supprimer vos catégories personnelles (voir <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>).</p>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories">
+<p class="title">Pour attribuer une catégorie à une tâche :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Sélectionnez une tâche. Cliquez sur l'icône <span class="guibutton"><strong>Modifier</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.mark.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> dans la barre d'outils.</p>
+<p role="presentation">La fenêtre d'édition de tâche s'ouvre.</p>
+</li>
+<li class="step">
+<p role="presentation">Pour procéder, cliquez sur <span class="guibutton"><strong>Ajouter une catégorie</strong></span> à côté de <span class="guibutton"><strong>Catégories</strong></span>. Choisissez une catégorie.</p>
+<p role="presentation">Pour supprimer une catégorie de la tâche, cliquez sur l'icône <span class="guibutton"><strong>Supprimer la catégorie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> figurant à côté de son intitulé.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories.view">
+<p class="title">Pour afficher les tâches associées à une catégorie spécifique :</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Sélectionnez une tâche à laquelle une catégorie a été attribuée.</p></li>
+<li class="step"><p role="presentation">Cliquez sur la catégorie dans la vue détaillée.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Résultat : </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vue en liste affiche toutes les tâches associées à cette catégorie.</p></li>
+<li class="listitem"><p role="presentation">Pour revenir à la liste précédente, cliquez sur l'icône <span class="guibutton"><strong>Annuler la recherche</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> dans le champ de recherche.</p></li>
+</ul>
+          <p>Conseil : vous pouvez aussi utiliser la fonction de recherche et ses options pour rechercher une catégorie.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.tasks.manage.categories">
+        </p>
+<p class="title">Voir aussi :</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Rechercher des tâches</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Par défaut, utiliser PGP dans le corps pour tout nouveau courriel</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utiliser des catégories pour les rendez-vous</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utiliser des catégories pour les contacts</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.tasks.manage.categories">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gérer les tâches</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.changeduedate.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.changeduedate.html
index 10f4bac91..83839c386 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.changeduedate.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.changeduedate.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Gérer les tâches">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="Marquer des tâches comme terminées">
-<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Déplacer des tâches vers un autre dossier">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Utiliser des catégories pour les tâches">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Suivant</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Suivant</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -48,7 +48,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changeduedate"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barre d'outils de <span class="phrase">Tâches</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barre d'outils de <span class="phrase">Tâches</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vue en liste <span class="phrase">Tâches</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.changestatus.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.changestatus.html
index b358b7d68..d1b22eda1 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.changestatus.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.changestatus.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les tâches</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.changestatus">
 <div class="titlepage"><div><div><h3 class="title">Modifier l'état de confirmation d'une tâche</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.10.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Si vous êtes un participant à la tâche, vous pouvez ultérieurement changer votre état de confirmation pour cette tâche. Vous pouvez ajouter un commentaire visible par les autres participants à la tâche.</p>
+<a class="indexterm" name="id-1.10.15.11.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Si vous êtes un participant à la tâche, vous pouvez ultérieurement changer votre état de confirmation pour cette tâche. Vous pouvez ajouter un commentaire visible par les autres participants à la tâche.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.changestatus">
 <p class="title">Pour modifier votre état de confirmation :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changestatus"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barre d'outils de <span class="phrase">Tâches</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barre d'outils de <span class="phrase">Tâches</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vue en liste <span class="phrase">Tâches</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.delete.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.delete.html
index 1be12ce1b..b3c417007 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.delete.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les tâches</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Suppression de tâches</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Attention :</strong></span> les tâches supprimées ne peuvent <span class="phrase"><strong>pas</strong></span> être restaurées.</p>
+<a class="indexterm" name="id-1.10.15.15.2"></a><a class="indexterm" name="id-1.10.15.15.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Attention :</strong></span> les tâches supprimées ne peuvent <span class="phrase"><strong>pas</strong></span> être restaurées.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.delete">
 <p class="title">Pour supprimer des tâches :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -50,9 +50,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.delete">
         </p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barre d'outils de <span class="phrase">Tâches</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vue en liste <span class="phrase">Tâches</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.delete">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gérer les tâches</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.export.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.export.html
index 652c2c282..3d8bf9db9 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.export.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les tâches</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exportation de tâches</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">Vous pouvez exporter des tâches au format iCal. Vous pouvez par exemple utiliser ce format pour échanger vos tâches avec d'autres applications d'agendas. Vous pouvez exporter des tâches individuelles ou l'ensemble des tâches d'un dossier.</p>
+<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><a class="indexterm" name="id-1.10.15.13.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">Vous pouvez exporter des tâches au format iCal. Vous pouvez par exemple utiliser ce format pour échanger vos tâches avec d'autres applications d'agendas. Vous pouvez exporter des tâches individuelles ou l'ensemble des tâches d'un dossier.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.export.selected">
 <p class="title">Pour exporter des tâches individuelles :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -63,12 +63,16 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.export"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barre d'outils de <span class="phrase">Tâches</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Tâches</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barre d'outils de <span class="phrase">Tâches</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vue en liste <span class="phrase">Tâches</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importer des tâches</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.10.15.12.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Télécharger les données personnelles</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.10.15.13.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Télécharger les données personnelles</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.manage.export">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gérer les tâches</a></p>
 </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.html
index 1988e3f71..84ef6a893 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marquer des tâches comme terminées</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Changer la date d'échéance d'une tâche</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utiliser des catégories pour les tâches</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Déplacer des tâches vers un autre dossier</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Modifier l'état de confirmation d'une tâche</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importer des tâches</a></p></li>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.import.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.import.html
index 8283e3e6b..6e5dc776a 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.import.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les tâches</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importer des tâches</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.11.2"></a><a class="indexterm" name="id-1.10.15.11.3"></a><a class="indexterm" name="id-1.10.15.11.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">Vous pouvez importer des tâches depuis des fichiers au format iCal.</p>
+<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">Vous pouvez importer des tâches depuis des fichiers au format iCal.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.import">
 <p class="title">Pour importer des tâches depuis un fichier iCal :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,19 +54,15 @@
           <p>Résultat : les tâches sont ajoutées au dossier.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.tasks.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.tasks.manage.import"></p>
+<p class="title">Interface utilisateur :</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Tâches</span></a></p></li></ul>
+<p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Exportation de tâches</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Créer des tâches</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Exportation de tâches</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Créer des tâches</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.tasks.manage.import">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gérer les tâches</a></p>
 </div>
           </div>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.markasdone.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.markasdone.html
index 5211e59e1..77543254a 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.markasdone.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.markasdone.html
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.markasdone"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barre d'outils de <span class="phrase">Tâches</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barre d'outils de <span class="phrase">Tâches</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vue en liste <span class="phrase">Tâches</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.move.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.move.html
index 309dcfaf4..990a34266 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.move.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.move.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuel de l'utilisateur">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Gérer les tâches">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Changer la date d'échéance d'une tâche">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Utiliser des catégories pour les tâches">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.changestatus.html" title="Modifier l'état de confirmation d'une tâche">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Note légale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Ouvrir la navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Précédent</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Précédent</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Sommaire</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">TdM</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Suivant</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les tâches</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Déplacer des tâches vers un autre dossier</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">Vous pouvez déplacer des tâches vers un autre dossier.</p>
+<a class="indexterm" name="id-1.10.15.10.2"></a><a class="indexterm" name="id-1.10.15.10.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">Vous pouvez déplacer des tâches vers un autre dossier.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.move">
 <p class="title">Pour déplacer des tâches vers un autre dossier :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 <p id="ox.appsuite.user.tip.tasks.manage.move">Conseil : vous pouvez également déplacer les objets sélectionnés en les faisant glisser depuis la vue des dossiers vers un dossier donné.</p>
 <p id="ox.appsuite.user.related.tasks.manage.move"></p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barre d'outils de <span class="phrase">Tâches</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vue des dossiers dans <span class="phrase">Tâches</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barre d'outils de <span class="phrase">Tâches</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vue en liste <span class="phrase">Tâches</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Voir aussi :</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">Ajouter une liste de tâches personnelles</a></p></li></ul>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.print.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.print.html
index 1bc963764..d0da94ec0 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.print.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gérer les tâches</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Imprimer des tâches</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">Vous pouvez imprimer les données d'une ou plusieurs tâches à la fois.</p>
+<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">Vous pouvez imprimer les données d'une ou plusieurs tâches à la fois.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.print.data">
 <p class="title">Pour imprimer les données d'une tâche :</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,9 +51,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.print">
         </p>
 <p class="title">Interface utilisateur :</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barre d'outils de <span class="phrase">Tâches</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vue en liste <span class="phrase">Tâches</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.print">Sujet parent : <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gérer les tâches</a></p>
diff --git a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.search.html b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.search.html
index 23a18a401..78495849a 100644
--- a/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.search.html
+++ b/help/l10n/fr_FR/ox.appsuite.user.sect.tasks.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Afficher les tâches</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gérer les catégories</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utiliser des catégories pour les tâches</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/it_IT/bk01-toc.html b/help/l10n/it_IT/bk01-toc.html
index 12756c9aa..a73b14067 100644
--- a/help/l10n/it_IT/bk01-toc.html
+++ b/help/l10n/it_IT/bk01-toc.html
@@ -64,7 +64,7 @@
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.commonsettings.html">Modificare le impostazioni generali</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a></li>
 <li class="sect1 feat-io-ox-core-countdown"><a href="ox.appsuite.user.sect.settings.countdown.html">Utilizzare i conti alla rovescia per gli appuntamenti</a></li>
-<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">Utilizzare l'area di notifica</a></li>
+<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">utilizzare l'area di notifica</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.personaldata.html">Cambiare i dati personali di contatto</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.wizard.html">Utilizzare una procedura guidata per configurare le applicazioni locali</a></li>
 <li class="sect1 cap-switchboard"><a href="ox.appsuite.user.sect.settings.presencestatus.html">Impostazione dello stato di presenza</a></li>
@@ -134,7 +134,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.new.html">Il pulsante Nuovo messaggio</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Posta elettronica</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">La barra delle schede di <span class="phrase">Posta elettronica</span></a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">La barra delle categorie della posta in arrivo</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.popup.html">La finestra a comparsa di <span class="phrase">Posta elettronica</span></a></li>
@@ -144,13 +144,13 @@
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.view.html">Visualizzare i messaggio di posta</a></li>
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.attachments.html">Visualizzare o salvare gli allegati dei messaggi di posta</a></li>
 <li class="sect1 cap-webmail">
-<a href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a><ul>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">Selezionare un indirizzo mittente</a></li>
+<a href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a><ul>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">selezionare un indirizzo mittente</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.replyto.html">Impostare l'indirizzo di risposta</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">Aggiungere allegati</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">aggiungere allegati</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Aggiungere allegati da messaggi di posta esistenti</a></li>
-<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">Inviare allegati come collegamenti</a></li>
+<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">inviare allegati come collegamenti</a></li>
 <li class="sect2 feat-io-ox-core-templates"><a href="ox.appsuite.user.sect.email.send.templates.html">Utilizzare i modelli</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.signatures.html">Utilizzare le firme</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.reply.html">Rispondere ai messaggi di posta</a></li>
@@ -174,6 +174,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.movecopy.html">Spostare o copiare i messaggi di posta</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.mark.html">Marcare i messaggi di posta come letti o non letti</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collezionare indirizzi</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">Utilizzare PGP in linea in modo predefinito per i nuovi messaggi</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.label.html">Categorizzare i messaggi di posta</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.source.html">Mostrare il sorgente di un messaggio di posta</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.draft.html">Utilizzare le bozze dei messaggi</a></li>
@@ -185,6 +186,9 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.print.html">Stampare i messaggi di posta</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.archive.html">Archiviare i messaggi di posta</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.delete.html">Eliminare i messaggi di posta</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.recover.html">Ripristinare i messaggi di posta</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.deleteforever.html">Eliminare i messaggi di posta</a></li>
+<li class="sect2 cap-dumpster"><a href="ox.appsuite.user.sect.email.manage.undelete.html">Ripristinare definitivamente i messaggi di posta eliminati</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.expungefolder.html">Pulire le cartelle di posta</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilizzare la posta unificata</a></li>
 </ul>
@@ -238,7 +242,7 @@
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.attachments.html">Visualizzare o salvare gli allegati degli appuntamenti</a></li>
 <li class="sect1 cap-calendar">
-<a href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a><ul>
+<a href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a><ul>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.create.html">Creare nuovi appuntamenti</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.datepicker.html">Utilizzare il selettore delle date</a></li>
 <li class="sect2 cap-calendar cap-switchboard"><a href="ox.appsuite.user.sect.calendar.add.call.html">Pianificare conferenze audio/video</a></li>
@@ -252,7 +256,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitare partecipanti a un nuovo appuntamento</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.recipients.html">Invitare destinatari di posta a nuovi appuntamenti</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creare appuntamenti da allegati iCal</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">risolvere i conflitti</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Risolvere i conflitti</a></li>
 </ul>
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.invitation.html">Rispondere agli inviti di appuntamenti</a></li>
@@ -273,6 +277,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Cambiare i promemoria degli appuntamenti</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Cambiare l'organizzatore</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.timezones.html">Gestire i fusi orari preferiti</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">Utilizzare le categorie per gli appuntamenti</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.colors.html">Utilizzare i colori del calendario</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.move.html">Spostare gli appuntamenti in un altro calendario</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.import.html">Importare appuntamenti</a></li>
@@ -360,6 +365,7 @@
 <a href="ox.appsuite.user.sect.contacts.manage.html">Gestire i contatti</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Inviare messaggi dall'interno di una rubrica</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitare contatti a un appuntamento</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">Utilizzo delle categorie per i contatti</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Spostare o copiare contatti</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Inviare i contatti come vCard</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.import.html">Importare contatti</a></li>
@@ -413,6 +419,7 @@
 <a href="ox.appsuite.user.sect.tasks.manage.html">Gestire le attività</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marcare le attività come completate</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Cambiare la data di scadenza di un'attività</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">Utilizzare le categorie per le attività</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.move.html">Spostare le attività in un'altra cartella</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Cambiare le conferme delle attività</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.import.html">Importare le attività</a></li>
@@ -515,7 +522,7 @@
 </ul>
 </li>
 <li class="sect1 cap-deputy">
-<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestire i delegati</a><ul>
+<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestire i delegati</a><ul>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.add.html">Aggiungere delegati</a></li>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">Visualizzare, modificare, eliminare delegati</a></li>
 </ul>
@@ -577,19 +584,26 @@
 </ul>
 </li>
 <li class="sect1 cap-guard">
-<a href="ox.appsuite.user.sect.guard.documents.html">Cifrare i documenti di Office</a><ul>
+<a href="ox.appsuite.user.sect.guard.documents.html">Cifrare documenti di Office</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.createencrypted.html">Creare nuovi documenti cifrati</a></li>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Salvare i documenti selezionati in un formato cifrato</a></li>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.open.html">Aprire i documenti cifrati</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.logout.html">Uscire da <span class="phrase">Guard</span></a></li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a></li>
+<li class="sect1 cap-guard">
+<a href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a><ul>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.change.html">Cambiare la password</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.reset.html">ripristinare la password</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Rimuovere la funzione di ripristino della password</a></li>
+</ul>
+</li>
 <li class="sect1 cap-guard">
 <a href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestire le proprie chiavi PGP</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestire le chiavi PGP dei destinatari</a></li>
 <li class="sect2 cap-smime"><a href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestire le proprie chiavi S/MIME</a></li>
-<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestire le chiavi pubbliche</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Gestire le chiavi S/MIME dei destinatari</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di <span class="phrase">Guard</span></a></li>
diff --git a/help/l10n/it_IT/index.html b/help/l10n/it_IT/index.html
index f9ec7f46f..f98561676 100644
--- a/help/l10n/it_IT/index.html
+++ b/help/l10n/it_IT/index.html
@@ -31,7 +31,7 @@
 <div><h1 class="title">Manuale utente</h1></div>
 <div><p class="copyright">Diritto d'autore ©  OX Software GmbH </p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">Nota Legale</a></div>
-<div><p class="pubdate">martedì, 21. novembre 2023 Version 8.19.0 </p></div>
+<div><p class="pubdate">giovedì, 21. dicembre 2023 Version 8.20.0 </p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">Panoramica degli argomenti della guida</h2>
@@ -81,7 +81,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utilizzare i conti alla rovescia per gli appuntamenti</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Utilizzare l'area di notifica</a>
+                <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">utilizzare l'area di notifica</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Utilizzare una procedura guidata per configurare le applicazioni locali</a>
@@ -94,6 +94,19 @@
               </p></li>
 </ul>
 </li>
+<li class="listitem" id="ox.appsuite.user.startpage.toc.keyboard" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.chap.keyboard.html"><i>Immissione dalla tastiera</i></a>
+            </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.navigation.html">Utilizzo della navigazione tramite tastiera</a>
+              </p></li>
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.shortkeys.html">Utilizzare le scorciatoie da tastiera</a>
+              </p></li>
+</ul>
+</li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.portal" style="list-style-type: none">
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.chap.portal.html"><i>
@@ -132,12 +145,12 @@
                 <a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualizzare i messaggio di posta</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a>
+                <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a>
               </p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.1.5.2.2.1.5.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-openai" id="id-1.1.5.2.2.1.6.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Utilizzare l'integrazione AI</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.5.2.2.1.5.1.6"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.5.2.2.1.6.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.call.html">Chiamare il mittente o un altro destinatario</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -152,13 +165,13 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.search.html">Ricercare i messaggi di posta</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.5.2.2.1.5.1.11"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.5.2.2.1.6.1.11"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Inviare e ricevere messaggi di posta come delegato</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Aggiungere account di posta elettronica</a>
               </p></li>
-<li class="listitem cap-webmail" id="id-1.1.5.2.2.1.5.1.13"><p role="presentation">
+<li class="listitem cap-webmail" id="id-1.1.5.2.2.1.6.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
               </p></li>
 </ul>
@@ -180,7 +193,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Visualizzare gli appuntamenti</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a>
+                <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Rispondere agli inviti di appuntamenti</a>
@@ -188,7 +201,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modificare gli appuntamenti</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.5.2.2.1.6.1.7"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.5.2.2.1.7.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Chiamare i partecipanti a un appuntamento</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -197,25 +210,25 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestire gli appuntamenti</a>
               </p></li>
-<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.5.2.2.1.6.1.10"><p role="presentation">
+<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.5.2.2.1.7.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Utilizzare i calendari delle risorse</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Ricercare gli appuntamenti</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.5.2.2.1.6.1.12"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.5.2.2.1.7.1.12"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creare,modificare o gestire appuntamenti come delegato</a>
               </p></li>
-<li class="listitem cap-edit_group" id="id-1.1.5.2.2.1.6.1.13"><p role="presentation">
+<li class="listitem cap-edit_group" id="id-1.1.5.2.2.1.7.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">Utilizzare i gruppi</a>
               </p></li>
-<li class="listitem cap-edit_resource" id="id-1.1.5.2.2.1.6.1.14"><p role="presentation">
+<li class="listitem cap-edit_resource" id="id-1.1.5.2.2.1.7.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">Utilizzare le risorse</a>
               </p></li>
-<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.5.2.2.1.6.1.15"><p role="presentation">
+<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.5.2.2.1.7.1.15"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">Utilizzare le risorse gestite</a>
               </p></li>
-<li class="listitem cap-calendar" id="id-1.1.5.2.2.1.6.1.16"><p role="presentation">
+<li class="listitem cap-calendar" id="id-1.1.5.2.2.1.7.1.16"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
               </p></li>
 </ul>
@@ -239,7 +252,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Aggiungere automaticamente contatti o risorse da una rubrica</a>
               </p></li>
-<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.5.2.2.1.7.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.5.2.2.1.8.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Aggiunta automatica di contatti o risorse dall'elenco degli indirizzi</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -251,7 +264,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Modificare contatti o liste di distribuzione</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.5.2.2.1.7.1.9"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.5.2.2.1.8.1.9"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Chiamare i contatti</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -266,7 +279,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Ricercare i contatti</a>
               </p></li>
-<li class="listitem cap-contacts" id="id-1.1.5.2.2.1.7.1.14"><p role="presentation">
+<li class="listitem cap-contacts" id="id-1.1.5.2.2.1.8.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Impostazioni della rubrica</a>
               </p></li>
 </ul>
@@ -341,7 +354,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Aggiungere account di archiviazione</a>
               </p></li>
-<li class="listitem cap-infostore" id="id-1.1.5.2.2.1.9.1.10"><p role="presentation">
+<li class="listitem cap-infostore" id="id-1.1.5.2.2.1.10.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.settings.html">Le impostazioni di <span class="phrase">File</span></a>
               </p></li>
 </ul>
@@ -354,19 +367,19 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestire i dati con le cartelle</a>
               </p></li>
-<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.5.2.2.1.10.1.3"><p role="presentation">
+<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.5.2.2.1.11.1.3"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Condividere dati</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.5.2.2.1.10.1.4"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestire i delegati</a>
+<li class="listitem cap-deputy" id="id-1.1.5.2.2.1.11.1.4"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestire i delegati</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Gestire gli account</a>
               </p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.1.5.2.2.1.10.1.6"><p role="presentation">
+<li class="listitem feat-io-ox-core-categories" id="id-1.1.5.2.2.1.11.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>
               </p></li>
-<li class="listitem cap-dataexport" id="id-1.1.5.2.2.1.10.1.7"><p role="presentation">
+<li class="listitem cap-dataexport" id="id-1.1.5.2.2.1.11.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Scaricare i dati personali</a>
               </p></li>
 </ul>
@@ -385,7 +398,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.sessions.html">Visualizzare o uscire dai client attivi</a>
               </p></li>
-<li class="listitem cap-multifactor" id="id-1.1.5.2.2.1.11.1.5"><p role="presentation">
+<li class="listitem cap-multifactor" id="id-1.1.5.2.2.1.12.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Autenticazione multifattore</a>
               </p></li>
 </ul>
@@ -408,7 +421,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Cifrare o decifrare i file</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Cifrare i documenti di Office</a>
+                <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Cifrare documenti di Office</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.guard.logout.html">Uscire da <span class="phrase">Guard</span></a>
diff --git a/help/l10n/it_IT/ox.appsuite.user.chap.calendar.html b/help/l10n/it_IT/ox.appsuite.user.chap.calendar.html
index 9f8061b3b..ec23918ec 100644
--- a/help/l10n/it_IT/ox.appsuite.user.chap.calendar.html
+++ b/help/l10n/it_IT/ox.appsuite.user.chap.calendar.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="index.html" title="Manuale utente">
-<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="Impostazioni di posta elettronica">
+<link rel="prev" href="ox.appsuite.user.sect.email.mailfilter.apply.html" title="Applicare una regola ai messaggi di posta esistenti">
 <link rel="next" href="ox.appsuite.user.sect.calendar.gui.html" title="I componenti di Calendario">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.mailfilter.apply.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.gui.html">Avanti</a></li>
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">I componenti di <span class="phrase">Calendario</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Visualizzare gli appuntamenti</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.attachments.html">Visualizzare o salvare gli allegati degli appuntamenti</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Rispondere agli inviti di appuntamenti</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modificare gli appuntamenti</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.8.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Chiamare i partecipanti a un appuntamento</a></p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/it_IT/ox.appsuite.user.chap.dataorganisation.html
index e3036f6f0..d2a4e3102 100644
--- a/help/l10n/it_IT/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/it_IT/ox.appsuite.user.chap.dataorganisation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="index.html" title="Manuale utente">
-<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="Configurare WebDAV su Windows">
+<link rel="prev" href="ox.appsuite.user.sect.drive.settings.html" title="Le impostazioni di File">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.folder.html" title="Gestire i dati con le cartelle">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.settings.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.folder.html">Avanti</a></li>
@@ -35,7 +35,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestire i dati con le cartelle</a></p></li>
 <li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.12.2.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Condividere dati</a></p></li>
-<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestire i delegati</a></p></li>
+<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestire i delegati</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Gestire gli account</a></p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.12.2.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a></p></li>
 <li class="listitem cap-dataexport" id="id-1.12.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Scaricare i dati personali</a></p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.chap.drive.html b/help/l10n/it_IT/ox.appsuite.user.chap.drive.html
index 3530f641f..85755b3f3 100644
--- a/help/l10n/it_IT/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/it_IT/ox.appsuite.user.chap.drive.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="index.html" title="Manuale utente">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.search.html" title="Ricercare attività">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.delete.html" title="Eliminare le attività">
 <link rel="next" href="ox.appsuite.user.sect.drive.gui.html" title="I componenti di File">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.search.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.delete.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.drive.gui.html">Avanti</a></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.chap.email.html b/help/l10n/it_IT/ox.appsuite.user.chap.email.html
index 6e8d935f3..02078620b 100644
--- a/help/l10n/it_IT/ox.appsuite.user.chap.email.html
+++ b/help/l10n/it_IT/ox.appsuite.user.chap.email.html
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html">I componenti di <span class="phrase">Posta elettronica</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualizzare i messaggio di posta</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualizzare o salvare gli allegati dei messaggi di posta</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">Utilizzare l'integrazione AI</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.7.7.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Chiamare il mittente o un altro destinatario</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Aggiungere cartelle di posta elettronica</a></p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.chap.guard.html b/help/l10n/it_IT/ox.appsuite.user.chap.guard.html
index da75ef5e1..369caf04a 100644
--- a/help/l10n/it_IT/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/it_IT/ox.appsuite.user.chap.guard.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="index.html" title="Manuale utente">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="Gestire i metodi di verifica">
+<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="Chiudere automaticamente la sessione">
 <link rel="next" href="ox.appsuite.user.sect.guard.setup.html" title="Configurare Guard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.autologout.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.setup.html">Avanti</a></li>
@@ -45,7 +45,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.html">Cifrare le conversazioni di posta elettronica</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">Cifrare le conversazioni di posta elettronica con Autocrypt</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Cifrare o decifrare i file</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Cifrare i documenti di Office</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Cifrare documenti di Office</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.logout.html">Uscire da <span class="phrase">Guard</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a></p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.chap.security.html b/help/l10n/it_IT/ox.appsuite.user.chap.security.html
index b7ed4d39b..ea98a086c 100644
--- a/help/l10n/it_IT/ox.appsuite.user.chap.security.html
+++ b/help/l10n/it_IT/ox.appsuite.user.chap.security.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="index.html" title="Manuale utente">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="Visualizzare, modificare, eliminare account">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="Scaricare i dati personali">
 <link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="Visualizzare o uscire dai client attivi">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">Avanti</a></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.chap.settings.html b/help/l10n/it_IT/ox.appsuite.user.chap.settings.html
index 115aeb6be..75b0708a7 100644
--- a/help/l10n/it_IT/ox.appsuite.user.chap.settings.html
+++ b/help/l10n/it_IT/ox.appsuite.user.chap.settings.html
@@ -37,7 +37,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Modificare le impostazioni generali</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Utilizzare i conti alla rovescia per gli appuntamenti</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Utilizzare l'area di notifica</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">utilizzare l'area di notifica</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.personaldata.html">Cambiare i dati personali di contatto</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Utilizzare una procedura guidata per configurare le applicazioni locali</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.4.3.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Impostazione dello stato di presenza</a></p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.chap.tasks.html b/help/l10n/it_IT/ox.appsuite.user.chap.tasks.html
index 9a294cd7b..f25eb4e7c 100644
--- a/help/l10n/it_IT/ox.appsuite.user.chap.tasks.html
+++ b/help/l10n/it_IT/ox.appsuite.user.chap.tasks.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="index.html" title="Manuale utente">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="Impostazioni della rubrica">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.delete.html" title="Eliminare i contatti">
 <link rel="next" href="ox.appsuite.user.sect.tasks.gui.html" title="I componenti di Attività">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.settings.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.delete.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.gui.html">Avanti</a></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.index.html b/help/l10n/it_IT/ox.appsuite.user.index.html
index 83e5fb436..bb2e1897a 100644
--- a/help/l10n/it_IT/ox.appsuite.user.index.html
+++ b/help/l10n/it_IT/ox.appsuite.user.index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="index.html" title="Manuale utente">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="Impostazioni di Guard">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Gestire le chiavi S/MIME dei destinatari">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -21,7 +21,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.settings.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 </ul></div>
@@ -84,7 +84,7 @@
 </dt>
 <dt class="cap-webmail">da messaggio di posta esistente, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Aggiungere allegati da messaggi di posta esistenti</a>
 </dt>
-<dt class="cap-webmail">posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Aggiungere allegati</a>
+<dt class="cap-webmail">posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">aggiungere allegati</a>
 </dt>
 </dl></dd>
 <dt class="">Applicazione</dt>
@@ -154,7 +154,7 @@
 </dl></dd>
 <dt class="">Appuntamenti</dt>
 <dd><dl>
-<dt class="cap-calendar">Aggiungere allegati, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Aggiungere allegati</a>
+<dt class="cap-calendar">aggiungere allegati, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Aggiungere allegati</a>
 </dt>
 <dt class="cap-calendar">aggiungere partecipanti o risorse, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.participants.html">Aggiungere partecipanti o risorse</a>
 </dt>
@@ -188,7 +188,7 @@
 </dt>
 <dt class="cap-calendar">gestire i fusi orari preferiti, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Gestire i fusi orari preferiti</a>
 </dt>
-<dt class="cap-calendar">Importare, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importare appuntamenti</a>
+<dt class="cap-calendar">importare, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importare appuntamenti</a>
 </dt>
 <dt class="cap-calendar">impostare appuntamenti ricorrenti, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.serial.html">Impostare appuntamenti ricorrenti</a>
 </dt>
@@ -198,17 +198,17 @@
 </dt>
 <dt class="cap-calendar">invitare destinatari di posta a nuovi appuntamenti, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.recipients.html">Invitare destinatari di posta a nuovi appuntamenti</a>
 </dt>
-<dt class="cap-calendar">Invitare partecipanti a un nuovo appuntamento, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitare partecipanti a un nuovo appuntamento</a>
+<dt class="cap-calendar">invitare partecipanti a un nuovo appuntamento, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitare partecipanti a un nuovo appuntamento</a>
 </dt>
 <dt class="cap-calendar">modificare, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Modificare gli appuntamenti</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">pianificare una conferenza audio/video, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Pianificare conferenze audio/video</a>
 </dt>
-<dt class="cap-calendar">ri-pianificare in un altro giorno, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Modificare gli appuntamenti</a>
-</dt>
 <dt class="cap-calendar">ricerca, <a class="indexterm" href="ox.appsuite.user.sect.calendar.search.html">Ricercare gli appuntamenti</a>
 </dt>
-<dt class="cap-calendar">risolvere i conflitti, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">risolvere i conflitti</a>
+<dt class="cap-calendar">ripianificare in un altro giorno, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Modificare gli appuntamenti</a>
+</dt>
+<dt class="cap-calendar">risolvere i conflitti, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Risolvere i conflitti</a>
 </dt>
 <dt class="cap-calendar">rispondere a inviti, <a class="indexterm" href="ox.appsuite.user.sect.calendar.invitation.html">Rispondere agli inviti di appuntamenti</a>
 </dt>
@@ -230,6 +230,8 @@
 </dt>
 <dt class="cap-calendar">utilizzare la vista di pianificazione, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utilizzare la vista di pianificazione</a>
 </dt>
+<dt class="feat-io-ox-core-categories">utilizzare le categorie, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utilizzare le categorie per gli appuntamenti</a>
+</dt>
 <dt class="cap-calendar">vista, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.html">Visualizzare gli appuntamenti</a>
 </dt>
 <dt class="cap-calendar">visualizzare allegati, <a class="indexterm" href="ox.appsuite.user.sect.calendar.attachments.html">Visualizzare o salvare gli allegati degli appuntamenti</a>
@@ -315,7 +317,9 @@
 </dt>
 <dt class="cap-tasks">stampare, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.print.html">Stampare le attività</a>
 </dt>
-<dt class="cap-tasks">vista delle cartelle, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista delle cartelle di Attività</a>
+<dt class="feat-io-ox-core-categories">utilizzare le categorie, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utilizzare le categorie per le attività</a>
+</dt>
+<dt class="cap-tasks">Vista delle cartelle, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista delle cartelle di Attività</a>
 </dt>
 <dt class="cap-tasks">vista dettagliata, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.detailview.html">La vista dettagliata di Attività</a>
 </dt>
@@ -386,7 +390,9 @@
 </dt>
 <dt class="cap-calendar">componenti, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.html">I componenti di Calendario</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Creare appuntamenti utilizzando il calendario delle risorse, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creare appuntamenti utilizzando il calendario delle risorse</a>
+<dt class="cap-share_links cap-share_mail_attachments">condividere, vedere condivisione, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Condividere dati</a>
+</dt>
+<dt class="feat-io-ox-core-resourceCalendars">creare appuntamenti utilizzando il calendario delle risorse, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creare appuntamenti utilizzando il calendario delle risorse</a>
 </dt>
 <dt class="cap-calendar">finestra a comparsa, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di Calendario</a>
 </dt>
@@ -394,7 +400,7 @@
 </dt>
 <dt class="cap-calendar">il menu Impostazioni, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">Il menu delle impostazioni di Calendario</a>
 </dt>
-<dt class="cap-calendar">Importare, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importare calendari da file</a>
+<dt class="cap-calendar">importare, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importare calendari da file</a>
 </dt>
 <dt class="cap-calendar">impostazioni, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
@@ -402,19 +408,21 @@
 </dt>
 <dt class="cap-calendar">selettore delle date, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">Il selettore delle date</a>
 </dt>
-<dt class="cap-calendar_google">Sottoscrivere calendari di Google, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Sottoscrivere calendari di Google</a>
+<dt class="cap-calendar_google">sottoscrivere calendari di Google, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Sottoscrivere calendari di Google</a>
 </dt>
 <dt class="cap-calendar">sottoscrivere calendari iCal, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Sottoscrivere calendari esterni da un URL iCal</a>
 </dt>
 <dt class="cap-calendar">sottoscrivere calendari pubblici e condivisi, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Sottoscrivere calendari pubblici e condivisi</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Utilizzare i calendari delle risorse, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Utilizzare i calendari delle risorse</a>
+<dt class="feat-io-ox-core-resourceCalendars">utilizzare i calendari delle risorse, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Utilizzare i calendari delle risorse</a>
 </dt>
 <dt class="cap-calendar">utilizzare i colori del calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Utilizzare i colori del calendario</a>
 </dt>
 <dt class="cap-calendar">utilizzare la vista di pianificazione, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utilizzare la vista di pianificazione</a>
 </dt>
-<dt class="cap-calendar">vista delle cartelle, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista delle cartelle di Calendario</a>
+<dt class="feat-io-ox-core-categories">utilizzare le categorie, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utilizzare le categorie per gli appuntamenti</a>
+</dt>
+<dt class="cap-calendar">Vista delle cartelle, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista delle cartelle di Calendario</a>
 </dt>
 <dt class="cap-calendar">vista dettagliata, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista dettagliata di Calendario</a>
 </dt>
@@ -422,12 +430,9 @@
 </dt>
 <dt class="cap-calendar">vista di pianificazione, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.scheduling.html">La vista di pianificazione</a>
 </dt>
-<dt class="cap-calendar">Vista Elenco, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista Elenco di Calendario</a>
+<dt class="cap-calendar">vista Elenco, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista Elenco di Calendario</a>
 </dt>
 </dl></dd>
-<dt class="cap-share_links cap-share_mail_attachments">calendario</dt>
-<dd><dl><dt class="cap-share_links cap-share_mail_attachments">condividere, vedere condivisione, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Condividere dati</a>
-</dt></dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Calendario delle risorse</dt>
 <dd><dl>
 <dt class="feat-io-ox-core-resourceCalendars">creare, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creare calendari delle risorse e gruppi di calendari delle risorse</a>
@@ -486,7 +491,7 @@
 </dt>
 <dt class="">permessi, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">A cosa servono i permessi?</a>
 </dt>
-<dt class="">Rinominare, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Rinominare le cartelle</a>
+<dt class="">rinominare, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Rinominare le cartelle</a>
 </dt>
 <dt class="cap-infostore">scaricare i contenuti, <a class="indexterm" href="ox.appsuite.user.sect.drive.download.html">Scaricare i file o il contenuto delle cartelle</a>
 </dt>
@@ -494,8 +499,18 @@
 </dt>
 </dl></dd>
 <dt class="feat-io-ox-core-categories">Categorie</dt>
-<dd><dl><dt class="feat-io-ox-core-categories">gestire, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="feat-io-ox-core-categories">gestire, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>
+</dt>
+<dt class="feat-io-ox-core-categories">utilizzo per gli appuntamenti, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utilizzare le categorie per gli appuntamenti</a>
+</dt>
+<dt class="feat-io-ox-core-categories">utilizzo per i contatti, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utilizzo delle categorie per i contatti</a>
+</dt>
+<dt class="feat-io-ox-core-categories">utilizzo per i messaggi di posta, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Utilizzare PGP in linea in modo predefinito per i nuovi messaggi</a>
+</dt>
+<dt class="feat-io-ox-core-categories">utilizzo per le attività, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utilizzare le categorie per le attività</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">Categorie di posta in arrivo</dt>
 <dd><dl><dt class="cap-webmail">lavorare con, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Lavorare con le categorie di posta in arrivo</a>
 </dt></dl></dd>
@@ -514,7 +529,7 @@
 </dt>
 <dt class="cap-guard">Cifrare</dt>
 <dd><dl>
-<dt class="cap-guard">cifrare documenti di Office, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Cifrare i documenti di Office</a>
+<dt class="cap-guard">cifrare documenti di Office, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Cifrare documenti di Office</a>
 </dt>
 <dt class="cap-guard">creare nuovi documenti cifrati, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.createencrypted.html">Creare nuovi documenti cifrati</a>
 </dt>
@@ -529,7 +544,7 @@
 <dt class="cap-guard">salvare i documenti selezionati in un formato cifrato, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Salvare i documenti selezionati in un formato cifrato</a>
 </dt>
 </dl></dd>
-<dt class="cap-guard">Cifrare documenti di Office, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Cifrare i documenti di Office</a>
+<dt class="cap-guard">Cifrare documenti di Office, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Cifrare documenti di Office</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">Condividere, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Condividere dati</a>
 </dt>
@@ -630,6 +645,8 @@
 </dt>
 <dt class="cap-contacts">stampare, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.print.html">Stampare i contatti</a>
 </dt>
+<dt class="feat-io-ox-core-categories">utilizzare le categorie, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utilizzo delle categorie per i contatti</a>
+</dt>
 <dt class="cap-contacts">visualizzare, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.html">Visualizzare i contatti</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualizzare i contatti di una rubrica.</a>
 </dt>
 <dt class="cap-webmail cap-calendar cap-tasks">visualizzare la vista aura, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualizzare i contatti nella vista Aura</a>
@@ -662,7 +679,7 @@
 <div class="indexdiv">
 <h3>D</h3>
 <dl>
-<dt class="">dati personali di contatto, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Cambiare i dati personali di contatto</a>
+<dt class="">Dati personali di contatto, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Cambiare i dati personali di contatto</a>
 </dt>
 <dt class="">Definizioni, <a class="indexterm" href="ox.appsuite.user.sect.about.glossary.html">Terminologia</a>
 </dt>
@@ -674,7 +691,7 @@
 </dt>
 <dt class="cap-deputy">eliminare, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">Visualizzare, modificare, eliminare delegati</a>
 </dt>
-<dt class="cap-deputy">gestire, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestire i delegati</a>
+<dt class="cap-deputy">gestire, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestire i delegati</a>
 </dt>
 <dt class="cap-deputy">gestire i messaggi di posta, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Inviare e ricevere messaggi di posta come delegato</a>
 </dt>
@@ -722,7 +739,7 @@
 </dt>
 <dt class="cap-infostore">file, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.delete.html">Eliminare file o cartelle di File</a>
 </dt>
-<dt class="cap-webmail">posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Eliminare i messaggi di posta</a>
+<dt class="cap-webmail">posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Eliminare i messaggi di posta</a>, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Eliminare i messaggi di posta</a>
 </dt>
 </dl></dd>
 <dt class="">Esecutore di applicazioni, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.applauncher.html">Esecutore delle applicazioni</a>
@@ -990,7 +1007,7 @@
 </dt>
 <dt class="cap-guard">aprire i file cifrati, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.open.html">Aprire i file cifrati</a>
 </dt>
-<dt class="cap-guard">cambiare la password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a>
+<dt class="cap-guard">cambiare la password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Cambiare la password</a>
 </dt>
 <dt class="cap-guard">chiudere la sessione, <a class="indexterm" href="ox.appsuite.user.sect.guard.logout.html">Uscire da Guard</a>
 </dt>
@@ -998,7 +1015,7 @@
 </dt>
 <dt class="cap-guard">cifrare i messaggi di posta in arrivo, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Cifrare i messaggi di posta in arrivo utilizzando una regola di filtro</a>
 </dt>
-<dt class="cap-guard">Cifratura dei documenti di Office, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Cifrare i documenti di Office</a>
+<dt class="cap-guard">Cifratura dei documenti di Office, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Cifrare documenti di Office</a>
 </dt>
 <dt class="cap-guard">cifratura dei file, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.html">Cifrare o decifrare i file</a>, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.encrypt.html">Cifrare i file</a>
 </dt>
@@ -1014,11 +1031,13 @@
 </dt>
 <dt class="cap-guard">eliminare le chiavi di Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestire le chiavi di Autocrypt</a>
 </dt>
-<dt class="cap-guard">gestione delle chiavi, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a>
+<dt class="cap-guard">Gestione delle chiavi, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a>
 </dt>
 <dt class="cap-guard">gestione delle password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a>
 </dt>
-<dt class="cap-guard">gestire le chiavi pubbliche, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestire le chiavi pubbliche</a>
+<dt class="cap-guard">gestire le chiavi PGP dei destinatari, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestire le chiavi PGP dei destinatari</a>
+</dt>
+<dt class="cap-guard">gestire le chiavi S/MIME dei destinatari, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Gestire le chiavi S/MIME dei destinatari</a>
 </dt>
 <dt class="cap-guard">gestire le proprie chiavi PGP, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestire le proprie chiavi PGP</a>
 </dt>
@@ -1034,7 +1053,9 @@
 </dt>
 <dt class="cap-guard">mostrare le chiavi di Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestire le chiavi di Autocrypt</a>
 </dt>
-<dt class="cap-guard">ripristinare la password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a>
+<dt class="cap-guard">rimuovere la funzione di ripristino della password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Rimuovere la funzione di ripristino della password</a>
+</dt>
+<dt class="cap-guard">ripristinare la password, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">ripristinare la password</a>
 </dt>
 <dt class="cap-guard">salvare i documenti selezionati in un formato cifrato, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Salvare i documenti selezionati in un formato cifrato</a>
 </dt>
@@ -1089,21 +1110,19 @@
 </dt>
 </dl></dd>
 <dt class="cap-webmail">importare</dt>
-<dd><dl>
-<dt class="cap-contacts">contatti in formato CSV, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importare contatti</a>
-</dt>
-<dt class="cap-contacts">contatti in formato vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importare contatti</a>
-</dt>
-<dt class="cap-webmail">posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importare i messaggi di posta</a>
-</dt>
-</dl></dd>
+<dd><dl><dt class="cap-webmail">posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importare i messaggi di posta</a>
+</dt></dl></dd>
 <dt class="cap-calendar">Importare</dt>
 <dd><dl>
 <dt class="cap-calendar">appuntamenti, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importare appuntamenti</a>
 </dt>
 <dt class="cap-tasks">attività, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importare le attività</a>
 </dt>
-<dt class="cap-calendar">Calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importare calendari da file</a>
+<dt class="cap-calendar">calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importare calendari da file</a>
+</dt>
+<dt class="cap-contacts">contatti in formato CSV, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importare contatti</a>
+</dt>
+<dt class="cap-contacts">contatti in formato vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importare contatti</a>
 </dt>
 </dl></dd>
 <dt class="cap-switchboard">Impostare lo stato di presenza, <a class="indexterm" href="ox.appsuite.user.sect.settings.presencestatus.html">Impostazione dello stato di presenza</a>
@@ -1122,14 +1141,14 @@
 </dt>
 <dt class="">dati personali di contatto, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Cambiare i dati personali di contatto</a>
 </dt>
-<dt class="cap-deputy">gestire i delegati, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestire i delegati</a>
-</dt>
-<dt class="cap-guard">
-        Guard
+<dt class="cap-infostore">
+        File
         
         
         
-      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di Guard</a>
+      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Le impostazioni di File</a>
+</dt>
+<dt class="cap-deputy">gestire i delegati, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestire i delegati</a>
 </dt>
 <dt class="cap-switchboard">impostare lo stato di presenza, <a class="indexterm" href="ox.appsuite.user.sect.settings.presencestatus.html">Impostazione dello stato di presenza</a>
 </dt>
@@ -1148,19 +1167,19 @@
 <dt class="cap-dataexport">scaricare i dati personali, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Scaricare i dati personali</a>
 </dt>
 </dl></dd>
-<dt class="cap-infostore">impostazioni</dt>
-<dd><dl><dt class="cap-infostore">
-        File
+<dt class="cap-guard">impostazioni</dt>
+<dd><dl><dt class="cap-guard">
+        Guard
         
         
         
-      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Le impostazioni di File</a>
+      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di Guard</a>
 </dt></dl></dd>
 <dt class="">Impostazioni del calendario</dt>
 <dd><dl>
 <dt class="cap-calendar">applicare automaticamente le modifiche agli appuntamenti ricevute tramite posta al proprio calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
-<dt class="">eliminare automaticamente i messaggi di invito quando l'appuntamento è stato accettato o rifiutato, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a>
+<dt class="">Eliminare automaticamente il messaggio di invito dopo che l'appuntamento è stato accettato o rifiutato, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a>
 </dt>
 <dt class="cap-calendar">fine, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
@@ -1172,7 +1191,7 @@
 </dt>
 <dt class="cap-calendar">marcare gli appuntamenti di un giorno intero come "liberi", <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
-<dt class="cap-calendar">Mostrare gli appuntamenti rifiutati, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
+<dt class="cap-calendar">mostrare gli appuntamenti rifiutati, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
 <dt class="cap-calendar">mostrare il calendario dei compleanni, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
@@ -1180,11 +1199,11 @@
 </dt>
 <dt class="cap-calendar">orario lavorativo, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
-<dt class="cap-calendar">Promemoria degli appuntamenti, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
+<dt class="cap-calendar">promemoria degli appuntamenti, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
 <dt class="">ricevere notifiche quando un appuntamento al quale si partecipa viene creato, modificato o eliminato, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a>
 </dt>
-<dt class="">ricevere una notifica come autore di un appuntamento quando i partecipanti accettano o rifiutano, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a>
+<dt class="">Ricevere una notifica come autore di un appuntamento quando i partecipanti accettano o rifiutano, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a>
 </dt>
 <dt class="">Ricevere una notifica come partecipante all'appuntamento quando altri partecipanti accettano o rifiutano, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a>
 </dt>
@@ -1194,11 +1213,11 @@
 </dt>
 <dt class="cap-calendar">scala temporale, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
-<dt class="cap-calendar">Settimana lavorativa, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
+<dt class="cap-calendar">settimana lavorativa, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
 <dt class="cap-calendar">sottoscrivere calendari condivisi, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
-<dt class="cap-calendar">usare il colore della prima categoria per gli appuntamenti, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
+<dt class="cap-calendar">utilizzare il colore della prima categoria per gli appuntamenti, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
 <dt class="cap-calendar">visibilità libero/occupato, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
@@ -1237,7 +1256,7 @@
 </dt>
 <dt class="cap-contacts">collegare gli indirizzi postali con il servizio di mappe, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Impostazioni della rubrica</a>
 </dt>
-<dt class="cap-contacts">nomi, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Impostazioni della rubrica</a>
+<dt class="cap-contacts">Nomi, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Impostazioni della rubrica</a>
 </dt>
 </dl></dd>
 <dt class="cap-infostore">Impostazioni di File</dt>
@@ -1248,11 +1267,14 @@
 </dt>
 <dt class="cap-infostore">mostrare i file e le cartelle nascoste, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Le impostazioni di File</a>
 </dt>
-<dt class="cap-infostore">presentazione per le immagini, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Le impostazioni di File</a>
+<dt class="cap-infostore">Presentazione per immagini, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Le impostazioni di File</a>
 </dt>
 </dl></dd>
+<dt class="cap-guard">Impostazioni di Guard</dt>
+<dd><dl><dt class="cap-guard">opzioni di composizione, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di Guard</a>
+</dt></dl></dd>
 <dt class="cap-calendar">Impostazioni di Jitsi</dt>
-<dd><dl><dt class="cap-calendar">Copiare automaticamente il collegamento nella posizione, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
+<dd><dl><dt class="cap-calendar">copiare automaticamente il collegamento nella posizione, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt></dl></dd>
 <dt class="">Impostazioni di posta elettronica</dt>
 <dd><dl>
@@ -1280,7 +1302,7 @@
 </dt>
 <dt class="cap-webmail">formato del messaggio, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
-<dt class="cap-webmail">inoltrare messaggi di posta come, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
+<dt class="cap-webmail">Inoltrare i messaggi come, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
 <dt class="cap-webmail">inserire il testo originale del messaggio in una risposta, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
@@ -1288,23 +1310,25 @@
 </dt>
 <dt class="cap-webmail">marcare come letto, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
+<dt class="cap-webmail">mostra il testo citato in un colore diverso, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
+</dt>
 <dt class="cap-webmail">mostra l'anteprima del testo, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
 <dt class="cap-webmail">mostra la cartella con tutti i messaggi contrassegnati, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
-<dt class="cap-webmail">mostrare data e ora, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
+<dt class="cap-webmail">Mostra le richieste di conferma di lettura, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
-<dt class="cap-webmail">mostrare il testo citato in un colore diverso, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
+<dt class="cap-webmail">mostrare data e ora, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
 <dt class="cap-webmail">mostrare la cartella con tutti i messaggi non letti, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
 <dt class="cap-webmail">mostrare la dimensione del messaggio, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
-<dt class="cap-webmail">mostrare le richieste di conferma di lettura, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
+<dt class="cap-webmail">mostrare le categorie, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
 <dt class="cap-webmail">pannello di lettura, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
-<dt class="cap-webmail">rimuovere definitivamente i messaggi di posta eliminati, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
+<dt class="cap-webmail">Rimuovere definitivamente i messaggi di posta eliminati, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
 <dt class="cap-webmail">seleziona automaticamente il messaggio letto più recente all'avvio, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
@@ -1321,11 +1345,15 @@
 </dt>
 <dt class="cap-guard">Aggiungere in modo predefinito una firma ai messaggi di posta in uscita, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di Guard</a>
 </dt>
+<dt class="cap-guard">impostazione della cache dei messaggi di posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di Guard</a>
+</dt>
 <dt class="cap-guard">Impostazione predefinita per Ricorda password, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di Guard</a>
 </dt>
-<dt class="cap-guard">impostazioni avanzate, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di Guard</a>
+<dt class="cap-guard">Impostazioni di Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di Guard</a>
+</dt>
+<dt class="cap-guard">mostrare le impostazioni avanzate per la composizione dei messaggi, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di Guard</a>
 </dt>
-<dt class="cap-guard">S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di Guard</a>
+<dt class="cap-guard">ripristinare le opzioni, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di Guard</a>
 </dt>
 <dt class="cap-guard">utilizzare in modo predefinito la cifratura quando si compone un messaggio di posta, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di Guard</a>
 </dt>
@@ -1336,9 +1364,9 @@
 <dd><dl>
 <dt class="cap-calendar">aggiungere sempre una password casuale per la riunione, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
-<dt class="cap-calendar">Copiare automaticamente il collegamento nella posizione, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
+<dt class="cap-calendar">copiare automaticamente il collegamento nella posizione, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
-<dt class="cap-calendar">Copiare le informazioni di accesso nella descrizione, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
+<dt class="cap-calendar">copiare le informazioni di accesso nella descrizione, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Impostazioni del calendario</a>
 </dt>
 </dl></dd>
 <dt class="">Impostazioni generali, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Modificare le impostazioni generali</a>
@@ -1417,7 +1445,7 @@
 </dt>
 </dl></dd>
 <dt class="cap-webmail">Invia</dt>
-<dd><dl><dt class="cap-webmail">posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a>
+<dd><dl><dt class="cap-webmail">posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a>
 </dt></dl></dd>
 <dt class="cap-contacts">Inviare</dt>
 <dd><dl><dt class="cap-contacts">contatti come vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Inviare i contatti come vCard</a>
@@ -1429,7 +1457,7 @@
 <dl>
 <dt class="cap-webmail cap-switchboard">Jitsi</dt>
 <dd><dl>
-<dt class="cap-contacts cap-switchboard">Chiamare i contatti, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Chiamare i contatti</a>
+<dt class="cap-contacts cap-switchboard">chiamare i contatti, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Chiamare i contatti</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">chiamare i partecipanti a un appuntamento, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Chiamare i partecipanti a un appuntamento</a>
 </dt>
@@ -1513,14 +1541,16 @@
 <dd><dl>
 <dt class="">Aprire automaticamente l'area di notifica, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a>
 </dt>
-<dt class="">Utilizzare i conti alla rovescia per gli appuntamenti, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Utilizzare i conti alla rovescia per gli appuntamenti</a>
-</dt>
-<dt class="">Utilizzare l'area di notifica, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Utilizzare l'area di notifica</a>
+<dt class="">utilizzare l'area di notifica, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">utilizzare l'area di notifica</a>
 </dt>
 </dl></dd>
 <dt class="">Notifiche</dt>
-<dd><dl><dt class="">mostrare le notifiche del desktop, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="">mostrare le notifiche del desktop, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a>
+</dt>
+<dt class="">utilizzare i conti alla rovescia per gli appuntamenti, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Utilizzare i conti alla rovescia per gli appuntamenti</a>
+</dt>
+</dl></dd>
 <dt class="cap-tasks">Nuova</dt>
 <dd><dl>
 <dt class="cap-tasks">aggiungere un elenco di attività personali, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.personal.html">Aggiungere elenchi di attività personali</a>
@@ -1538,9 +1568,9 @@
 </dt>
 <dt class="cap-calendar">calendari personali, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.personal.html">Aggiungere calendari personali</a>
 </dt>
-<dt class="cap-calendar">Calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Aggiungere calendari</a>
+<dt class="cap-calendar">calendario, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Aggiungere calendari</a>
 </dt>
-<dt class="cap-webmail">Cartelle di posta, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Aggiungere cartelle di posta elettronica</a>
+<dt class="cap-webmail">cartelle di posta, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Aggiungere cartelle di posta elettronica</a>
 </dt>
 <dt class="cap-contacts">contatto, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.create.html">Creare un nuovo contatto</a>
 </dt>
@@ -1556,7 +1586,7 @@
 </dt>
 <dt class="cap-contacts">lista di distribuzione, <a class="indexterm" href="ox.appsuite.user.sect.contacts.distributionlist.html">Aggiungere liste di distribuzione</a>
 </dt>
-<dt class="cap-webmail">posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a>
+<dt class="cap-webmail">posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a>
 </dt>
 <dt class="cap-contacts">rubrica, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.html">Aggiungere rubriche</a>
 </dt>
@@ -1572,9 +1602,9 @@
 <dd><dl>
 <dt class="">cambiare, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.changepassword.html">Cambiare la password</a>
 </dt>
-<dt class="cap-guard">Cambiare la password di Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a>
+<dt class="cap-guard">Cambiare la password di Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Cambiare la password</a>
 </dt>
-<dt class="cap-guard">Ripristino della password di Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a>
+<dt class="cap-guard">Ripristino della password di Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">ripristinare la password</a>
 </dt>
 <dt class="">Utilizzare le password delle applicazioni, <a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">Utilizzare le password delle applicazioni</a>
 </dt>
@@ -1588,22 +1618,25 @@
 <dt class="cap-infostore">PDF, stampare file come, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Stampare file come PDF</a>
 </dt>
 </dl></dd>
-<dt class="">permessi</dt>
+<dt class="">Permessi</dt>
 <dd><dl>
 <dt class="cap-share_links cap-share_mail_attachments">amministratore, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Quali permessi possono essere utilizzati?</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">applicazione, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Quali permessi possono essere utilizzati?</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">autore, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Quali permessi possono essere utilizzati?</a>
-</dt>
 <dt class="">definizione, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">A cosa servono i permessi?</a>
 </dt>
+<dt class="cap-share_links cap-share_mail_attachments">visualizzatore, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Quali permessi possono essere utilizzati?</a>
+</dt>
+</dl></dd>
+<dt class="cap-share_links cap-share_mail_attachments">permessi</dt>
+<dd><dl>
+<dt class="cap-share_links cap-share_mail_attachments">autore, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Quali permessi possono essere utilizzati?</a>
+</dt>
 <dt class="cap-share_links cap-share_mail_attachments">esempi, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">Casi d'uso dei permessi</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">revisore, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Quali permessi possono essere utilizzati?</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">visualizzatore, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Quali permessi possono essere utilizzati?</a>
-</dt>
 </dl></dd>
 <dt class="cap-calendar cap-switchboard">Pianificare conferenze audio/video, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Pianificare conferenze audio/video</a>
 </dt>
@@ -1633,23 +1666,97 @@
 </dl></dd>
 <dt class="">posta elettronica</dt>
 <dd><dl>
+<dt class="cap-portal">aggiungere al portale, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.addportal.html">Aggiungere un messaggio di posta al portale</a>
+</dt>
+<dt class="cap-webmail">aggiungere allegati, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">aggiungere allegati</a>
+</dt>
+<dt class="cap-webmail">aggiungere allegati da messaggi di posta esistenti, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Aggiungere allegati da messaggi di posta esistenti</a>
+</dt>
+<dt class="cap-webmail">aggiungere una cartella, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Aggiungere cartelle di posta elettronica</a>
+</dt>
+<dt class="cap-webmail">archiviare, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">Archiviare i messaggi di posta</a>
+</dt>
+<dt class="cap-webmail">assegnare un colore, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Categorizzare i messaggi di posta</a>
+</dt>
+<dt class="cap-webmail">Categorie di posta in arrivo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Lavorare con le categorie di posta in arrivo</a>
+</dt>
+<dt class="cap-webmail">categorizzare, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Categorizzare i messaggi di posta</a>
+</dt>
 <dt class="cap-guard">cifrare i messaggi di posta in arrivo, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Cifrare i messaggi di posta in arrivo utilizzando una regola di filtro</a>
 </dt>
+<dt class="cap-webmail">copiare, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Spostare o copiare i messaggi di posta</a>
+</dt>
+<dt class="cap-tasks">creare un promemoria, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.reminder.html">Creare promemoria dei messaggi di posta</a>
+</dt>
+<dt class="cap-webmail">eliminare, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Eliminare i messaggi di posta</a>
+</dt>
 <dt class="cap-guard">eliminare le chiavi di Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestire le chiavi di Autocrypt</a>
 </dt>
+<dt class="feat-io-ox-core-mailPDFExport">esportare come PDF, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Esportare messaggi di posta come PDF</a>
+</dt>
+<dt class="cap-webmail">filtri, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Utilizzare i filtri di posta elettronica</a>
+</dt>
+<dt class="cap-webmail">Gestire, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a>
+</dt>
 <dt class="">immagini esterne, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Immagini collegate esternamente nei messaggi di posta</a>
 </dt>
+<dt class="cap-webmail">importare da EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importare i messaggi di posta</a>
+</dt>
+<dt class="cap-webmail">impostare l'indirizzo di risposta, <a class="indexterm" href="ox.appsuite.user.sect.email.send.replyto.html">Impostare l'indirizzo di risposta</a>
+</dt>
+<dt class="cap-webmail">inoltrare, <a class="indexterm" href="ox.appsuite.user.sect.email.send.forward.html">Inoltrare messaggi di posta</a>
+</dt>
+<dt class="cap-webmail">inoltrare automaticamente, <a class="indexterm" href="ox.appsuite.user.sect.email.send.autoforward.html">Inoltrare automaticamente i messaggi di posta</a>
+</dt>
+<dt class="cap-webmail">inviare, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a>
+</dt>
+<dt class="cap-calendar">inviare ai partecipanti a un appuntamento, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attendees.html">Inviare un messaggio di posta ai partecipanti a un appuntamento</a>
+</dt>
+<dt class="cap-infostore">inviare allegati come collegamenti, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">inviare allegati come collegamenti</a>
+</dt>
 <dt class="cap-guard">inviare messaggi di posta cifrati, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Inviare messaggi di posta cifrati</a>
 </dt>
+<dt class="cap-webmail">inviare un avviso di assenza, <a class="indexterm" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Inviare automaticamente un avviso di assenza</a>
+</dt>
 <dt class="cap-guard">leggere i messaggi di posta cifrati, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Leggere i messaggi di posta cifrati</a>
 </dt>
+<dt class="cap-webmail">marcare come letto, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marcare i messaggi di posta come letti o non letti</a>
+</dt>
+<dt class="cap-webmail">marcare come non letto, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marcare i messaggi di posta come letti o non letti</a>
+</dt>
+<dt class="cap-webmail">marcare una cartella come letta, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marcare i messaggi di posta come letti o non letti</a>
+</dt>
 <dt class="cap-guard">mostrare le chiavi di Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestire le chiavi di Autocrypt</a>
 </dt>
+<dt class="cap-webmail">Posta unificata, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilizzare la posta unificata</a>
+</dt>
+<dt class="cap-webmail">pulire le cartelle, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Pulire le cartelle di posta</a>
+</dt>
+<dt class="cap-dumpster">recupera i messaggi di posta eliminati definitivamente, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Ripristinare definitivamente i messaggi di posta eliminati</a>
+</dt>
+<dt class="cap-webmail">ricerca, <a class="indexterm" href="ox.appsuite.user.sect.email.search.html">Ricercare i messaggi di posta</a>
+</dt>
+<dt class="cap-webmail">Ripristinare, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Ripristinare i messaggi di posta</a>
+</dt>
+<dt class="cap-webmail">rispondere, <a class="indexterm" href="ox.appsuite.user.sect.email.send.reply.html">Rispondere ai messaggi di posta</a>
+</dt>
+<dt class="cap-webmail">salvare come EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">Salvare i messaggi di posta</a>
+</dt>
+<dt class="cap-webmail">selezionare un indirizzo mittente, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">selezionare un indirizzo mittente</a>
+</dt>
+<dt class="cap-webmail">spostare, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Spostare o copiare i messaggi di posta</a>
+</dt>
 <dt class="">suoni delle notifiche, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Personalizzare le notifiche</a>
 </dt>
+<dt class="feat-io-ox-core-openai">Utilizzare l'integrazione AI, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Utilizzare l'integrazione AI</a>
+</dt>
+<dt class="feat-io-ox-core-openai">utilizzare le funzioni AI per le risposte, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">Utilizzo delle funzioni AI durante la risposta ai messaggi di posta</a>
+</dt>
+<dt class="cap-webmail">utilizzare una bozza, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">Utilizzare le bozze dei messaggi</a>
+</dt>
 <dt class="cap-guard">verificare le chiavi di Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Gestire le chiavi di Autocrypt</a>
 </dt>
-<dt class="cap-infostore">visualizzare allegati, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Visualizzare gli allegati dei messaggi di posta in File</a>
+<dt class="cap-webmail">visualizzare, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Visualizzare i messaggio di posta</a>
 </dt>
 </dl></dd>
 <dt class="cap-webmail">
@@ -1665,31 +1772,15 @@
   </a>
 </dt>
 <dd><dl>
-<dt class="cap-portal">aggiungere al portale, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.addportal.html">Aggiungere un messaggio di posta al portale</a>
-</dt>
-<dt class="cap-webmail">aggiungere allegati, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Aggiungere allegati</a>
-</dt>
-<dt class="cap-webmail">aggiungere allegati da messaggi di posta esistenti, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Aggiungere allegati da messaggi di posta esistenti</a>
-</dt>
 <dt class="cap-contacts">aggiungere automaticamente da rubrica, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Aggiungere automaticamente contatti o risorse da una rubrica</a>
 </dt>
 <dt class="feat-io-ox-core-enterprisePicker">aggiungere automaticamente da un elenco di indirizzi, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Aggiunta automatica di contatti o risorse dall'elenco degli indirizzi</a>
 </dt>
 <dt class="cap-webmail">aggiungere un account di posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Aggiungere account di posta elettronica</a>
 </dt>
-<dt class="cap-webmail">aggiungere una cartella, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Aggiungere cartelle di posta elettronica</a>
-</dt>
-<dt class="cap-webmail">archiviare, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">Archiviare i messaggi di posta</a>
-</dt>
-<dt class="cap-webmail">assegnare un colore, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Categorizzare i messaggi di posta</a>
-</dt>
 <dt class="cap-webmail">barra degli strumenti, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di Posta elettronica</a>
 </dt>
-<dt class="cap-webmail">barra delle schede, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra delle schede di Posta elettronica</a>
-</dt>
-<dt class="cap-webmail">Categorie di posta in arrivo, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Lavorare con le categorie di posta in arrivo</a>
-</dt>
-<dt class="cap-webmail">categorizzare, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Categorizzare i messaggi di posta</a>
+<dt class="cap-webmail">barra delle categorie della posta in arrivo, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra delle categorie della posta in arrivo</a>
 </dt>
 <dt class="cap-webmail cap-switchboard">chiamare il mittente o un altro destinatario., <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Chiamare il mittente o un altro destinatario</a>
 </dt>
@@ -1701,103 +1792,51 @@
 </dt>
 <dt class="cap-webmail">contrassegnare come letto, impostazione per, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
-<dt class="cap-webmail">copiare, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Spostare o copiare i messaggi di posta</a>
-</dt>
-<dt class="cap-tasks">creare un promemoria, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.reminder.html">Creare promemoria dei messaggi di posta</a>
-</dt>
 <dt class="cap-webmail">disabilitare o abilitare account di posta elettronica funzionali, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Disabilitare o abilitare gli account di posta elettronica funzionali</a>
 </dt>
-<dt class="cap-webmail">eliminare, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Eliminare i messaggi di posta</a>
-</dt>
-<dt class="feat-io-ox-core-mailPDFExport">esportare come PDF, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Esportare messaggi di posta come PDF</a>
-</dt>
-<dt class="cap-webmail">filtri, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Utilizzare i filtri di posta elettronica</a>
+<dt class="cap-webmail">eliminare definitivamente, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Eliminare i messaggi di posta</a>
 </dt>
 <dt class="cap-webmail">finestra a comparsa, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.popup.html">La finestra a comparsa di Posta elettronica</a>
 </dt>
 <dt class="cap-webmail">finestra di modifica, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.create.html">La finestra di modifica dei messaggi di posta</a>
 </dt>
-<dt class="cap-webmail">Gestire, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a>
-</dt>
 <dt class="cap-webmail">il menu Impostazioni, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">Il menu delle impostazioni di Posta elettronica</a>
 </dt>
-<dt class="cap-webmail">importare da EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importare i messaggi di posta</a>
-</dt>
 <dt class="cap-guard">importare le chiavi di Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importare le chiavi di Autocrypt</a>
 </dt>
-<dt class="cap-webmail">impostare l'indirizzo di risposta, <a class="indexterm" href="ox.appsuite.user.sect.email.send.replyto.html">Impostare l'indirizzo di risposta</a>
-</dt>
 <dt class="cap-webmail">impostazioni, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
 </dt>
-<dt class="cap-webmail">inoltrare, <a class="indexterm" href="ox.appsuite.user.sect.email.send.forward.html">Inoltrare messaggi di posta</a>
-</dt>
-<dt class="cap-webmail">inoltrare automaticamente, <a class="indexterm" href="ox.appsuite.user.sect.email.send.autoforward.html">Inoltrare automaticamente i messaggi di posta</a>
-</dt>
-<dt class="cap-webmail">inviare, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a>
-</dt>
-<dt class="cap-calendar">inviare ai partecipanti a un appuntamento, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attendees.html">Inviare un messaggio di posta ai partecipanti a un appuntamento</a>
-</dt>
-<dt class="cap-infostore">Inviare allegati come collegamenti, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Inviare allegati come collegamenti</a>
-</dt>
 <dt class="cap-deputy">inviare come delegato, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Inviare e ricevere messaggi di posta come delegato</a>
 </dt>
 <dt class="cap-webmail">inviare da rubrica, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Inviare messaggi dall'interno di una rubrica</a>
 </dt>
-<dt class="cap-webmail">inviare un avviso di assenza, <a class="indexterm" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Inviare automaticamente un avviso di assenza</a>
-</dt>
-<dt class="cap-webmail">marcare come letto, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marcare i messaggi di posta come letti o non letti</a>
-</dt>
-<dt class="cap-webmail">marcare come non letto, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marcare i messaggi di posta come letti o non letti</a>
-</dt>
-<dt class="cap-webmail">marcare una cartella come letta, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marcare i messaggi di posta come letti o non letti</a>
-</dt>
 <dt class="cap-deputy">modificare, gestire come delegato, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Inviare e ricevere messaggi di posta come delegato</a>
 </dt>
 <dt class="cap-webmail">mostrare il sorgente di un messaggio di posta, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Mostrare il sorgente di un messaggio di posta</a>
 </dt>
-<dt class="cap-webmail">posta unificata, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilizzare la posta unificata</a>
-</dt>
-<dt class="cap-webmail">pulire le cartelle, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Pulire le cartelle di posta</a>
-</dt>
 <dt class="cap-webmail">Pulsante Nuovo messaggio, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.new.html">Il pulsante Nuovo messaggio</a>
 </dt>
-<dt class="cap-webmail">ricerca, <a class="indexterm" href="ox.appsuite.user.sect.email.search.html">Ricercare i messaggi di posta</a>
-</dt>
-<dt class="cap-webmail">rispondere, <a class="indexterm" href="ox.appsuite.user.sect.email.send.reply.html">Rispondere ai messaggi di posta</a>
-</dt>
 <dt class="cap-webmail">salvare allegati, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Visualizzare o salvare gli allegati dei messaggi di posta</a>
 </dt>
-<dt class="cap-webmail">salvare come EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">Salvare i messaggi di posta</a>
-</dt>
-<dt class="cap-webmail">selezionare un indirizzo mittente, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">Selezionare un indirizzo mittente</a>
-</dt>
-<dt class="cap-webmail">spostare, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Spostare o copiare i messaggi di posta</a>
-</dt>
 <dt class="cap-webmail">stampare, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Stampare i messaggi di posta</a>
 </dt>
 <dt class="cap-guard">trasferire le chiavi di Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Trasferire le chiavi di Autocrypt ad altri client</a>
 </dt>
+<dt class="feat-io-ox-core-categories">utilizza le categorie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Utilizzare PGP in linea in modo predefinito per i nuovi messaggi</a>
+</dt>
 <dt class="feat-io-ox-core-openai">utilizzare funzioni AI per comporre messaggi di posta, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Utilizzare le funzioni AI durante la composizione dei messaggi di posta</a>
 </dt>
 <dt class="feat-io-ox-core-templates">utilizzare i modelli, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Utilizzare i modelli</a>
 </dt>
-<dt class="feat-io-ox-core-openai">Utilizzare l'integrazione AI, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Utilizzare l'integrazione AI</a>
-</dt>
 <dt class="cap-webmail">utilizzare le firme, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Utilizzare le firme</a>
 </dt>
-<dt class="feat-io-ox-core-openai">utilizzare le funzioni AI per le risposte, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">Utilizzo delle funzioni AI durante la risposta ai messaggi di posta</a>
-</dt>
-<dt class="cap-webmail">utilizzare una bozza, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">Utilizzare le bozze dei messaggi</a>
-</dt>
-<dt class="cap-webmail">vista delle cartelle, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista delle cartelle di Posta elettronica</a>
+<dt class="cap-webmail">Vista delle cartelle, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista delle cartelle di Posta elettronica</a>
 </dt>
 <dt class="cap-webmail">vista dettagliata, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di Posta elettronica</a>
 </dt>
 <dt class="cap-webmail">vista Elenco, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di Posta elettronica</a>
 </dt>
-<dt class="cap-webmail">visualizzare, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Visualizzare i messaggio di posta</a>
-</dt>
-<dt class="cap-webmail">visualizzare allegati, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Visualizzare o salvare gli allegati dei messaggi di posta</a>
+<dt class="cap-webmail">visualizzare allegati, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Visualizzare o salvare gli allegati dei messaggi di posta</a>, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Visualizzare gli allegati dei messaggi di posta in File</a>
 </dt>
 </dl></dd>
 <dt class="cap-webmail">Posta elettronica, vedere Posta elettronica, <a class="indexterm" href="ox.appsuite.user.chap.email.html">
@@ -1807,7 +1846,7 @@
     
   </a>
 </dt>
-<dt class="cap-webmail">posta unificata, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilizzare la posta unificata</a>
+<dt class="cap-webmail">Posta unificata, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilizzare la posta unificata</a>
 </dt>
 <dt class="cap-calendar">Preferiti</dt>
 <dd><dl>
@@ -1869,13 +1908,20 @@
 <dt class="cap-webmail">messaggi di posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Spostare o copiare i messaggi di posta</a>
 </dt>
 </dl></dd>
+<dt class="cap-webmail">Ripristinare</dt>
+<dd><dl>
+<dt class="cap-dumpster">messaggi di posta eliminati definitivamente, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Ripristinare definitivamente i messaggi di posta eliminati</a>
+</dt>
+<dt class="cap-webmail">posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Ripristinare i messaggi di posta</a>
+</dt>
+</dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Risorsa</dt>
 <dd><dl>
 <dt class="cap-contacts">aggiungere automaticamente da rubrica, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Aggiungere automaticamente contatti o risorse da una rubrica</a>
 </dt>
 <dt class="feat-io-ox-core-enterprisePicker">aggiungere automaticamente da un elenco di indirizzi, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Aggiunta automatica di contatti o risorse dall'elenco degli indirizzi</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Utilizzare i calendari delle risorse, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Utilizzare i calendari delle risorse</a>
+<dt class="feat-io-ox-core-resourceCalendars">utilizzare i calendari delle risorse, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Utilizzare i calendari delle risorse</a>
 </dt>
 <dt class="feat-io-ox-core-managedResources">utilizzare, risorse gestite, <a class="indexterm" href="ox.appsuite.user.sect.calendar.managedresources.html">Utilizzare le risorse gestite</a>
 </dt>
@@ -1930,7 +1976,7 @@
 </dt>
 <dt class="cap-contacts">Pulsante Nuovo contatto, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.new.html">Il pulsante Nuovo contatto</a>
 </dt>
-<dt class="cap-contacts">vista delle cartelle, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista delle cartelle di Rubrica</a>
+<dt class="cap-contacts">Vista delle cartelle, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista delle cartelle di Rubrica</a>
 </dt>
 <dt class="cap-contacts">vista dettagliata, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista dettagliata di Rubrica</a>
 </dt>
@@ -1957,7 +2003,7 @@
 </dt>
 <dt class="">Chiudere automaticamente la sessione, <a class="indexterm" href="ox.appsuite.user.sect.security.autologout.html">Chiudere automaticamente la sessione</a>
 </dt>
-<dt class="cap-guard">cifrare documenti di Office, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Cifrare i documenti di Office</a>
+<dt class="cap-guard">cifrare documenti di Office, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Cifrare documenti di Office</a>
 </dt>
 <dt class="cap-guard">cifrare i messaggi di posta, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.html">Cifrare le conversazioni di posta elettronica</a>
 </dt>
@@ -1982,7 +2028,7 @@
 </dt>
 <dt class="cap-calendar_google">Calendario di Google, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Sottoscrivere calendari di Google</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">Cartelle di posta, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Sottoscrivere le cartelle di posta elettronica condivise o personali</a>
+<dt class="cap-share_links cap-share_mail_attachments">cartelle di posta elettronica, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Sottoscrivere le cartelle di posta elettronica condivise o personali</a>
 </dt>
 <dt class="cap-portal">messaggi da reti sociali, <a class="indexterm" href="ox.appsuite.user.sect.portal.customize.add.html">Aggiungere widget al portale</a>
 </dt>
@@ -2017,7 +2063,7 @@
 </dt>
 <dt class="">navigare, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Navigare all'interno della struttura delle cartelle</a>
 </dt>
-<dt class="">Preferiti, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Aggiungere cartelle ai preferiti</a>
+<dt class="">preferiti, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Aggiungere cartelle ai preferiti</a>
 </dt>
 </dl></dd>
 </dl>
@@ -2027,7 +2073,7 @@
 <dl>
 <dt class="cap-calendar cap-switchboard">Telefono</dt>
 <dd><dl>
-<dt class="cap-contacts cap-switchboard">Chiamare i contatti, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Chiamare i contatti</a>
+<dt class="cap-contacts cap-switchboard">chiamare i contatti, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Chiamare i contatti</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">chiamare i partecipanti a un appuntamento, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Chiamare i partecipanti a un appuntamento</a>
 </dt>
@@ -2047,7 +2093,7 @@
 </dt>
 <dt class="feat-io-ox-core-navigation">Utilizzare i pulsanti del browser, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.browserbuttons.html">Utilizzare i pulsanti del browser</a>
 </dt>
-<dt class="">Utilizzare l'area di notifica, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Utilizzare l'area di notifica</a>
+<dt class="">utilizzare l'area di notifica, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">utilizzare l'area di notifica</a>
 </dt>
 <dt class="cap-calendar">Utilizzare la vista di pianificazione, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utilizzare la vista di pianificazione</a>
 </dt>
@@ -2071,12 +2117,13 @@
 <dt class="cap-contacts">inviare, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Inviare i contatti come vCard</a>
 </dt>
 </dl></dd>
-<dt class="cap-webmail cap-calendar cap-tasks">vista aura, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualizzare i contatti nella vista Aura</a>
+<dt class="cap-webmail cap-calendar cap-tasks">Vista Aura, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualizzare i contatti nella vista Aura</a>
 </dt>
 <dt class="">Vista aura, vedere finestra a comparsa, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.popup.html">La finestra a comparsa</a>
 </dt>
 <dt class="">vista delle cartelle, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.foldertree.html">La vista delle cartelle</a>
 </dt>
+<dt class="">Vista delle cartelle</dt>
 <dd><dl>
 <dt class="">aprire, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Navigare all'interno della struttura delle cartelle</a>
 </dt>
@@ -2084,7 +2131,7 @@
 </dt>
 <dt class="">nascondere le cartelle, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.hide.html">Nascondere le cartelle</a>
 </dt>
-<dt class="">Preferiti, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Aggiungere cartelle ai preferiti</a>
+<dt class="">preferiti, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Aggiungere cartelle ai preferiti</a>
 </dt>
 </dl></dd>
 <dt class="">vista dettagliata, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.detailview.html">La vista dettagliata</a>
@@ -2177,7 +2224,7 @@
 <dl>
 <dt class="cap-calendar cap-switchboard">Zoom</dt>
 <dd><dl>
-<dt class="cap-contacts cap-switchboard">Chiamare i contatti, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Chiamare i contatti</a>
+<dt class="cap-contacts cap-switchboard">chiamare i contatti, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Chiamare i contatti</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">chiamare i partecipanti a un appuntamento, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Chiamare i partecipanti a un appuntamento</a>
 </dt>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.about.glossary.html b/help/l10n/it_IT/ox.appsuite.user.sect.about.glossary.html
index a55b93a79..531236006 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.about.glossary.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.about.glossary.html
@@ -77,10 +77,17 @@
 </dd>
 <dt class="feat-io-ox-core-categories" id="ox.appsuite.user.reference.about.glossary.categories"><span class="glossterm">Categorie</span></dt>
 <dd class="glossdef feat-io-ox-core-categories">
-<p role="presentation">Le categorie possono essere utilizzate per classificare appuntamenti, contatti e attività. In questo modo, gli oggetti semanticamente correlati possono essere identificati e trovati facilmente. A seconda della configurazione, sono predefinite categorie specifiche. È possibile impostare le proprie categorie.</p>
-<p role="presentation">Nota: queste categorie non possono essere utilizzate per i messaggi di posta elettronica. Per i messaggi di posta, ci sono schede della posta in arrivo.</p>
+<p role="presentation">Le categorie consentono di organizzare messaggi di posta elettronica, appuntamenti, contatti e attività tra le applicazioni, indipendentemente dalla struttura delle cartelle. Ciò consente di identificare e trovare più facilmente oggetti logicamente correlati, ad esempio tutti messaggi di posta, gli appuntamenti, i contatti e le attività che appartengono a un progetto o a un cliente specifico. In base alla configurazione, sono predefinite categorie specifiche. È possibile impostare le proprie categorie.</p>
+<p role="presentation">Nota: per i messaggi di posta è possibile utilizzare anche le schede della posta in arrivo.</p>
 <p role="presentation">Argomenti correlati: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a></p></li></ul></p>
 </dd>
+<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Categorie di posta in arrivo</span></dt>
+<dd class="glossdef cap-webmail">
+<p role="presentation">Le schede della posta in arrivo forniscono un modo facile e veloce per tenere pulita la cartella <span class="guilabel"><strong>Posta in arrivo</strong></span>. Con le schede, i messaggi di posta in arrivo sono salvati separatamente per mittente nella cartella <span class="guilabel"><strong>Posta in arrivo</strong></span>. In base alla configurazione, sono definite specifiche categorie. È possibile impostare schede aggiuntive in base alle proprie necessità.</p>
+<p role="presentation">Le schede della posta in arrivo possono essere utilizzate solo nella cartella <span class="guilabel"><strong>Posta in arrivo</strong></span>. Se si ha la necessità di ulteriori opzioni di archiviazione, utilizzare la vista delle cartelle per creare cartelle di posta elettronica.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Nota: le schede della posta in arrivo qui descritte possono essere utilizzate solo per i messaggi di posta elettronica. In base alla configurazione, è possibile utilizzare categorie separate per messaggi di posta, appuntamenti, contatti e attività.</p>
+<p role="presentation">Argomenti correlati: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Lavorare con le categorie di posta in arrivo</a></p></li></ul></p>
+</dd>
 <dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.mailthread"><span class="glossterm">Conversazione di posta elettronica</span></dt>
 <dd class="glossdef cap-webmail">
 <p role="presentation">Una conversazione di posta è un elenco di tutte le risposte successive relative a un messaggio originale. Tutti i messaggi in una conversazione di posta hanno lo stesso oggetto. Il messaggio corrente corrisponde all'ultima risposta.</p>
@@ -96,7 +103,7 @@
 <li class="listitem"><p role="presentation">programmare, modificare o organizzare gli appuntamenti di un altro utente</p></li>
 </ul></p>
 <p role="presentation">Argomenti correlati: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestire i delegati</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestire i delegati</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Inviare e ricevere messaggi di posta come delegato</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creare,modificare o gestire appuntamenti come delegato</a></p>
 </li></ul></p>
@@ -184,13 +191,6 @@
 <p role="presentation">Contiene i dati di contatto per tutti gli utenti. In base alla configurazione, ogni utente può modificare i propri dati personali in questa rubrica.</p>
 <p role="presentation">In base alla configurazione, questa rubrica può avere un nome diverso, ad es. <span class="guilabel"><strong>Utenti interni</strong></span> o <span class="guilabel"><strong>Rubrica globale</strong></span>.</p>
 </dd>
-<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Schede della posta in arrivo</span></dt>
-<dd class="glossdef cap-webmail">
-<p role="presentation">Le schede della posta in arrivo forniscono un modo facile e veloce per tenere pulita la cartella <span class="guilabel"><strong>Posta in arrivo</strong></span>. Con le schede, i messaggi di posta in arrivo sono salvati separatamente per mittente nella cartella <span class="guilabel"><strong>Posta in arrivo</strong></span>. In base alla configurazione, sono definite specifiche categorie. È possibile impostare schede aggiuntive in base alle proprie necessità.</p>
-<p role="presentation">Le schede della posta in arrivo possono essere utilizzate solo nella cartella <span class="guilabel"><strong>Posta in arrivo</strong></span>. Se si ha la necessità di ulteriori opzioni di archiviazione, utilizzare la vista delle cartelle per creare cartelle di posta elettronica.</p>
-<p role="presentation" class="feat-io-ox-core-categories">Nota: le schede della posta in arrivo qui descritte possono essere utilizzate solo per i messaggi di posta elettronica. A seconda della configurazione, è possibile utilizzare categorie separate per appuntamenti, contatti e attività.</p>
-<p role="presentation">Argomenti correlati: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Lavorare con le categorie di posta in arrivo</a></p></li></ul></p>
-</dd>
 <dt id="ox.appsuite.user.reference.about.glossary.session"><span class="glossterm">Sessione</span></dt>
 <dd class="glossdef">
 <p role="presentation">Una sessione è una connessione tra un client, ad es. un browser, un client di posta elettronica o l'applicazione di uno smartphone e un server, ad es. il server di groupware. Una sessione inizia con l'accesso e termina con la disconnessione.</p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.alarms.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.alarms.html
index 4225e2c31..eaf702b59 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.alarms.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.alarms.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.display.html" title="Impostare la visualizzazione di un appuntamento">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Aggiungere partecipanti o risorse">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.alarms">
 <div class="titlepage"><div><div><h3 class="title">Utilizzare i promemoria degli appuntamenti</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.12.2"></a><p id="ox.appsuite.user.concept.calendar.add.alarms">Quando si crea o modifica un appuntamento, è possibile impostare la ricezione di un promemoria per la data di scadenza dell'appuntamento. Per fare ciò, è possibile utilizzare una o più delle notifiche seguenti: </p>
@@ -64,7 +64,7 @@
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Cambiare i promemoria degli appuntamenti</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.alarms">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.alarms">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.attachments.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.attachments.html
index fac3db2b4..e6ee9d2fb 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.attachments.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.attachments.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Aggiungere partecipanti o risorse">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Utilizzare la vista di pianificazione">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attachments">
 <div class="titlepage"><div><div><h3 class="title">Aggiungere allegati</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.14.2"></a><a class="indexterm" name="id-1.8.10.14.3"></a><p id="ox.appsuite.user.concept.calendar.add.attachments">In base alla configurazione, è possibile allegare file salvati sul proprio computer o nella applicazione <span class="phrase">File</span>.</p>
@@ -65,7 +65,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.attachments">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attachments">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.attendees.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.attendees.html
index 230d0a6b7..1a0c5d995 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.attendees.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Creare un appuntamento con seguito">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="Invitare destinatari di posta a nuovi appuntamenti">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attendees">
 <div class="titlepage"><div><div><h3 class="title">Invitare partecipanti a un nuovo appuntamento</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.17.2"></a><p id="ox.appsuite.user.concept.calendar.add.attendees">Se un appuntamento ha più partecipanti, è possibile invitare questi partecipanti a un nuovo appuntamento.</p>
@@ -67,10 +67,10 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utilizzare la vista di pianificazione</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">risolvere i conflitti</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Risolvere i conflitti</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.attendees">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attendees">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.call.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.call.html
index c3f47ab08..611af90ae 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.call.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.call.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Utilizzare il selettore delle date">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Impostare appuntamenti ricorrenti">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.call">
 <div class="titlepage"><div><div><h3 class="title">Pianificare conferenze audio/video</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.9.2"></a><a class="indexterm" name="id-1.8.10.9.3"></a><a class="indexterm" name="id-1.8.10.9.4"></a><a class="indexterm" name="id-1.8.10.9.5"></a><a class="indexterm" name="id-1.8.10.9.6"></a><p id="ox.appsuite.user.precondition.calendar.add.call">Prerequisito: è stato impostato un account con un fornitore di conferenze audio o video.</p>
@@ -71,7 +71,7 @@
 <p role="presentation" class="feat-jitsi"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.jitsi">Riunioni Jitsi</a></p>
 <p role="presentation" class="feat-zoom"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.zoom">Riunioni Zoom</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.call">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.call">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.conflicthandling.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.conflicthandling.html
index 32b6d7f79..c7b4e9217 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.conflicthandling.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.conflicthandling.html
@@ -1,11 +1,11 @@
 <html lang="it">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>risolvere i conflitti</title>
+<title>Risolvere i conflitti</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Creare appuntamenti da allegati iCal">
 <link rel="next" href="ox.appsuite.user.sect.calendar.invitation.html" title="Rispondere agli inviti di appuntamenti">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.conflicthandling">
-<div class="titlepage"><div><div><h3 class="title">risolvere i conflitti</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Risolvere i conflitti</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.20.2"></a><p id="ox.appsuite.user.concept.calendar.add.conflicthandling">Un conflitto si verifica quando le seguenti circostanze coincidono: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
@@ -82,7 +82,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.create.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.create.html
index eaeee9173..87112a123 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.create.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.create.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Utilizzare il selettore delle date">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.create">
 <div class="titlepage"><div><div><h3 class="title">Creare nuovi appuntamenti</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.7.2"></a><a class="indexterm" name="id-1.8.10.7.3"></a><div class="task" id="ox.appsuite.user.task.calendar.add.create">
@@ -110,13 +110,13 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitare partecipanti a un nuovo appuntamento</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Invitare destinatari di posta a nuovi appuntamenti</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creare appuntamenti da allegati iCal</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">risolvere i conflitti</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Risolvere i conflitti</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitare contatti a un appuntamento</a></p>
 <p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modificare gli appuntamenti</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.create">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.create">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.datepicker.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.datepicker.html
index 9253cabf3..c65b1d6ac 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.datepicker.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.datepicker.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.create.html" title="Creare nuovi appuntamenti">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.call.html" title="Pianificare conferenze audio/video">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.datepicker">
 <div class="titlepage"><div><div><h3 class="title">Utilizzare il selettore delle date</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.8.2"></a><p id="ox.appsuite.user.concept.calendar.add.datepicker">Il selettore delle date consente di selezionare la data da inserire in un campo della data.</p>
@@ -87,7 +87,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Modificare le attività</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.datepicker">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.datepicker">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.display.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.display.html
index a96930500..8a979ebe4 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.display.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.display.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Impostare appuntamenti ricorrenti">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Utilizzare i promemoria degli appuntamenti">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.display">
 <div class="titlepage"><div><div><h3 class="title">Impostare la visualizzazione di un appuntamento</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.11.2"></a><p id="ox.appsuite.user.concept.calendar.add.display">Esistono le seguenti opzioni: </p>
@@ -75,7 +75,7 @@
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Come sono visualizzati gli appuntamenti in una vista di calendario? </a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.display">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.display">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.followup.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.followup.html
index 6a3f0fc24..7340f0298 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.followup.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.followup.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Utilizzare la vista di pianificazione">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Invitare partecipanti a un nuovo appuntamento">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.followup">
 <div class="titlepage"><div><div><h3 class="title">Creare un appuntamento con seguito</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.16.2"></a><a class="indexterm" name="id-1.8.10.16.3"></a><p id="ox.appsuite.user.concept.calendar.add.followup">È possibile creare un appuntamento con seguito per un appuntamento esistente. L'appuntamento con seguito è precompilato con i dati essenziali dall'appuntamento esistente.</p>
@@ -64,10 +64,10 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creare nuovi appuntamenti</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utilizzare la vista di pianificazione</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">risolvere i conflitti</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Risolvere i conflitti</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.followup">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.followup">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.html
index 87cde0748..e8026e453 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.html
@@ -1,7 +1,7 @@
 <html lang="it">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>creare appuntamenti</title>
+<title>Creare appuntamenti</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
@@ -36,7 +36,7 @@
     
   </h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.add">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">creare appuntamenti</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Creare appuntamenti</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.calendar.add">Scoprire come creare un appuntamento e informazioni sulle funzioni disponibili per la definizione dei dati degli appuntamenti: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creare nuovi appuntamenti</a></p></li>
@@ -52,7 +52,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitare partecipanti a un nuovo appuntamento</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Invitare destinatari di posta a nuovi appuntamenti</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creare appuntamenti da allegati iCal</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">risolvere i conflitti</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Risolvere i conflitti</a></p></li>
 </ul>
 <p id="ox.appsuite.user.hint.calendar.add">Note: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.icalattachment.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.icalattachment.html
index 61190c2c0..0a55f3e34 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.icalattachment.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.icalattachment.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="Invitare destinatari di posta a nuovi appuntamenti">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="risolvere i conflitti">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Risolvere i conflitti">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.icalattachment">
 <div class="titlepage"><div><div><h3 class="title">Creare appuntamenti da allegati iCal</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.19.2"></a><a class="indexterm" name="id-1.8.10.19.3"></a><p id="ox.appsuite.user.concept.calendar.add.icalattachment">È possibile creare un appuntamento da un allegato iCal di un messaggio. Un allegato iCal può essere identificato dall'estensione .ics.</p>
@@ -54,12 +54,12 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creare nuovi appuntamenti</a>
             </p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">risolvere i conflitti</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Risolvere i conflitti</a>
             </p></li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.participants.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.participants.html
index 0c2319305..ef189c431 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.participants.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.participants.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Utilizzare i promemoria degli appuntamenti">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Aggiungere allegati">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.participants">
 <div class="titlepage"><div><div><h3 class="title">Aggiungere partecipanti o risorse</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.13.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.participants">
@@ -67,6 +67,7 @@
 <li class="listitem"><p role="presentation">Se i partecipanti accettano l'appuntamento, si riceverà un messaggio di posta elettronica.</p></li>
 </ul>
           <p role="presentation" class="feat-io-ox-core-managedResources">Nota: quando si aggiunge una risorsa gestita, il delegato alla prenotazione riceve una richiesta di prenotazione per questa risorsa. Non appena il delegato alla prenotazione accetta o rifiuta la richiesta di prenotazione per la risorsa, sarete informati.</p>
+          
         </div>
 </div>
 <p id="ox.appsuite.user.tip.calendar.add.participants">Suggerimento: per trovare appuntamenti liberi di tutti i partecipanti e delle risorse, è possibile <a class="link" href="ox.appsuite.user.sect.calendar.add.scheduling.html">utilizzare la vista di pianificazione</a>.</p>
@@ -82,7 +83,7 @@
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Aggiungere automaticamente contatti o risorse da una rubrica</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Aggiunta automatica di contatti o risorse dall'elenco degli indirizzi</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.participants">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.participants">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.recipients.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.recipients.html
index 000ec0ccd..029ce21e4 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.recipients.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.recipients.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Invitare partecipanti a un nuovo appuntamento">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Creare appuntamenti da allegati iCal">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.recipients">
 <div class="titlepage"><div><div><h3 class="title">Invitare destinatari di posta a nuovi appuntamenti</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.18.2"></a><p id="ox.appsuite.user.concept.calendar.add.recipients">È possibile invitare i destinatari di un messaggio di posta inviato o ricevuto a un nuovo appuntamento.</p>
@@ -67,13 +67,13 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utilizzare la vista di pianificazione</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">risolvere i conflitti</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Risolvere i conflitti</a>
             </p>
 </li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.recipients">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.recipients">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.scheduling.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.scheduling.html
index a2bbd24a5..f3037b31e 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.scheduling.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.scheduling.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Aggiungere allegati">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Creare un appuntamento con seguito">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.scheduling">
 <div class="titlepage"><div><div><h3 class="title">Utilizzare la vista di pianificazione</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.15.2"></a><a class="indexterm" name="id-1.8.10.15.3"></a><a class="indexterm" name="id-1.8.10.15.4"></a><a class="indexterm" name="id-1.8.10.15.5"></a><p id="ox.appsuite.user.concept.calendar.add.scheduling">Quando si pianifica un appuntamento con diversi partecipanti o risorse, la vista Pianificazione mostra i periodi di tempo libero e di tempo occupato per gli utenti e per le risorse.</p>
@@ -92,11 +92,11 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creare nuovi appuntamenti</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Invitare partecipanti a un nuovo appuntamento</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">risolvere i conflitti</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Risolvere i conflitti</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy">Mostra le informazioni di libero/occupato agli altri</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.scheduling">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.scheduling">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.serial.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.serial.html
index db3d0eec5..8f25607e1 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.serial.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.add.serial.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.call.html" title="Pianificare conferenze audio/video">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.display.html" title="Impostare la visualizzazione di un appuntamento">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">creare appuntamenti</h2>
+<h2 class="sr-only">Creare appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.serial">
 <div class="titlepage"><div><div><h3 class="title">Impostare appuntamenti ricorrenti</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.10.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.serial">
@@ -108,7 +108,7 @@
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.serial.html">Creare attività ricorrenti</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.serial">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.serial">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.attachments.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.attachments.html
index eeb157e48..e5d9c0032 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.attachments.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Calendario">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.view.appointments.html" title="Come sono visualizzati gli appuntamenti in una vista di calendario?">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="creare appuntamenti">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="Creare appuntamenti">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.deputy.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.deputy.html
index e234de72c..a01a0b615 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.deputy.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.deputy.html
@@ -63,12 +63,12 @@
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestire gli appuntamenti</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Inviare e ricevere messaggi di posta come delegato</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestire i delegati</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestire i delegati</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.deputy">Argomento principale: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.create.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.create.html
index a317b98f9..1663a38cf 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.create.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.create.html
@@ -111,7 +111,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista dettagliata di <span class="phrase">Calendario</span></a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creare nuovi appuntamenti</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
 <p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creare,modificare o gestire appuntamenti come delegato</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modificare gli appuntamenti</a></p>
 </li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.detailview.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.detailview.html
index fc7a493bc..c766768d8 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.detailview.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.detailview.html
@@ -67,7 +67,7 @@
 <li class="listitem">
 <p role="presentation">Ulteriori dati dell'appuntamento, se impostati: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">allegati</p></li>
+<li class="listitem"><p role="presentation">Allegati</p></li>
 <li class="listitem"><p role="presentation">definizione</p></li>
 <li class="listitem">
 <p role="presentation">organizzatore, destinatari aggiuntivi, risorse</p>
@@ -105,10 +105,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualizzare i contatti nella vista Aura</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Chiamare i partecipanti a un appuntamento</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Cambiare lo stato di un appuntamento</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Cambiare i promemoria degli appuntamenti</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestire gli appuntamenti</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.detailview">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">I componenti di <span class="phrase">Calendario</span></a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.foldertree.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.foldertree.html
index 18aa33226..278520564 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.foldertree.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.foldertree.html
@@ -65,7 +65,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Visualizzare gli appuntamenti</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">Aggiungere calendari personali</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Utilizzare i colori del calendario</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestire gli appuntamenti</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Creare calendari delle risorse e gruppi di calendari delle risorse</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.edit.html">Modificare i calendari delle risorse</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creare appuntamenti utilizzando il calendario delle risorse</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.list.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.list.html
index 4b99ee559..6fcff97f1 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.list.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.list.html
@@ -57,11 +57,11 @@
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista dettagliata di <span class="phrase">Calendario</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Visualizzare gli appuntamenti in viste diverse</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.view.html">Visualizzare i calendari delle risorse</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestire gli appuntamenti</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.list">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">I componenti di <span class="phrase">Calendario</span></a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.new.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.new.html
index 56a10785b..3d52454fc 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.new.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.new.html
@@ -52,10 +52,7 @@
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creare nuovi appuntamenti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utilizzare la vista di pianificazione</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">Sottoscrivere calendari di Google</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Sottoscrivere calendari pubblici e condivisi</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.popup.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.popup.html
index f8765fce9..2c2ae0203 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.popup.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.popup.html
@@ -71,7 +71,7 @@
 <li class="listitem">
 <p role="presentation">Ulteriori dati dell'appuntamento, se impostati: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">allegati</p></li>
+<li class="listitem"><p role="presentation">Allegati</p></li>
 <li class="listitem"><p role="presentation">definizione</p></li>
 <li class="listitem">
 <p role="presentation">organizzatore, destinatari aggiuntivi, risorse</p>
@@ -119,15 +119,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modificare gli appuntamenti</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creare un appuntamento con seguito</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Cambiare lo stato di un appuntamento</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Cambiare i promemoria degli appuntamenti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Cambiare l'organizzatore</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Spostare gli appuntamenti in un altro calendario</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Esportare appuntamenti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Stampare gli appuntamenti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Eliminare gli appuntamenti</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestire gli appuntamenti</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Inviare un messaggio di posta ai partecipanti a un appuntamento</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.popup">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">I componenti di <span class="phrase">Calendario</span></a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.toolbar.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.toolbar.html
index b44fd7f26..6ff3726b5 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.toolbar.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.gui.toolbar.html
@@ -76,14 +76,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modificare gli appuntamenti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Cambiare i promemoria degli appuntamenti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Cambiare l'organizzatore</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Spostare gli appuntamenti in un altro calendario</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Esportare appuntamenti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Stampare gli appuntamenti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Eliminare gli appuntamenti</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestire gli appuntamenti</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.toolbar">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">I componenti di <span class="phrase">Calendario</span></a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.invitation.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.invitation.html
index 880cadd10..711bcc962 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.invitation.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.invitation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Calendario">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="risolvere i conflitti">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Risolvere i conflitti">
 <link rel="next" href="ox.appsuite.user.sect.calendar.edit.html" title="Modificare gli appuntamenti">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.categories.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.categories.html
new file mode 100644
index 000000000..db07e21d0
--- /dev/null
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.categories.html
@@ -0,0 +1,106 @@
+<html lang="it">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Utilizzare le categorie per gli appuntamenti</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuale utente">
+<link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Gestire gli appuntamenti">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Gestire i fusi orari preferiti">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Utilizzare i colori del calendario">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Indietro</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Avanti</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Calendario</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestire gli appuntamenti</h2>
+<div class="sect2" id="ox.appsuite.user.sect.calendar.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Utilizzare le categorie per gli appuntamenti</h3></div></div></div>
+<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><a class="indexterm" name="id-1.8.15.11.4"></a><p id="ox.appsuite.user.concept.calendar.manage.categories">Per organizzare gli appuntamenti indipendentemente dalle cartelle, è possibile utilizzare le categorie. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">È possibile contrassegnare gli appuntamenti con categorie.</p></li>
+<li class="listitem"><p role="presentation">È possibile visualizzare tutti gli appuntamenti contrassegnati con una categoria specifica.</p></li>
+</ul>
+<p> È possibile creare, modificare o eliminare le proprie categorie, vedere <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>.</p>
+<div class="task" id="ox.appsuite.user.task.calendar.manage.categories">
+<p class="title">Come contrassegnare gli appuntamenti con una categoria:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">In base alla vista, sono disponibili le seguenti opzioni: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Fare clic su un appuntamento in una vista di calendario. Fare clic sull'icona <span class="guibutton"><strong>Modifica appuntamento</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> nella finestra a comparsa.</p></li>
+<li class="listitem"><p role="presentation">Selezionare un appuntamento nella vista Elenco. Fare clic sull'icona <span class="guibutton"><strong>Modifica appuntamento</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> nella barra degli strumenti.</p></li>
+</ul></p>
+<p role="presentation">Si aprirà la finestra di modifica degli appuntamenti.</p>
+</li>
+<li class="step">
+<p role="presentation">Per fare ciò, fare clic su <span class="guibutton"><strong>Aggiungi categoria</strong></span> accanto a <span class="guibutton"><strong>Categorie</strong></span>. Selezionare una categoria.</p>
+<p role="presentation">Per rimuovere una categoria dall'appuntamento, fare clic sull'icona <span class="guibutton"><strong>Rimuovi categoria</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> accanto alla categoria.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.calendar.categories.view">
+<p class="title">Come visualizzare gli appuntamenti contrassegnati con una categoria specifica:</p>
+<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">In base alla vista, sono disponibili le seguenti opzioni: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">In una vista di calendario, fare clic su un appuntamento contrassegnato da una categoria. Nella finestra a comparsa, fare clic sulla categoria.</p></li>
+<li class="listitem"><p role="presentation">Nella vista Elenco, selezionare un appuntamento contrassegnato con una categoria. Fare clic sulla categoria nella vista dettagliata.</p></li>
+</ul></p></li></ul></div>
+<div class="taskrelated">
+          <p>Risultato: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vista Elenco mostra tutti gli appuntamenti contrassegnati con questa categoria.</p></li>
+<li class="listitem"><p role="presentation">Per visualizzare la vista precedente, fare clic sull'icona <span class="guibutton"><strong>Annulla la ricerca</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> nel campo di ricerca.</p></li>
+</ul>
+          <p>Suggerimento: è possibile anche utilizzare la funzione di ricerca per cercare una categoria utilizzando le opzioni di ricerca.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.calendar.manage.categories">
+        </p>
+<p class="title">Argomenti correlati:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Ricercare gli appuntamenti</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Utilizzare PGP in linea in modo predefinito per i nuovi messaggi</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utilizzo delle categorie per i contatti</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utilizzare le categorie per le attività</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.calendar.manage.categories">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestire gli appuntamenti</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.changeorganizer.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
index 03e0614b5..1ef7a2eb9 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
@@ -64,8 +64,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changeorganizer"></p>
 <p class="title">Interfaccia utente:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista Elenco di <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.changereminder.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.changereminder.html
index df26308ba..74c9c6e7a 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.changereminder.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.changereminder.html
@@ -60,9 +60,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changereminder"></p>
 <p class="title">Interfaccia utente:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Calendario</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista dettagliata di <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista Elenco di <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.changestatus.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.changestatus.html
index ef8e20841..92b1e0266 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.changestatus.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.changestatus.html
@@ -64,6 +64,7 @@
 <p class="title">Interfaccia utente:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista Elenco di <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">La vista dettagliata di <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.colors.html
index b3166ced7..90f48e07a 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.colors.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.colors.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Gestire gli appuntamenti">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Gestire i fusi orari preferiti">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Utilizzare le categorie per gli appuntamenti">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.move.html" title="Spostare gli appuntamenti in un altro calendario">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.move.html">Avanti</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire gli appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.colors">
 <div class="titlepage"><div><div><h3 class="title">Utilizzare i colori del calendario</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">È possibile definire il colore di un calendario. In modo predefinito, tutti gli appuntamenti in questo calendario saranno visualizzati con il colore del calendario. Se si assegna un singolo colore a un appuntamento quando lo si crea o modifica, l'appuntamento sarà visualizzato con il colore assegnato, non con il colore del calendario.</p>
+<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">È possibile definire il colore di un calendario. In modo predefinito, tutti gli appuntamenti in questo calendario saranno visualizzati con il colore del calendario. Se si assegna un singolo colore a un appuntamento quando lo si crea o modifica, l'appuntamento sarà visualizzato con il colore assegnato, non con il colore del calendario.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.colors">
 <p class="title">Come selezionare il colore di un calendario:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,19 +46,15 @@
 <li class="step"><p role="presentation">Selezionare un colore dal menu a tendina dei colori.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.colors">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.colors"></p>
+<p class="title">Interfaccia utente:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Calendario</span></a></p></li></ul>
+<p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Come sono visualizzati gli appuntamenti in una vista di calendario? </a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Calendario</span></a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Come sono visualizzati gli appuntamenti in una vista di calendario? </a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.colors">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestire gli appuntamenti</a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.delete.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.delete.html
index d5566390d..b42353f21 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.delete.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire gli appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Eliminare gli appuntamenti</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Avviso:</strong></span> gli appuntamenti eliminati <span class="phrase"><strong>non</strong></span> possono essere ripristinati. In base alla configurazione, è possibile eliminare un appuntamento nei propri calendari privati solo se si è l'organizzatore dell'appuntamento.</p>
+<a class="indexterm" name="id-1.8.15.17.2"></a><a class="indexterm" name="id-1.8.15.17.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Avviso:</strong></span> gli appuntamenti eliminati <span class="phrase"><strong>non</strong></span> possono essere ripristinati. In base alla configurazione, è possibile eliminare un appuntamento nei propri calendari privati solo se si è l'organizzatore dell'appuntamento.</p>
 <p id="ox.appsuite.user.concept.calendar.manage.delete">È possibile eliminare gli appuntamenti da un calendario se si dispone dell'autorizzazione per eliminare gli elementi.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.delete">
 <p class="title">Come eliminare gli appuntamenti:</p>
@@ -73,11 +73,14 @@
         </p>
 <p class="title">Interfaccia utente:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Calendario</span></a>
+            </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Calendario</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista Elenco di <span class="phrase">Calendario</span></a>
             </p>
 </li></ul>
 <p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.export.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.export.html
index 4a936fcdd..a8de06ded 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.export.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire gli appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Esportare appuntamenti</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">È possibile esportare gli appuntamenti nel formato iCal. Si può ad es. utilizzare questo formato per scambiare appuntamenti con altre applicazioni di calendario. È possibile esportare singoli appuntamenti o tutti gli appuntamenti da un calendario.</p>
+<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">È possibile esportare gli appuntamenti nel formato iCal. Si può ad es. utilizzare questo formato per scambiare appuntamenti con altre applicazioni di calendario. È possibile esportare singoli appuntamenti o tutti gli appuntamenti da un calendario.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.manage.export.selected">
 <p class="title">Come esportare singoli appuntamenti:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -65,14 +65,16 @@
 <p id="ox.appsuite.user.related.calendar.manage.export"></p>
 <p class="title">Interfaccia utente:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista Elenco di <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importare appuntamenti</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.8.15.14.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Scaricare i dati personali</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.8.15.15.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Scaricare i dati personali</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.manage.export">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestire gli appuntamenti</a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.html
index 37f686ef6..d57566c0f 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.html
@@ -43,6 +43,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Cambiare i promemoria degli appuntamenti</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Cambiare l'organizzatore</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Gestire i fusi orari preferiti</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utilizzare le categorie per gli appuntamenti</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Utilizzare i colori del calendario</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Spostare gli appuntamenti in un altro calendario</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importare appuntamenti</a></p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.import.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.import.html
index 868eaea79..897b73a50 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.import.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire gli appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importare appuntamenti</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><a class="indexterm" name="id-1.8.15.13.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">È possibile importare appuntamenti da file in formato iCal.</p>
+<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">È possibile importare appuntamenti da file in formato iCal.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.import">
 <p class="title">Come importare appuntamenti da un file iCal:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -55,22 +55,16 @@
           <p>Nota: tutti i partecipanti agli appuntamenti importati saranno rimossi. Sarete invece aggiunti come partecipante.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.import"></p>
+<p class="title">Interfaccia utente:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Calendario</span></a></p></li></ul>
+<p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Esportare appuntamenti</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importare calendari da file</a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Esportare appuntamenti</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importare calendari da file</a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.import">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Gestire gli appuntamenti</a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.move.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.move.html
index 0aa4ae020..948dd19f3 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.move.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.move.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire gli appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Spostare gli appuntamenti in un altro calendario</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">È possibile spostare singoli appuntamenti in un altro calendario, ma non le serie di appuntamenti.</p>
+<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">È possibile spostare singoli appuntamenti in un altro calendario, ma non le serie di appuntamenti.</p>
 <p>Prerequisito: si dispone dei permessi appropriati per creare oggetti nel calendario di destinazione.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.move">
 <p class="title">Come spostare gli appuntamenti in un altro calendario:</p>
@@ -57,8 +57,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.move"></p>
 <p class="title">Interfaccia utente:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista Elenco di <span class="phrase">Calendario</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.print.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.print.html
index 148ad933f..471cb83ee 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.print.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire gli appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Stampare gli appuntamenti</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><a class="indexterm" name="id-1.8.15.15.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">Per stampare calendari e appuntamenti, è possibile: </p>
+<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><a class="indexterm" name="id-1.8.15.16.4"></a><a class="indexterm" name="id-1.8.15.16.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">Per stampare calendari e appuntamenti, è possibile: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">stampare un foglio di calendario con appuntamenti</p></li>
 <li class="listitem"><p role="presentation">stampare i dati di un appuntamento</p></li>
@@ -89,14 +89,20 @@
 <p class="title">Interfaccia utente:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">Il menu delle impostazioni di <span class="phrase">Calendario</span></a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">Il menu delle impostazioni di <span class="phrase">Calendario</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Calendario</span></a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Calendario</span></a>
             </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">La vista Elenco di <span class="phrase">Calendario</span></a>
+            </p>
 </li></ul>
 <p>
       </p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.timezones.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.timezones.html
index e1c14f205..dca35bbda 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.timezones.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.manage.timezones.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Gestire gli appuntamenti">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Cambiare l'organizzatore">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Utilizzare i colori del calendario">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Utilizzare le categorie per gli appuntamenti">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Avanti</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Avanti</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.resourcecalendar.view.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.resourcecalendar.view.html
index 48399b0a9..3e1ac5f81 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.resourcecalendar.view.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.resourcecalendar.view.html
@@ -63,7 +63,7 @@
 <p class="title">Come visualizzare solo gli appuntamenti di un gruppo di calendario delle risorse:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Azioni delle cartelle</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.view.group.actions.hide"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> accanto al gruppo di calendari delle risorse. Fare clic su <span class="guibutton"><strong>Mostra solo questo gruppo</strong></span>.</p></li>
-<li class="step"><p role="presentation">Per visualizzare nuovamente gli appuntamenti precedentemente visualizzati, fare clic sull'icona <span class="guibutton"><strong>Azioni delle cartelle</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.view.group.actions.show"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> accanto al gruppo di calendari delle risorse. Fare clic su <span class="guibutton"><strong>Mostra tutti i calendari</strong></span>.</p></li>
+<li class="step"><p role="presentation">Per visualizzare nuovamente gli appuntamenti mostrati in precedenza, fare clic sull'icona <span class="guibutton"><strong>Azioni delle cartelle</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.view.group.actions.show"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> accanto al gruppo di calendari delle risorse. Fare clic su <span class="guibutton"><strong>Mostra tutti i calendari</strong></span>.</p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.calendar.resourcecalendar.view"></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.search.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.search.html
index 4f6737c70..943247929 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.search.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.search.html
@@ -89,7 +89,7 @@
             <a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Visualizzare gli appuntamenti in viste diverse</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utilizzare le categorie per gli appuntamenti</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.settings.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.settings.html
index cc6125399..dbcc210dc 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.settings.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.settings.html
@@ -103,7 +103,7 @@
 <p id="ox.appsuite.user.reference.calendar.settings.jitsi"></p>
 <h3 class="title">Riunioni Jitsi</h3>
 <p><a class="indexterm" name="id-1.8.22.9.2"></a>Con queste opzioni, è possibile definire il comportamento se si seleziona <span class="guibutton"><strong>Riunione Jitsi</strong></span> nell'elenco a tendina <span class="guibutton"><strong>Conferenza</strong></span> durante la creazione di appuntamenti. </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>Copiare automaticamente il collegamento nella posizione. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Definisce se il collegamento per la partecipazione alla riunione Jitsi sarà copiato nel campo <span class="guibutton"><strong>Luogo</strong></span>.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>copiare automaticamente il collegamento nella posizione. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Definisce se il collegamento per la partecipazione alla riunione Jitsi sarà copiato nel campo <span class="guibutton"><strong>Luogo</strong></span>.</p></li></ul>
 <p> Vedere <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Pianificare conferenze audio/video</a></p>
 </div>
 <div id="ox.appsuite.user.reference.calendar.settings.zoom" class="feat-zoom">
@@ -115,8 +115,8 @@
 <p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments"><b>Appuntamenti. </b></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.password"><b>Aggiungere sempre una password casuale per la riunione. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.1.1.2"></a>Definisce se la conferenza sarà protetta da una password creata automaticamente.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>Copiare automaticamente il collegamento nella posizione. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Definisce se il collegamento per la partecipazione alla riunione Zoom sarà copiato nel campo <span class="guibutton"><strong>Luogo</strong></span>.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>Copiare le informazioni di accesso nella descrizione. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Definisce se il collegamento per la partecipazione alla riunione Zoom sarà copiato nel campo <span class="guibutton"><strong>Luogo</strong></span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>copiare automaticamente il collegamento nella posizione. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Definisce se il collegamento per la partecipazione alla riunione Zoom sarà copiato nel campo <span class="guibutton"><strong>Luogo</strong></span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>copiare le informazioni di accesso nella descrizione. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Definisce se il collegamento per la partecipazione alla riunione Zoom sarà copiato nel campo <span class="guibutton"><strong>Luogo</strong></span>.</p></li>
 </ul>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.dialinnumber"><b>Numeri di accesso. </b>Se si dispone di almeno un account Zoom Pro, Zoom offre numeri di accesso per nazione. Per definire le nazioni da visualizzare negli inviti a un appuntamento, fare clic su <span class="guibutton"><strong>Apri profilo Zoom</strong></span>.</p></li>
@@ -128,8 +128,8 @@
 <p><a class="indexterm" name="id-1.8.22.11.2"></a>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>mostrare il calendario dei compleanni. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Definisce se un calendario dei compleanni deve essere visualizzato nella vista delle cartelle.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>mostrare promemoria per gli appuntamenti passati. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Definisce se i promemoria degli appuntamenti sono visualizzati per gli appuntamenti passati.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>Mostrare il calendario dei compleanni. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Definisce se un calendario dei compleanni deve essere visualizzato nella vista delle cartelle.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>Mostrare promemoria per gli appuntamenti passati. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Definisce se i promemoria degli appuntamenti sono visualizzati per gli appuntamenti passati.</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.calendar.settings.advanced.emailchanges"><b>Applicare automaticamente le modifiche agli appuntamenti ricevute tramite posta al proprio calendario. </b><a class="indexterm" name="id-1.8.22.11.3.1.3.1.2"></a>Definisce in quali casi gli inviti agli appuntamenti da parte di contatti esterni saranno aggiunti automaticamente al proprio calendario. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -140,10 +140,10 @@
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy"><b>Mostra le informazioni di libero/occupato agli altri. </b><a class="indexterm" name="id-1.8.22.11.3.1.4.1.2"></a>Definisce quali utenti possono visualizzare i propri appuntamenti nella vista di pianificazione. Vedere anche <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utilizzare la vista di pianificazione</a></p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.usedforsync"><b>Sottoscrivere calendari condivisi. </b><a class="indexterm" name="id-1.8.22.11.3.1.5.1.2"></a>Vedere <a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Sottoscrivere calendari pubblici e condivisi</a></p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.declined"><b>Mostrare gli appuntamenti rifiutati. </b><a class="indexterm" name="id-1.8.22.11.3.1.6.1.2"></a>Definisce se devono essere visualizzati gli appuntamenti rifiutati. Vedere <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Rispondere agli inviti di appuntamenti</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.declined"><b>Mostra gli appuntamenti rifiutati. </b><a class="indexterm" name="id-1.8.22.11.3.1.6.1.2"></a>Definisce se devono essere visualizzati gli appuntamenti rifiutati. Vedere <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Rispondere agli inviti di appuntamenti</a></p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.participantsedit"><b>Contrassegna sempre "I partecipanti possono modificare gli appuntamenti" durante la creazione o la modifica degli appuntamenti. </b><a class="indexterm" name="id-1.8.22.11.3.1.7.1.2"></a>Definisce se i partecipanti ottengono in modo predefinito il permesso di modificare un appuntamento.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.wholeday"><b>Contrassegna automaticamente gli appuntamenti di un giorno intero come "liberi" durante la creazione o la modifica degli appuntamenti. </b><a class="indexterm" name="id-1.8.22.11.3.1.8.1.2"></a>Definisce se gli appuntamenti di un giorno intero sono visualizzati come liberi in modo predefinito.</p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>usare il colore della prima categoria per gli appuntamenti. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Definisce se gli appuntamenti a cui è stata assegnata una categoria sono visualizzati con il colore di quella categoria. Quando si assegnano più categorie a un appuntamento, sarà utilizzato il colore della categoria inizialmente assegnata. Vedere <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>Utilizzare il colore della prima categoria per gli appuntamenti. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Definisce se gli appuntamenti a cui è stata assegnata una categoria sono visualizzati con il colore di quella categoria. Quando si assegnano più categorie a un appuntamento, sarà utilizzato il colore della categoria inizialmente assegnata. Vedere <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a></p></li>
 </ul>
 <p>
       </p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.appointments.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.appointments.html
index 8e7632462..06efee4f0 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.appointments.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.appointments.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Visualizzare gli appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.appointments">
 <div class="titlepage"><div><div><h3 class="title">Come sono visualizzati gli appuntamenti in una vista di calendario? </h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.9.2"></a><a class="indexterm" name="id-1.8.8.9.3"></a><a class="indexterm" name="id-1.8.8.9.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">Le seguenti proprietà dell'appuntamento definiscono la visualizzazione di un appuntamento nella vista di calendario: </p>
+<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><a class="indexterm" name="id-1.8.8.8.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">Le seguenti proprietà dell'appuntamento definiscono la visualizzazione di un appuntamento nella vista di calendario: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">Il colore dell'appuntamento</p>
@@ -67,7 +67,7 @@
 <p role="presentation">Un appuntamento che avete rifiutato sarà visualizzato in grigio. L'oggetto sarà preceduto dall'icona <span class="guibutton"><strong>Rifiutato</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.declined"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>. L'oggetto sarà barrato.</p>
 <p role="presentation">Nelle impostazioni del calendario, è possibile definire se visualizzare gli appuntamenti rifiutati.</p>
 </li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.6.2.1.6"><p role="presentation">Un appuntamento che è stato rifiutato da tutti gli altri partecipanti sarà contrassegnato con l'icona <span class="guibutton"><strong>Rifiutato da tutti</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>.</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.6.2.1.6"><p role="presentation">Un appuntamento che è stato rifiutato da tutti gli altri partecipanti sarà contrassegnato con l'icona <span class="guibutton"><strong>Rifiutato da tutti</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>.</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.view.appointments.private"></p>
 <h4 class="title">Visualizzazione degli appuntamenti privati</h4>
@@ -94,7 +94,7 @@
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.secret"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span>appuntamento segreto</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.unconfirmed"><object type="image/svg+xml" data="../../images/question-circle.svg" height="15"></object></span>appuntamento non confermato</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.rejected"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>appuntamento rifiutato</p></li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>appuntamento rifiutato da tutti gli altri partecipanti</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>appuntamento rifiutato da tutti gli altri partecipanti</p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.view.appointments">
         </p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.html
index 8e5141e58..c697e25de 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.html
@@ -43,14 +43,6 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.timezones.html">Visualizzare più fusi orari</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Come sono visualizzati gli appuntamenti in una vista di calendario? </a></p></li>
 </ul>
-<p id="ox.appsuite.user.related.calendar.view">
-      </p>
-<p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Calendario</span></a>
-          </p></li></ul>
-<p>
-    </p>
 <p id="ox.appsuite.user.parent.calendar.view">Argomento principale: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
     <span class="phrase">Calendario</span>
     
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.timezones.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.timezones.html
index 2704c68ae..fd6f8efc3 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.timezones.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.timezones.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Visualizzare gli appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.timezones">
 <div class="titlepage"><div><div><h3 class="title">Visualizzare più fusi orari</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">In aggiunta al fuso orario predefinito, è possibile visualizzare i fusi orari che sono stati aggiunti ai preferiti. Il fuso orario predefinito può essere cambiato nelle impostazioni di base.</p>
+<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">In aggiunta al fuso orario predefinito, è possibile visualizzare i fusi orari che sono stati aggiunti ai preferiti. Il fuso orario predefinito può essere cambiato nelle impostazioni di base.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.timezones">
 <p class="title">Come visualizzare più fusi orari in una vista di calendario:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.views.html b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.views.html
index c2516190f..99104c998 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.views.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.calendar.view.views.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Visualizzare gli appuntamenti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.views">
 <div class="titlepage"><div><div><h3 class="title">Visualizzare gli appuntamenti in viste diverse</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><a class="indexterm" name="id-1.8.8.7.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Scoprire come visualizzare gli appuntamenti di un calendario o di più calendari in viste diverse:</p>
+<a class="indexterm" name="id-1.8.8.6.2"></a><a class="indexterm" name="id-1.8.8.6.3"></a><a class="indexterm" name="id-1.8.8.6.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Scoprire come visualizzare gli appuntamenti di un calendario o di più calendari in viste diverse:</p>
 <div class="task" id="ox.appsuite.user.task.calendar.view.views">
 <p class="title">Come visualizzare un appuntamento:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -72,7 +72,7 @@
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">Fare doppio clic sul calendario nella vista delle cartelle.</p>
-<p role="presentation">Per mostrare nuovamente i calendari visualizzati in precedenza, fare ancora doppio clic su questo calendario.</p>
+<p role="presentation">Per visualizzare nuovamente i calendari mostrati in precedenza, fare ancora doppio clic su questo calendario.</p>
 </li>
 <li class="listitem"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.views.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> accanto al calendario. Fare clic su <span class="guibutton"><strong>Mostra solo questo calendario</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">Disabilitare le caselle di selezione accanto agli altri calendari.</p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.create.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.create.html
index 0803a1b03..37947066e 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.create.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.create.html
@@ -50,8 +50,8 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">Un'immagine del contatto, se caricata. Fare clic sull'immagine del contatto per modificarla o per caricare una nuova immagine del contatto.</p>
-<p role="presentation">Cognome, nome</p>
-<p role="presentation">Se inseriti: titolo, informazioni commerciali, residenza</p>
+<p role="presentation">cognome, nome</p>
+<p role="presentation">se inserito: titolo, informazioni commerciali, residenza</p>
 </li>
 <li class="listitem">
 <p role="presentation">Informazioni personali </p>
@@ -88,13 +88,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">La finestra di modifica</a></p></li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista dettagliata di <span class="phrase">Rubrica</span></a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creare un nuovo contatto</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Aggiungere contatti</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Modificare contatti o liste di distribuzione</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.create">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">I componenti di <span class="phrase">Rubrica</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.detailview.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.detailview.html
index 2093cf23b..dd990718a 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.detailview.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.detailview.html
@@ -46,12 +46,12 @@
 <p class="title">Contenuto</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Un'immagine di contatto, se caricata</p>
-<p role="presentation">Cognome, nome</p>
-<p role="presentation">Se inseriti: titolo, informazioni commerciali, residenza</p>
+<p role="presentation">un'immagine di contatto, se caricata</p>
+<p role="presentation">cognome, nome</p>
+<p role="presentation">se inserito: titolo, informazioni commerciali, residenza</p>
 </li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.7.11.4.1.3">
-<p role="presentation">Le categorie assegnate</p>
+<p role="presentation">le categorie assegnate</p>
 <p role="presentation">Un clic su una categoria cerca i contatti assegnati a tale categoria.</p>
 </li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.4"><p role="presentation">In base alla configurazione: la disponibilità attuale del contatto per le chiamate</p></li>
@@ -84,7 +84,7 @@
 </li>
 <li class="listitem"><p role="presentation">Una nota</p></li>
 <li class="listitem"><p role="presentation">Massimo 18 campi utente opzionali</p></li>
-<li class="listitem"><p role="presentation">allegati</p></li>
+<li class="listitem"><p role="presentation">Allegati</p></li>
 </ul>
 </li>
 </ul>
@@ -97,15 +97,11 @@
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista Elenco di <span class="phrase">Rubrica</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.create.html">La finestra di modifica dei contatti</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualizzare i contatti di una rubrica.</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.attachments.html">Visualizzare o salvare gli allegati dei contatti</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Chiamare i contatti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestire i contatti</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestire i contatti</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.detailview">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">I componenti di <span class="phrase">Rubrica</span></a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.foldertree.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.foldertree.html
index 3ec94b5d1..4ee17cbdb 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.foldertree.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.foldertree.html
@@ -62,6 +62,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualizzare i contatti di una rubrica.</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Aggiungere rubriche</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestire i contatti</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestire i dati con le cartelle</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.list.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.list.html
index f6a731ba4..b9b3970ab 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.list.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.list.html
@@ -53,8 +53,8 @@
 <p role="presentation">I seguenti dettagli sono visualizzati per ogni contatto: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">un'immagine se caricata</p></li>
-<li class="listitem"><p role="presentation">Cognome, nome</p></li>
-<li class="listitem"><p role="presentation">Dati aziendali, se inseriti</p></li>
+<li class="listitem"><p role="presentation">cognome, nome</p></li>
+<li class="listitem"><p role="presentation">dati aziendali, se inseriti</p></li>
 </ul>
 <p role="presentation">I nomi che iniziano con una cifra o un carattere speciale sono visualizzati sotto <span class="guibutton"><strong>#</strong></span> in cima all'elenco. I nomi che iniziano con un simbolo speciale sono visualizzati sotto <span class="guibutton"><strong>Ω</strong></span> in fondo alla vista Elenco.</p>
 </li>
@@ -66,11 +66,8 @@
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.settingsmenu.html">il menu delle impostazioni di <span class="phrase">Rubrica</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista dettagliata di <span class="phrase">Rubrica</span></a></p>
-</li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualizzare i contatti di una rubrica.</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestire i contatti</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.list">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">I componenti di <span class="phrase">Rubrica</span></a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.new.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.new.html
index 547edcaca..d294e3be2 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.new.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.new.html
@@ -42,7 +42,7 @@
 <a class="indexterm" name="id-1.9.7.6.2"></a><p id="ox.appsuite.user.concept.contacts.gui.new">Crea un nuovo contatto. Facendo clic sull'icona <span class="guibutton"><strong>Altre azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>, si aprirà un menu con ulteriori funzioni: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">nuova lista di distribuzione</p></li>
-<li class="listitem"><p role="presentation">Sottoscrivere rubriche condivise o altre rubriche</p></li>
+<li class="listitem"><p role="presentation">sottoscrivere rubriche condivise o altre rubriche</p></li>
 <li class="listitem"><p role="presentation">nuovo messaggio di posta, nuovo appuntamento, nuovo contatto</p></li>
 </ul>
 <p id="ox.appsuite.user.hint.contacts.gui.new">Nota: se la cartella è chiusa, il pulsante sarà visualizzato come icona. In questo caso, l'icona <span class="guibutton"><strong>Altre azioni</strong></span> non sarà disponibile. Per mostrare la vista delle cartelle, fare clic sull'icona <span class="guibutton"><strong>Apri la vista delle cartelle</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.open"><object type="image/svg+xml" data="../../images/layout-split.svg" height="15"></object></span> in basso a sinistra.</p>
@@ -52,7 +52,7 @@
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creare un nuovo contatto</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Aggiungere contatti</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">Creare nuove liste di distribuzione</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Sottoscrivere rubriche esterne</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Sottoscrivere rubriche pubbliche e condivise</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.settingsmenu.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
index 3a8bec3ad..be25946d3 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
@@ -45,7 +45,7 @@
 <li class="listitem"><p role="presentation">Regolare tutte le impostazioni</p></li>
 <li class="listitem"><p role="presentation">Seleziona un tema per l'interfaccia utente</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Opzioni elenco</strong></span>. Definisce se le immagini dei contatti, le caselle di controllo o nessuno di questi elementi saranno visualizzati nella vista Elenco.</p></li>
-<li class="listitem"><p role="presentation">Sottoscrivere rubriche condivise o altre rubriche</p></li>
+<li class="listitem"><p role="presentation">sottoscrivere rubriche condivise o altre rubriche</p></li>
 <li class="listitem"><p role="presentation">In base alla configurazione: <span class="guibutton"><strong>Collega il tuo dispositivo</strong></span>. Avvia una procedura guidata per la configurazione di applicazioni locali con cui è possibile accedere ai dati del groupware.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.contacts.gui.settingsmenu"></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.toolbar.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.toolbar.html
index 9c71cd8b3..45482c4c4 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.toolbar.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.gui.toolbar.html
@@ -64,13 +64,7 @@
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Modificare contatti o liste di distribuzione</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Inviare messaggi dall'interno di una rubrica</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitare contatti a un appuntamento</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Spostare o copiare contatti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Inviare i contatti come vCard</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Esportare contatti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.print.html">Stampare i contatti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.delete.html">Eliminare i contatti</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestire i contatti</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.toolbar">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">I componenti di <span class="phrase">Rubrica</span></a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.categories.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.categories.html
new file mode 100644
index 000000000..f5c378271
--- /dev/null
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="it">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Utilizzo delle categorie per i contatti</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuale utente">
+<link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Gestire i contatti">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Invitare contatti a un appuntamento">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Spostare o copiare contatti">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Indietro</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Avanti</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Rubrica</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestire i contatti</h2>
+<div class="sect2" id="ox.appsuite.user.sect.contacts.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Utilizzo delle categorie per i contatti</h3></div></div></div>
+<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><p id="ox.appsuite.user.concept.contacts.manage.categories">Per organizzare i contatti indipendentemente dalle cartelle, è possibile utilizzare le categorie. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">È possibile contrassegnare i contatti con categorie.</p></li>
+<li class="listitem"><p role="presentation">È possibile visualizzare tutti i contatti contrassegnati con una categoria specifica.</p></li>
+</ul>
+<p> È possibile creare, modificare o eliminare le proprie categorie, vedere <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>.</p>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories">
+<p class="title">Come contrassegnare i contatti con una categoria:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Selezionare un contatto. Fare clic su <span class="guibutton"><strong>Modifica contatto</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> nella barra degli strumenti.</p>
+<p role="presentation">Si aprirà la finestra di modifica del contatto.</p>
+</li>
+<li class="step">
+<p role="presentation">Per fare ciò, fare clic su <span class="guibutton"><strong>Aggiungi categoria</strong></span> accanto a <span class="guibutton"><strong>Categorie</strong></span>. Selezionare una categoria.</p>
+<p role="presentation">Per rimuovere una categoria dal contatto, fare clic sull'icona <span class="guibutton"><strong>Rimuovi categoria</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> accanto alla categoria.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories.view">
+<p class="title">Come visualizzare i contatti contrassegnati con una categoria specifica:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selezionare un contatto che è stato contrassegnato con una categoria.</p></li>
+<li class="step"><p role="presentation">Fare clic sulla categoria nella vista dettagliata.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Risultato: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vista Elenco mostra tutti i contatti contrassegnati con questa categoria. </p></li>
+<li class="listitem"><p role="presentation">Per visualizzare l'elenco precedente, fare clic sull'icona <span class="guibutton"><strong>Annulla la ricerca</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> nel campo di ricerca.</p></li>
+</ul>
+          <p>Suggerimento: è possibile anche utilizzare la funzione di ricerca per cercare una categoria utilizzando le opzioni di ricerca.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.contacts.manage.categories">
+        </p>
+<p class="title">Argomenti correlati:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Ricercare i contatti</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Utilizzare PGP in linea in modo predefinito per i nuovi messaggi</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utilizzare le categorie per gli appuntamenti</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utilizzare le categorie per le attività</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.contacts.manage.categories">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestire i contatti</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.delete.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.delete.html
index c7520abec..23e6a9d8d 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.delete.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i contatti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Eliminare i contatti</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Avviso:</strong></span> i contatti eliminati, <span class="phrase"><strong>non</strong></span> possono essere ripristinati.</p>
+<a class="indexterm" name="id-1.9.17.15.2"></a><a class="indexterm" name="id-1.9.17.15.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Avviso:</strong></span> i contatti eliminati, <span class="phrase"><strong>non</strong></span> possono essere ripristinati.</p>
 <p id="ox.appsuite.user.concept.contacts.manage.delete">È possibile eliminare contatti o liste di distribuzione da una rubrica se si dispone dei permessi per eliminare elementi da questa rubrica. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Non è possibile eliminare i contatti dalla rubrica globale <span class="guibutton"><strong>Tutti gli utenti</strong></span>.</p></li>
@@ -55,9 +55,14 @@
 <p id="ox.appsuite.user.related.contacts.manage.delete">
         </p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Rubrica</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista Elenco di <span class="phrase">Rubrica</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.delete">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestire i contatti</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.export.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.export.html
index 08deb3daa..3ef5109a8 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.export.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i contatti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Esportare contatti</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">È possibile esportare contatti o liste di distribuzione in tali formati: </p>
+<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><a class="indexterm" name="id-1.9.17.13.4"></a><a class="indexterm" name="id-1.9.17.13.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">È possibile esportare contatti o liste di distribuzione in tali formati: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">vCard. È possibile ad es. utilizzare questo formato per scambiare contatti con altre applicazioni di posta elettronica.</p></li>
 <li class="listitem"><p role="presentation">CSV. È possibile utilizzare questo formato per esportare contatti in formato di foglio elettronico.</p></li>
@@ -76,7 +76,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.export"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Rubrica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Rubrica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Rubrica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista Elenco di <span class="phrase">Rubrica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -84,7 +88,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Inviare i contatti come vCard</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importare contatti</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.9.17.12.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Scaricare i dati personali</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.9.17.13.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Scaricare i dati personali</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.export">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestire i contatti</a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.html
index 2049abe44..d88d10d03 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem cap-webmail" id="id-1.9.17.4.1.1"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Inviare messaggi dall'interno di una rubrica</a></p></li>
 <li class="listitem cap-calendar" id="id-1.9.17.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Invitare contatti a un appuntamento</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utilizzo delle categorie per i contatti</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Spostare o copiare contatti</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Inviare i contatti come vCard</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importare contatti</a></p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.import.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.import.html
index 3d7b34526..2e3206390 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.import.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i contatti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importare contatti</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><a class="indexterm" name="id-1.9.17.11.5"></a><a class="indexterm" name="id-1.9.17.11.6"></a><a class="indexterm" name="id-1.9.17.11.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">È possibile importare i contatti da file che hanno i seguenti formati: </p>
+<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><a class="indexterm" name="id-1.9.17.12.6"></a><a class="indexterm" name="id-1.9.17.12.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">È possibile importare i contatti da file che hanno i seguenti formati: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">vCard. Note: </p>
@@ -71,19 +71,15 @@
 <li class="step"><p role="presentation">Fare clic su <span class="guibutton"><strong>Importa</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.contacts.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.contacts.manage.import"></p>
+<p class="title">Interfaccia utente:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Rubrica</span></a></p></li></ul>
+<p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Esportare contatti</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Aggiungere contatti</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Esportare contatti</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Aggiungere contatti</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.contacts.manage.import">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestire i contatti</a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.inviteappointment.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
index a96c180dc..df9ee838c 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Gestire i contatti">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.manage.sendmail.html" title="Inviare messaggi dall'interno di una rubrica">
-<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Spostare o copiare contatti">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Utilizzo delle categorie per i contatti">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Avanti</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Avanti</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -53,7 +53,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.inviteappointment"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Rubrica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Rubrica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista Elenco di <span class="phrase">Rubrica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista dettagliata di <span class="phrase">Rubrica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creare nuovi appuntamenti</a></p></li></ul>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.movecopy.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.movecopy.html
index 974a2c85f..bae2eb8b2 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.movecopy.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.movecopy.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Gestire i contatti">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Invitare contatti a un appuntamento">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Utilizzo delle categorie per i contatti">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html" title="Inviare i contatti come vCard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Avanti</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i contatti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.movecopy">
 <div class="titlepage"><div><div><h3 class="title">Spostare o copiare contatti</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><a class="indexterm" name="id-1.9.17.9.4"></a><a class="indexterm" name="id-1.9.17.9.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">È possibile spostare o copiare contatti o liste di distribuzione in un'altra rubrica.</p>
+<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><a class="indexterm" name="id-1.9.17.10.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">È possibile spostare o copiare contatti o liste di distribuzione in un'altra rubrica.</p>
 <p id="ox.appsuite.user.hints.contacts.manage.movecopy">Note: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Non è possibile spostare o copiare contatti o liste di distribuzione nella rubrica globale <span class="guibutton"><strong>Tutti gli utenti</strong></span>.</p></li>
@@ -61,7 +61,10 @@
 <p id="ox.appsuite.user.tip.contacts.manage.movecopy">Suggerimento: è possibile inoltre spostare gli oggetti selezionati trascinandoli dalla vista delle cartelle a una rubrica.</p>
 <p id="ox.appsuite.user.related.contacts.manage.movecopy"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Rubrica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Rubrica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista Elenco di <span class="phrase">Rubrica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.personal.html">Aggiungere rubriche personali</a></p></li></ul>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.print.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.print.html
index 48e583d70..841bb1cb5 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.print.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i contatti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Stampare i contatti</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">È possibile stampare i dati di un singolo contatto o di più contatti. È possibile scegliere tra diverse strutture di stampa.</p>
+<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">È possibile stampare i dati di un singolo contatto o di più contatti. È possibile scegliere tra diverse strutture di stampa.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.print.list">
 <p class="title">Come stampare i dati di un contatto:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,9 +54,17 @@
 <p id="ox.appsuite.user.related.contacts.manage.print">
         </p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Rubrica</span></a>
+            </p>
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Rubrica</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista Elenco di <span class="phrase">Rubrica</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.print">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestire i contatti</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.sendmail.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.sendmail.html
index 57281f24b..be2afb14f 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.sendmail.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.sendmail.html
@@ -53,10 +53,14 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendmail"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Rubrica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Rubrica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista Elenco di <span class="phrase">Rubrica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">La vista dettagliata di <span class="phrase">Rubrica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p></li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendmail">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestire i contatti</a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.sendvcard.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.sendvcard.html
index 8e1a20c82..a8804e1cb 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.sendvcard.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.manage.sendvcard.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i contatti</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.sendvcard">
 <div class="titlepage"><div><div><h3 class="title">Inviare i contatti come vCard</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">È possibile inviare contatti o liste di distribuzione come allegato vCard di un messaggio di posta.</p>
+<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">È possibile inviare contatti o liste di distribuzione come allegato vCard di un messaggio di posta.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.sendvcard">
 <p class="title">Come inviare un contatto come allegato vCard:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,12 +49,15 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendvcard"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Rubrica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Rubrica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">La vista Elenco di <span class="phrase">Rubrica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Esportare contatti</a></p></li>
-<li class="listitem cap-webmail" id="id-1.9.17.10.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p></li>
+<li class="listitem cap-webmail" id="id-1.9.17.11.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendvcard">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Gestire i contatti</a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.search.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.search.html
index abcaddad2..01220c8f6 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.search.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Visualizzare i contatti di una rubrica.</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utilizzo delle categorie per i contatti</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.settings.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.settings.html
index 1238d95a3..2a6e418f2 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.settings.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.settings.html
@@ -60,7 +60,7 @@
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>nomi. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a>
+<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>Nomi. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Specifica l'ordine in cui sono visualizzati il nome e il cognome di un contatto nella rubrica.</p></li></ul>
 <p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.useaddressbook.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.useaddressbook.html
index 72237f046..eb6a0a4ab 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.useaddressbook.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.useaddressbook.html
@@ -70,7 +70,7 @@
 <p> </p>
 <p class="title">Azioni sovraordinate:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Aggiungere partecipanti o risorse</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utilizzare la vista di pianificazione</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Creare risorse gestite</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.useaddressdirectory.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.useaddressdirectory.html
index 69401af1a..2903bc341 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.useaddressdirectory.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.useaddressdirectory.html
@@ -77,7 +77,7 @@
 <p id="ox.appsuite.user.related.contacts.useaddressdirectory"></p>
 <p class="title">Azioni sovraordinate:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Aggiungere partecipanti o risorse</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Utilizzare la vista di pianificazione</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Creare risorse gestite</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.view.haloview.html b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.view.haloview.html
index a12904a40..f5e6ce0f6 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.contacts.view.haloview.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.contacts.view.haloview.html
@@ -48,9 +48,9 @@
 <li class="listitem"><p role="presentation">Selezionare un appuntamento o un'attività nell'applicazione <span class="phrase">Calendario</span> o <span class="phrase">Attività</span>. Fare clic su un partecipante nella vista dettagliata o nella finestra a comparsa.</p></li>
 </ul></p>
 <p role="presentation">In base alle voci del contatto nella rubrica, tali dati saranno visualizzati in una finestra a comparsa: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Un'immagine se caricata</p></li>
-<li class="listitem"><p role="presentation">Cognome, nome</p></li>
-<li class="listitem"><p role="presentation">Dati aziendali, se inseriti</p></li>
+<li class="listitem"><p role="presentation">un'immagine se caricata</p></li>
+<li class="listitem"><p role="presentation">cognome, nome</p></li>
+<li class="listitem"><p role="presentation">dati aziendali, se inseriti</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.4"><p role="presentation">In base alla configurazione: la disponibilità attuale del contatto per le chiamate</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">In base alla configurazione: icone per comunicare con il contatto: <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Posta elettronica</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>. Apre la finestra per comporre un messaggio di posta.</p></li>
@@ -62,7 +62,7 @@
 <li class="listitem"><p role="presentation">Indirizzi di posta elettronica. Facendo clic su un indirizzo di posta, sarà visualizzata la pagina per inviare un nuovo messaggio.</p></li>
 <li class="listitem"><p role="presentation">Numeri di telefono aziendali e privati. Facendo clic su un numero, si apre una funzione per effettuare una chiamata, se disponibile.</p></li>
 <li class="listitem"><p role="presentation">Indirizzi di lavoro e privati. Nelle impostazioni della rubrica, è possibile specificare se utilizzare un servizio di mappe per visualizzare l'indirizzo quando si fa clic su di esso.</p></li>
-<li class="listitem"><p role="presentation">allegati</p></li>
+<li class="listitem"><p role="presentation">Allegati</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">La rubrica nella quale è salvato il contatto</p></li>
 <li class="listitem"><p role="presentation">Le conversazioni recenti con questo contatto. Facendo clic su un messaggio di posta, il suo contenuto sarà visualizzato in una finestra a comparsa.</p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.accounts.edit.html b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
index d4e647bef..9c20b2b62 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
@@ -94,7 +94,7 @@
               <a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilizzare la posta unificata</a>
             </p>
 <p role="presentation" class="cap-webmail">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selezionare un indirizzo mittente</a>
+              <a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">selezionare un indirizzo mittente</a>
             </p>
 <p role="presentation" class="cap-infostore">
               <a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Aggiungere account di archiviazione</a>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
index 3e6a13821..1a4a5b331 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
@@ -64,7 +64,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilizzare la posta unificata</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selezionare un indirizzo mittente</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">selezionare un indirizzo mittente</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.accounts.functionalmail">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Gestire gli account</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.categories.html b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.categories.html
index 35e17ebfe..bf288bd40 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.categories.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.categories.html
@@ -32,15 +32,15 @@
   <h1 class="sr-only">Organizzazione dei dati e condivisioni</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.categories">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Gestire le categorie</h2></div></div></div>
-<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Scoprire come gestire le <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categories</a> che consentono di classificare gli appuntamenti, i contatti e le attività. Le categorie hanno le seguenti proprietà: </p>
+<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Scoprire come gestire le <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categorie</a> che consentono di organizzare messaggi di posta, appuntamenti, contatti e attività tra applicazioni, indipendentemente dalla struttura delle cartelle. Ad esempio, è possibile utilizzare una propria categoria per uno specifico progetto o cliente. Le categorie hanno le seguenti proprietà: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Una categoria consiste di un nome e di un colore.</p></li>
 <li class="listitem"><p role="presentation">Quando si cercano oggetti, è possibile utilizzare le categorie come termini di ricerca.</p></li>
 <li class="listitem"><p role="presentation">In base alla configurazione, sono predefinite categorie specifiche. Tali categorie non possono essere né modificate né eliminate.</p></li>
 <li class="listitem"><p role="presentation">È possibile creare, modificare ed eliminare le proprie categorie.</p></li>
-<li class="listitem"><p role="presentation">È possibile assegnare una o più categorie ad appuntamenti, contatti e attività ed eliminarle successivamente.</p></li>
+<li class="listitem"><p role="presentation">È possibile assegnare una o più categorie a messaggi di posta, appuntamenti, contatti e attività ed eliminarle successivamente.</p></li>
 </ul>
-<p> Nota: queste categorie non possono essere utilizzate per i messaggi di posta elettronica. Per i messaggi di posta, ci sono le categorie di posta in arrivo, vedere <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Lavorare con le categorie di posta in arrivo</a>.</p>
+<p> Nota: per i messaggi di posta, è anche possibile utilizzare le categorie della posta in arrivo. Una specifica categoria della posta in arrivo può essere assegnata a un messaggio. La categoria dipende dal mittente, vedere <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Lavorare con le categorie di posta in arrivo</a>.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.categories">Sono disponibili le seguenti opzioni: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">creare una propria categoria</p></li>
@@ -51,9 +51,15 @@
 <p class="title">Come gestire le proprie categorie:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step help-hide-inline">
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> a destra della barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="guibutton"><strong>Base</strong></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>Gestisci le categorie</strong></span> sotto <span class="guibutton"><strong>Impostazioni avanzate</strong></span>.</p>
+<p role="presentation">È possibile inoltre utilizzare uno dei seguenti metodi: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Selezionare un messaggio di posta. Fare clic sull'icona <span class="guibutton"><strong>Aggiungi categoria</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> nella barra degli strumenti. Selezionare <span class="guibutton"><strong>Gestisci le categorie</strong></span>.</p></li>
+<li class="listitem">
 <p role="presentation">Aprire la finestra di modifica di appuntamenti, contatti o attività creando o modificando un appuntamento, un contatto o un'attività.</p>
 <p role="presentation">Per fare ciò, fare clic su <span class="guibutton"><strong>Aggiungi categoria</strong></span> accanto a <span class="guibutton"><strong>Categorie</strong></span>. Selezionare <span class="guibutton"><strong>Gestisci le categorie</strong></span>.</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">È possibile anche utilizzare il pulsante <span class="guibutton"><strong>Gestisci categorie</strong></span> nelle impostazioni generali sotto <span class="guibutton"><strong>Impostazioni avanzate</strong></span>.</p></li></ul>
+</li>
+</ul></p>
 <p role="presentation">Si aprirà la finestra <span class="guilabel"><strong>Gestisci le categorie</strong></span>.</p>
 </li>
 <li class="step">
@@ -69,41 +75,22 @@
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creare nuovi appuntamenti</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creare un nuovo contatto</a>
+<p role="presentation" class="cap-webmail">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Utilizzare PGP in linea in modo predefinito per i nuovi messaggi</a>
           </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Creare nuove attività</a>
-          </p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Modificare gli appuntamenti</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utilizzare le categorie per gli appuntamenti</a>
           </p>
 <p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Modificare contatti o liste di distribuzione</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utilizzo delle categorie per i contatti</a>
           </p>
 <p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Modificare le attività</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utilizzare le categorie per le attività</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Modificare le impostazioni generali</a>
           </p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Ricercare gli appuntamenti</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Ricercare i contatti</a>
-          </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Ricercare attività</a>
-          </p>
-</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.deputy.add.html b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.deputy.add.html
index e0b625d9a..ba0f4104d 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.deputy.add.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.deputy.add.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Gestire i delegati">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Gestire i delegati">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="gestire i delegati">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="gestire i delegati">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html" title="Visualizzare, modificare, eliminare delegati">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Organizzazione dei dati e condivisioni</h1>
-<h2 class="sr-only">Gestire i delegati</h2>
+<h2 class="sr-only">gestire i delegati</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.add">
 <div class="titlepage"><div><div><h3 class="title">Aggiungere delegati</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.8.2"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.add">Esistono le seguenti opzioni: </p>
@@ -86,7 +86,7 @@
             </p></li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestire i delegati</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestire i delegati</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.deputy.edit.html b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
index ef1be30ca..947b1786b 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Gestire i delegati">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="gestire i delegati">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.add.html" title="Aggiungere delegati">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.accounts.html" title="Gestire gli account">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Organizzazione dei dati e condivisioni</h1>
-<h2 class="sr-only">Gestire i delegati</h2>
+<h2 class="sr-only">gestire i delegati</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.edit">
 <div class="titlepage"><div><div><h3 class="title">Visualizzare, modificare, eliminare delegati</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.9.2"></a><a class="indexterm" name="id-1.12.6.9.3"></a><a class="indexterm" name="id-1.12.6.9.4"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.edit">Esistono le seguenti opzioni: </p>
@@ -81,7 +81,7 @@
             </p></li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestire i delegati</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestire i delegati</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.deputy.html b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.deputy.html
index e74cb40a2..c4bfef987 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.deputy.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.deputy.html
@@ -1,7 +1,7 @@
 <html lang="it">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Gestire i delegati</title>
+<title>gestire i delegati</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Organizzazione dei dati e condivisioni</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.deputy">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Gestire i delegati</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">gestire i delegati</h2></div></div></div>
 <a class="indexterm" name="id-1.12.6.2"></a><a class="indexterm" name="id-1.12.6.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.deputy">Puoi nominare altri utenti affinché agiscano come proprio <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">delegato</a>. È possibile concedere a uno o più delegati diversi livelli di permessi per gestire la comunicazione di posta elettronica e la pianificazione degli appuntamenti a proprio nome.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.deputy">Esistono le seguenti opzioni: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.sharing.examples.html b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
index 7f09fe480..a3c2896d3 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.dataorganisation.sharing.html" title="Condividere dati">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html" title="Quali permessi possono essere utilizzati?">
-<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Gestire i delegati">
+<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="gestire i delegati">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.sharing.share.html b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.sharing.share.html
index fb628aa56..a3edf8739 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.sharing.share.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.dataorganisation.sharing.share.html
@@ -37,7 +37,7 @@
 <p class="title">Sono disponibili le seguenti opzioni:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Cartelle di posta </p>
+<p role="presentation">cartelle di posta elettronica </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">La cartella <span class="guibutton"><strong>Posta in arrivo</strong></span> così come tutte le cartelle e le sottocartelle in <span class="guibutton"><strong>Le mie cartelle</strong></span> possono essere condivise con utenti interni con permessi di lettura.</p>
@@ -48,7 +48,7 @@
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">calendario </p>
+<p role="presentation">Calendario </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Le cartelle in <span class="guibutton"><strong>I miei calendari</strong></span> possono essere condivise con utenti interni con permessi di lettura o modifica.</p></li>
 <li class="listitem"><p role="presentation">La cartella <span class="guibutton"><strong>I miei calendari</strong></span> non può essere condivisa.</p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.content.html b/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.content.html
index 8760e9553..4393337f4 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.content.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.content.html
@@ -76,6 +76,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Visualizzare il contenuto delle cartelle di <span class="phrase">File</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Visualizzare il contenuto di un file</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizzare file e cartelle di <span class="phrase">File</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestire i dati con le cartelle</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Condividere dati</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.foldertree.html b/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.foldertree.html
index 77db765b4..0270eb045 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.foldertree.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.foldertree.html
@@ -73,6 +73,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">File</span>: creare cartelle</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">Sottoscrivere cartelle pubbliche e condivise di <span class="phrase">File</span></a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizzare file e cartelle di <span class="phrase">File</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestire i dati con le cartelle</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Condividere dati</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.toolbar.html b/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.toolbar.html
index 111788a23..b1464eafb 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.toolbar.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.toolbar.html
@@ -76,20 +76,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Visualizzare il contenuto delle cartelle di <span class="phrase">File</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Visualizzare il contenuto di un file</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.send.html">Inviare file come allegati di posta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Modificare i nomi dei file</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creare o modificare le descrizioni</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.move.html">Spostare file o cartelle di <span class="phrase">File</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.copy.html">Copiare i file</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Salvare file come PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Stampare file come PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.addportal.html">Aggiungere file al portale</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.favorite.html">Aggiungere file o cartelle di <span class="phrase">File</span> ai Preferiti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.delete.html">Eliminare file o cartelle di <span class="phrase">File</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.lock.html">Bloccare o sbloccare i file</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Lavorare con le versioni</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizzare file e cartelle di <span class="phrase">File</span></a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Cifrare o decifrare i file</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.toolbar">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.drive.gui.html">I componenti di <span class="phrase">File</span></a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.viewer.html b/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.viewer.html
index 47e178ddd..5b4891296 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.viewer.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.drive.gui.viewer.html
@@ -106,23 +106,9 @@
               <a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">Tenere una presentazione</a>
             </p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Modificare i nomi dei file</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creare o modificare le descrizioni</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Salvare file come PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Stampare file come PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Lavorare con le versioni</a>
-            </p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizzare file e cartelle di <span class="phrase">File</span></a>
+            </p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-share_links cap-share_mail_attachments">
               <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Condividere dati</a>
             </p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.drive.settings.html b/help/l10n/it_IT/ox.appsuite.user.sect.drive.settings.html
index 05f7a74ed..3a863ed27 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.drive.settings.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.drive.settings.html
@@ -51,13 +51,13 @@
 </div>
 <p id="ox.appsuite.user.reference.drive.settings">In base alla configurazione, sono disponibili le seguenti impostazioni:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">aggiungere file</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">Aggiungere file</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.versionhistory">Cronologia delle versioni</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.advanced">Impostazioni avanzate</a></p></li>
 </ul>
 <p>Vedere anche: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Ricerca delle impostazioni</a></p>
 <p id="ox.appsuite.user.reference.drive.settings.adddrive"></p>
-<h3 class="title">aggiungere file</h3>
+<h3 class="title">Aggiungere file</h3>
 <p><a class="indexterm" name="id-1.11.17.6.2"></a>Definisce se deve essere creato un nuovo file o una nuova versione di un file esistente con lo stesso nome. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><b>Aggiungere una nuova versione. </b>Sarà creata una nuova versione del file.</p></li>
@@ -76,7 +76,7 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.advanced.playdiashow"><b>Presentazione per le immagini. </b><a class="indexterm" name="id-1.11.17.8.2.1.1.1.2"></a>Definisce il modo di presentare le immagini che sono aperte nel visualizzatore</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.advanced.playdiashow"><b>Presentazione per immagini. </b><a class="indexterm" name="id-1.11.17.8.2.1.1.1.2"></a>Definisce il modo di presentare le immagini che sono aperte nel visualizzatore</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.advanced.showhiddenobjects"><b>mostrare i file e le cartelle nascoste. </b><a class="indexterm" name="id-1.11.17.8.2.1.2.1.2"></a>Definisce se visualizzare o meno i file e le cartelle nascoste. I nomi dei file e delle cartelle nascoste sono preceduti da un punto. Le applicazioni locali di <span class="phrase">File</span> richiedono questi file e cartelle per scopi interni. Per non rischiare di compromettere il funzionamento delle applicazioni locali di <span class="phrase">File</span>, questi file e cartelle non dovrebbero essere modificati o eliminati.</p></li>
 </ul>
 <p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.accounts.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.accounts.html
index fbe9ec7d6..840ced45e 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.accounts.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.accounts.html
@@ -76,7 +76,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilizzare la posta unificata</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selezionare un indirizzo mittente</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">selezionare un indirizzo mittente</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Impostare l'indirizzo di risposta</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.attachments.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.attachments.html
index f6c9484a3..6058b5122 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.attachments.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="Posta elettronica">
 <link rel="prev" href="ox.appsuite.user.sect.email.view.html" title="Visualizzare i messaggio di posta">
-<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
+<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.deputy.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.deputy.html
index 72330396b..7e69893fb 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.deputy.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.deputy.html
@@ -91,12 +91,12 @@
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creare,modificare o gestire appuntamenti come delegato</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestire i delegati</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestire i delegati</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.email.deputy">Argomento principale: <a class="xref" href="ox.appsuite.user.chap.email.html"><i>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.create.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.create.html
index f3c48b0a1..1de73802f 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.create.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.create.html
@@ -62,7 +62,7 @@
 </li>
 <li class="listitem"><p role="presentation">Pulsante <span class="guibutton"><strong>CC</strong></span>, <span class="guibutton"><strong>CCN</strong></span>. Apre il campo di inserimento <span class="guibutton"><strong>CC</strong></span> o <span class="guibutton"><strong>CCN</strong></span>.</p></li>
 <li class="listitem">
-<p role="presentation">Pulsante <span class="guibutton"><strong>RE</strong></span>. Apre il campo di inserimento <span class="guibutton"><strong>Rispondi a</strong></span>.</p>
+<p role="presentation">Pulsante <span class="guibutton"><strong>Re</strong></span>. Apre il campo di inserimento <span class="guibutton"><strong>Rispondi a</strong></span>.</p>
 <p role="presentation">La propria risposta di posta elettronica sarà inviata agli indirizzi digitati in questo campo di inserimento.</p>
 </li>
 <li class="listitem">
@@ -83,6 +83,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Invia</strong></span>. Invia il messaggio di posta al destinatario digitato.</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.13.5.1.5"><p role="presentation"><span class="guibutton"><strong>Invio posticipato</strong></span>. Apre un menu che consente di selezionare quando dovrà essere inviato il messaggio.</p></li>
 <li class="listitem">
 <p role="presentation">Barra dei pulsanti </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -116,17 +117,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">La finestra di modifica</a></p></li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Rispondere ai messaggi di posta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Inoltrare messaggi di posta</a></p>
-<p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Utilizzare le funzioni AI durante la composizione dei messaggi di posta</a></p>
-<p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Inviare e ricevere messaggi di posta come delegato</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 <p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Inviare messaggi di posta cifrati</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.email.gui.create">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">I componenti di <span class="phrase">Posta elettronica</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.detailview.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.detailview.html
index be7a55266..5e762af01 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.detailview.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.detailview.html
@@ -63,6 +63,7 @@
 <li class="listitem">
 <p role="presentation">In base alla configurazione, sarà disponibile una delle seguenti funzioni: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">L'icona <span class="guibutton"><strong>Imposta categoria</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Apre un menu con ulteriori funzioni per assegnare una categoria o per gestire le categorie.</p></li>
 <li class="listitem"><p role="presentation">L'icona <span class="guibutton"><strong>Imposta colore</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Apre un menu che consente di assegnare un'etichetta colorata al messaggio.</p></li>
 <li class="listitem"><p role="presentation">L'icona <span class="guibutton"><strong>Contrassegno</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Contrassegna il messaggio di posta.</p></li>
 </ul>
@@ -80,6 +81,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation">Se si seleziona un messaggio con un allegato come collegamento nella cartella <span class="guibutton"><strong>Posta inviata</strong></span>, informazioni sull'allegato saranno visualizzate nella parte superiore del testo del messaggio.</p></li>
+<li class="listitem"><p role="presentation">In base alla configurazione: se disponibile, le categorie assegnate saranno visualizzate.</p></li>
 <li class="listitem">
 <p role="presentation">Testo del messaggio</p>
 <p role="presentation">Le citazioni da messaggi precedenti sono contrassegnate all'inizio della riga.</p>
@@ -95,15 +97,11 @@
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">La finestra a comparsa di <span class="phrase">Posta elettronica</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">La finestra di modifica dei messaggi di posta</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualizzare i messaggio di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Rispondere ai messaggi di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualizzare o salvare gli allegati dei messaggi di posta</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.detailview">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">I componenti di <span class="phrase">Posta elettronica</span></a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.foldertree.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.foldertree.html
index f9623e622..ecccda243 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.foldertree.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.foldertree.html
@@ -54,7 +54,9 @@
 </ul>
 <p>In base alla configurazione e alle impostazioni di posta, potrebbero essere disponibili ulteriori cartelle. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Cartelle per i messaggi di posta non letti, cartelle per messaggi contrassegnati</p></li>
+<li class="listitem"><p role="presentation">Cartella per i messaggi contrassegnati</p></li>
+<li class="listitem"><p role="presentation">Cartella per i messaggi non letti</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.7.5.2.3"><p role="presentation">Cartella per i messaggi che saranno inviati successivamente</p></li>
 <li class="listitem"><p role="presentation">Cartelle di posta elettronica condivise e pubbliche sottoscritte.</p></li>
 <li class="listitem"><p role="presentation">Cartelle da account di posta elettronica funzionali che vi sono state assegnate dall'amministratore.</p></li>
 </ul>
@@ -67,10 +69,10 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualizzare i messaggio di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Aggiungere cartelle di posta elettronica</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Disabilitare o abilitare gli account di posta elettronica funzionali</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Disabilitare o abilitare gli account di posta elettronica funzionali</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestire i dati con le cartelle</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Condividere dati</a></p>
 </li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.html
index 08bf3d561..965fde34d 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">Il pulsante Nuovo messaggio</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Posta elettronica</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra delle schede di <span class="phrase">Posta elettronica</span></a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra delle categorie della posta in arrivo</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">La finestra a comparsa di <span class="phrase">Posta elettronica</span></a></p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.list.html
index e92e66cca..196c8eaa4 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.list.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.list.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="I componenti di Posta elettronica">
-<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barra delle schede di Posta elettronica">
+<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barra delle categorie della posta in arrivo">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.detailview.html" title="La vista dettagliata di Posta elettronica">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -52,6 +52,7 @@
 <li class="listitem"><p role="presentation">I seguenti dettagli sono visualizzati per ogni messaggio: mittente, oggetto, data di ricezione. I messaggi non letti sono marcati con l'icona <span class="guibutton"><strong>Non letto</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span>.</p></li>
 <li class="listitem"><p role="presentation">Un suggerimento sul nome di un mittente mostra il suo indirizzo di posta.</p></li>
 <li class="listitem"><p role="presentation">Se disponibili, informazioni aggiuntive sono mostrate: icone degli allegati, etichette colorate o contrassegni, numero di messaggi di posta nella <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">conversazione</a>, priorità.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.10.5.1.7"><p role="presentation">Se disponibili, saranno visualizzate le categorie assegnate. Nelle impostazioni di posta elettronica è possibile specificare se le categorie assegnate devono essere visualizzate nella vista Elenco.</p></li>
 <li class="listitem"><p role="presentation">I messaggi cifrati sono marcati con l'icona Cifrato <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.encrypted"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Se un avviso di assenza è abilitato, una notifica sarà visualizzata sopra la vista Elenco.</p>
@@ -69,12 +70,9 @@
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">Il menu delle impostazioni di <span class="phrase">Posta elettronica</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualizzare i messaggio di posta</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.list">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">I componenti di <span class="phrase">Posta elettronica</span></a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.new.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.new.html
index c2f109e9e..401f3338f 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.new.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.new.html
@@ -52,7 +52,7 @@
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Aggiungere account di posta elettronica</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualizzare o salvare gli allegati dei messaggi di posta</a></p>
 </li></ul>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.popup.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.popup.html
index 82fc9c7ef..83ab2ba2f 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.popup.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.popup.html
@@ -71,8 +71,7 @@
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p></li>
-<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Chiamare il mittente o un altro destinatario</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Chiamare il mittente o un altro destinatario</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualizzare i contatti nella vista Aura</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.popup">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">I componenti di <span class="phrase">Posta elettronica</span></a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.settingsmenu.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.settingsmenu.html
index 5f5ae1b6b..9a643e567 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.settingsmenu.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.settingsmenu.html
@@ -59,7 +59,6 @@
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Aggiungere account di posta elettronica</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualizzare o salvare gli allegati dei messaggi di posta</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.tabs.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.tabs.html
index c9f65bf0f..92f9ebcc1 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.tabs.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.tabs.html
@@ -1,7 +1,7 @@
 <html lang="it">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>La barra delle schede di Posta elettronica</title>
+<title>La barra delle categorie della posta in arrivo</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
@@ -38,15 +38,14 @@
 <h2 class="sr-only">I componenti di <span class="phrase">Posta elettronica</span>
 </h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.tabs">
-<div class="titlepage"><div><div><h3 class="title">La barra delle schede di <span class="phrase">Posta elettronica</span>
-</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">La barra delle categorie della posta in arrivo</h3></div></div></div>
 <a class="indexterm" name="id-1.7.8.9.2"></a><p id="ox.appsuite.user.concept.email.gui.tabs">Mostra le schede di posta in arrivo predefinite per i messaggi di posta nella cartella <span class="guibutton"><strong>Posta in arrivo</strong></span>. Ciò consente di assegnare i messaggi in arrivo a determinate schede ordinate per mittente.</p>
 <p id="ox.appsuite.user.reference.email.gui.tabs">
         </p>
 <p class="title">Note:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">In base alla configurazione, le schede della posta in arrivo potrebbero non essere disponibili.</p></li>
-<li class="listitem"><p role="presentation">Se le schede di posta in arrivo sono disponibili, è possibile mostrare o nascondere la barra delle schede di posta in arrivo. Per fare ciò, fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Schede di posta in arrivo</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Se le categorie di posta in arrivo sono disponibili, è possibile mostrare o nascondere la barra delle categorie di posta in arrivo. Per fare ciò, fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Categorie di posta in arrivo</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">Il numero di schede di posta in arrivo, i loro nomi e l'ordine sono preimpostati. In base alla configurazione, alcune schede possono essere rinominate o disabilitate.</p></li>
 </ul>
 <p>
@@ -54,14 +53,9 @@
 <p id="ox.appsuite.user.related.email.gui.tabs">
         </p>
 <p class="title">Argomenti correlati:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Lavorare con le categorie di posta in arrivo</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a>
-            </p></li>
-</ul>
+            </p></li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.reference.email.gui.tabs.parent">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">I componenti di <span class="phrase">Posta elettronica</span></a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.toolbar.html
index 41bbd4d09..cd3dd2bd5 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.toolbar.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.gui.toolbar.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="I componenti di Posta elettronica">
 <link rel="prev" href="ox.appsuite.user.sect.email.gui.foldertree.html" title="La vista delle cartelle di Posta elettronica">
-<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barra delle schede di Posta elettronica">
+<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="La barra delle categorie della posta in arrivo">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -49,7 +49,8 @@
 <li class="listitem"><p role="presentation">L'icona <span class="guibutton"><strong>Archivia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.archive"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span>. Archivia i messaggi selezionati.</p></li>
 <li class="listitem"><p role="presentation">Icone per <span class="guibutton"><strong>rispondere a</strong></span> e <span class="guibutton"><strong>inoltrare</strong></span> i messaggi di posta selezionati: <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">In base alla configurazione: l'icona <span class="guibutton"><strong>Integrazione AI</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>. Apre un menu con funzioni AI per la modifica del contenuto del messaggio di posta elettronica.</p></li>
-<li class="listitem"><p role="presentation">L'icona <span class="guibutton"><strong>Imposta categoria</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Apre un menu che consente di spostare un messaggio di posta in una categoria. Questa icona è disponibile solo se viene visualizzata la barra delle schede di posta in arrivo.</p></li>
+<li class="listitem"><p role="presentation">In base alla configurazione: <span class="guibutton"><strong>Imposta categorie della posta in arrivo</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.inboxcategories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Apre un menu che consente di spostare un messaggio in una categoria della posta in arrivo. Questa icona è disponibile solo se è visualizzata la barra delle categorie della posta in arrivo.</p></li>
+<li class="listitem"><p role="presentation">In base alla configurazione: l'icona <span class="guibutton"><strong>Imposta categoria</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Apre un menu con funzioni per assegnare una categoria o per gestire le categorie.</p></li>
 <li class="listitem"><p role="presentation">In base alla configurazione: l'icona <span class="guibutton"><strong>Imposta colore</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Apre un menu che consente di assegnare un'etichetta colorata ai messaggi selezionati.</p></li>
 <li class="listitem"><p role="presentation">In base alla configurazione: l'icona <span class="guibutton"><strong>Contrassegno</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Contrassegna il messaggio di posta.</p></li>
 <li class="listitem"><p role="presentation">L'icona <span class="guibutton"><strong>Sposta</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.moveto"><object type="image/svg+xml" data="../../images/folder-symlink.svg" height="15"></object></span>. Sposta i messaggi di posta selezionati in un'altra cartella.</p></li>
@@ -63,25 +64,12 @@
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra delle schede di <span class="phrase">Posta elettronica</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Rispondere ai messaggi di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Inoltrare messaggi di posta</a></p>
 </li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Utilizzo delle funzioni AI durante la risposta ai messaggi di posta</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Spostare o copiare i messaggi di posta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marcare i messaggi di posta come letti o non letti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Categorizzare i messaggi di posta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Mostrare il sorgente di un messaggio di posta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Utilizzare le bozze dei messaggi</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creare promemoria dei messaggi di posta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Aggiungere un messaggio di posta al portale</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Salvare i messaggi di posta</a></p>
-<p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Esportare messaggi di posta come PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Stampare i messaggi di posta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Eliminare i messaggi di posta</a></p>
-</li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Utilizzo delle funzioni AI durante la risposta ai messaggi di posta</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.toolbar">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">I componenti di <span class="phrase">Posta elettronica</span></a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.addportal.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.addportal.html
index 4e2416999..7e6ab397e 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.addportal.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.addportal.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.addportal">
 <div class="titlepage"><div><div><h3 class="title">Aggiungere un messaggio di posta al portale</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.15.2"></a><a class="indexterm" name="id-1.7.15.15.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">È possibile aggiungere un messaggio di posta come widget del portale.</p>
+<a class="indexterm" name="id-1.7.15.16.2"></a><a class="indexterm" name="id-1.7.15.16.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">È possibile aggiungere un messaggio di posta come widget del portale.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.addportal">
 <p class="title">Come aggiungere un messaggio di posta al portale:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.addportal"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.add.html">Aggiungere widget al portale</a></p></li></ul>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.archive.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.archive.html
index 841074788..172706d55 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.archive.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.archive.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.archive">
 <div class="titlepage"><div><div><h3 class="title">Archiviare i messaggi di posta</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.20.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">Quando si archiviano i messaggi di posta, tali messaggi sono spostati nella cartella <span class="guibutton"><strong>Archivio</strong></span>. La cartella <span class="guibutton"><strong>Archivio</strong></span> contiene una sottocartella per ogni anno di calendario. I messaggi archiviati sono salvati in queste sottocartelle in base all'anno di ricezione. La cartella <span class="guibutton"><strong>Archivio</strong></span> è creata non appena si utilizza questa funzione. Sono disponibili le seguenti opzioni: </p>
+<a class="indexterm" name="id-1.7.15.21.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">Quando si archiviano i messaggi di posta, tali messaggi sono spostati nella cartella <span class="guibutton"><strong>Archivio</strong></span>. La cartella <span class="guibutton"><strong>Archivio</strong></span> contiene una sottocartella per ogni anno di calendario. I messaggi archiviati sono salvati in queste sottocartelle in base all'anno di ricezione. La cartella <span class="guibutton"><strong>Archivio</strong></span> è creata non appena si utilizza questa funzione. Sono disponibili le seguenti opzioni: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">archiviare i messaggi di una cartella più vecchi di 90 giorni.</p></li>
 <li class="listitem"><p role="presentation">archiviare singoli messaggi di posta</p></li>
@@ -61,14 +61,16 @@
 </li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.archive">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.archive"></p>
+<p class="title">Interfaccia utente:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">Argomenti correlati:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Stampare i messaggi di posta</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Stampare i messaggi di posta</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.archive">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.categories.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.categories.html
new file mode 100644
index 000000000..a751f2d45
--- /dev/null
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.categories.html
@@ -0,0 +1,95 @@
+<html lang="it">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Utilizzare PGP in linea in modo predefinito per i nuovi messaggi</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuale utente">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestire i messaggi di posta">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Collezionare indirizzi">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Categorizzare i messaggi di posta">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Indietro</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Avanti</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Posta elettronica</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestire i messaggi di posta</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Utilizzare PGP in linea in modo predefinito per i nuovi messaggi</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.categories">Per organizzare i messaggi di posta indipendentemente dalle cartelle, è possibile utilizzare le categorie. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">È possibile contrassegnare i messaggi con categorie.</p></li>
+<li class="listitem"><p role="presentation">È possibile visualizzare tutti i messaggi contrassegnati con una categoria specifica.</p></li>
+</ul>
+<p> È possibile creare, modificare o eliminare le proprie categorie, vedere <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>.</p>
+<p id="ox.appsuite.user.tip.email.manage.categories">Indipendentemente dalle categorie, è possibile utilizzare le categorie della posta in arrivo. Con le categorie della posta in arrivo, è possibile organizzare i messaggi in base ai mittenti, vedere <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Lavorare con le categorie di posta in arrivo</a>.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.mark">
+<p class="title">Come contrassegnare i messaggi di posta con una categoria:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selezionare uno o più messaggi di posta elettronica.</p></li>
+<li class="step">
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Imposta categoria</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.mark.add"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> nella barra degli strumenti. Selezionare una categoria.</p>
+<p role="presentation">Per rimuovere una categoria dal messaggio di posta, fare clic sulla categoria.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.view">
+<p class="title">Come visualizzare i messaggi di posta contrassegnati con una categoria specifica:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selezionare un messaggio contrassegnato da una categoria.</p></li>
+<li class="step"><p role="presentation">Fare clic sulla categoria nella vista dettagliata.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Risultato: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vista Elenco mostra tutti i messaggi di posta contrassegnati con questa categoria.</p></li>
+<li class="listitem"><p role="presentation">Per ogni messaggio sarà visualizzata la cartella contenente il messaggio.</p></li>
+<li class="listitem"><p role="presentation">Per visualizzare l'elenco precedente, fare clic sull'icona <span class="guibutton"><strong>Annulla la ricerca</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> nel campo di ricerca.</p></li>
+</ul>
+          <p>Suggerimento: è possibile anche utilizzare la funzione di ricerca per cercare una categoria utilizzando le opzioni di ricerca.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.categories"></p>
+<p class="title">Interfaccia utente:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">Argomenti correlati:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">Ricercare i messaggi di posta</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utilizzare le categorie per gli appuntamenti</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utilizzo delle categorie per i contatti</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utilizzare le categorie per le attività</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.categories">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.collectaddress.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.collectaddress.html
index 25755d498..7932a7a5f 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.collectaddress.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.collectaddress.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestire i messaggi di posta">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.mark.html" title="Marcare i messaggi di posta come letti o non letti">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Categorizzare i messaggi di posta">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="Utilizzare PGP in linea in modo predefinito per i nuovi messaggi">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.mark.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Avanti</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.categories.html">Avanti</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -40,7 +40,7 @@
 <div class="titlepage"><div><div><h3 class="title">Collezionare indirizzi</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.10.2"></a><a class="indexterm" name="id-1.7.15.10.3"></a><p id="ox.appsuite.user.concept.email.manage.collectaddress">Esistono le seguenti opzioni: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Collezionare automaticamente nuovi indirizzi di posta quando si inviano o si leggono i messaggi di posta attivando questa funzione nelle impostazioni di posta elettronica.</p></li>
+<li class="listitem"><p role="presentation">Collezionare automaticamente nuovi indirizzi di posta quando si inviano o si leggono i messaggi di posta attivando questa funzione nelle impostazioni avanzate di posta elettronica.</p></li>
 <li class="listitem"><p role="presentation">Aggiungere manualmente indirizzi di posta a una rubrica</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.collectaddress">
@@ -56,16 +56,10 @@
           <p>Nota: questa funzione è disponibile solo per i nuovi contatti.</p>
         </div>
 </div>
-<p role="presentation" class="cap-contacts">
-        <p class="title">Argomenti correlati:</p><ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creare un nuovo contatto</a>
-            </p></li>
-</ul>
-      </p>
+<p role="presentation" class="cap-contacts"><p class="title">Interfaccia utente:</p><ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p></li></ul> <p class="title">Argomenti correlati:</p><ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creare un nuovo contatto</a></p></li>
+</ul></p>
 <p id="ox.appsuite.user.parent.email.manage.collectaddress">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.delete.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.delete.html
index ccfc40f0f..e83b60b20 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.delete.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.delete.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestire i messaggi di posta">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.archive.html" title="Archiviare i messaggi di posta">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Pulire le cartelle di posta">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.recover.html" title="Ripristinare i messaggi di posta">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.archive.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Avanti</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.recover.html">Avanti</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -38,20 +38,20 @@
 <h2 class="sr-only">Gestire i messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Eliminare i messaggi di posta</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.21.2"></a><a class="indexterm" name="id-1.7.15.21.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">Esistono le seguenti opzioni: </p>
+<a class="indexterm" name="id-1.7.15.22.2"></a><a class="indexterm" name="id-1.7.15.22.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">Esistono le seguenti opzioni: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Definire se i messaggi di posta sono spostati nel cestino o rimossi definitivamente una volta eliminati.</p>
-<p role="presentation">I messaggi spostati nel cestino possono essere recuperati.</p>
+<p role="presentation">È possibile definire se i messaggi sono spostati nel Cestino o rimossi definitivamente una volta eliminati. </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">I messaggi spostati nel cestino possono essere recuperati.</p></li>
+<li class="listitem"><p role="presentation"><span class="cap-dumpster">I messaggi eliminati definitivamente possono essere recuperati entro 14 giorni. Una volta scaduto questo periodo: </span>i messaggi eliminati definitivamente <span class="phrase"><strong>non</strong></span> potranno essere recuperati.</p></li>
+</ul>
 </li>
-<li class="listitem"><p role="presentation">Eliminare singoli messaggi o intere conversazioni di posta.</p></li>
-<li class="listitem"><p role="presentation">Eliminare tutti i messaggi di una cartella di posta elettronica.</p></li>
-<li class="listitem"><p role="presentation">Ripristinare i messaggi eliminati dal cestino.</p></li>
-<li class="listitem"><p role="presentation">Eliminare definitivamente i messaggi di posta dal cestino.</p></li>
-<li class="listitem"><p role="presentation">Eliminare definitivamente i messaggi di posta dal cestino svuotando il cestino.</p></li>
+<li class="listitem"><p role="presentation">È possibile eliminare singoli messaggi o un'intera conversazione.</p></li>
+<li class="listitem"><p role="presentation">È possibile eliminare tutti i messaggi di una cartella di posta elettronica.</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.delete.setting">
-<p class="title">Come definire se i messaggi di posta vengono spostati nel cestino o rimossi in modo definitivo una volta eliminati.</p>
+<p class="title">Come definire se i messaggi di posta vengono spostati nel cestino o rimossi in modo definitivo una volta eliminati:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.setting"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
@@ -65,21 +65,21 @@
 <li class="listitem"><p role="presentation">Se i messaggi devono essere spostati nel cestino, disabilitare <span class="guibutton"><strong>Rimuovi definitivamente i messaggi eliminati</strong></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Se i messaggi devono essere eliminati definitivamente, abilitare <span class="guibutton"><strong>Rimuovi definitivamente i messaggi eliminati</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Avviso:</strong></span> i messaggi di posta eliminati in modo definitivo <span class="phrase"><strong>non</strong></span> possono essere ripristinati.</p>
+<p role="presentation"><span class="phrase"><strong>Avviso:</strong></span> in base alla configurazione, i messaggi eliminati definitivamente <span class="phrase"><strong>non</strong></span> possono essere recuperati.</p>
 </li>
 </ul></p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.delete">
-<p class="title">Come eliminare un messaggio di posta:</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.single">
+<p class="title">Come eliminare singoli messaggi di posta:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Selezionare uno o più messaggi di posta elettronica.</p></li>
 <li class="step">
-<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Elimina</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> nella barra degli strumenti.</p>
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Elimina</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> nella barra degli strumenti.</p>
 <p role="presentation">O: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Premere il tasto [Canc] o [Backspace] sulla tastiera.</p></li>
 <li class="listitem"><p role="presentation">Nel menu contestuale di un messaggio di posta, fare clic su <span class="guibutton"><strong>Elimina</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Se si è selezionato un singolo messaggio, utilizzare l'icona <span class="guibutton"><strong>Elimina</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> nella vista dettagliata.</p></li>
+<li class="listitem"><p role="presentation">Se si è selezionato un singolo messaggio, utilizzare l'icona <span class="guibutton"><strong>Elimina</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> nella vista dettagliata.</p></li>
 </ul></p>
 </li>
 </ol></div>
@@ -87,7 +87,7 @@
           <p>Risultato: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Se l'impostazione <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Rimuovi definitivamente i messaggi di posta eliminati</strong></span></a> è disabilitata:</p>
+<p role="presentation">Se l'impostazione <span class="guibutton"><strong>Rimuovi definitivamente i messaggi di posta eliminati</strong></span> è disabilitata:</p>
 <p role="presentation">Il messaggio di posta sarà spostato nel cestino.</p>
 </li>
 <li class="listitem">
@@ -97,17 +97,17 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptyfolder">
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.emptyfolder">
 <p class="title">Come eliminare tutti i messaggi di una cartella:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Nella vista delle cartelle, selezionare la cartella che contiene i messaggi che si desidera eliminare.</p></li>
 <li class="step">
 <p role="presentation">Utilizzare uno dei seguenti metodi: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> accanto al nome della cartella.</p></li>
-<li class="listitem"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Altre azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> sopra l'elenco.</p></li>
+<li class="listitem"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> accanto al nome della cartella.</p></li>
+<li class="listitem"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Altre azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> sopra l'elenco.</p></li>
 </ul></p>
 <p role="presentation">Fare clic sul pulsante <span class="guibutton"><strong>Elimina tutti i messaggi</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Avviso:</strong></span> se l'impostazione <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Rimuovi definitivamente i messaggi di posta eliminati</strong></span></a> è abilitata, i messaggi eliminati non possono essere recuperati.</p>
+<p role="presentation"><span class="phrase"><strong>Avviso:</strong></span> in base alla configurazione, se l'impostazione <span class="guibutton"><strong>Rimuovi definitivamente i messaggi eliminati</strong></span> è abilitata, i messaggi di posta eliminati <span class="phrase"><strong>non</strong></span> possono essere recuperati.</p>
 </li>
 <li class="step"><p role="presentation">Confermare di voler eliminare il contenuto di questa cartella.</p></li>
 </ol></div>
@@ -115,7 +115,7 @@
           <p>Risultato: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Se l'impostazione <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Rimuovi definitivamente i messaggi di posta eliminati</strong></span></a> è disabilitata:</p>
+<p role="presentation">Se l'impostazione <span class="guibutton"><strong>Rimuovi definitivamente i messaggi di posta eliminati</strong></span> è disabilitata:</p>
 <p role="presentation">Il messaggio di posta sarà spostato nel cestino.</p>
 </li>
 <li class="listitem">
@@ -125,60 +125,22 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
-<p class="title">Come ripristinare i messaggi di posta eliminati:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Aprire la cartella <span class="guibutton"><strong>Cestino</strong></span> nella vista delle cartelle.</p></li>
-<li class="step"><p role="presentation">Selezionare uno o più messaggi di posta elettronica.</p></li>
-<li class="step"><p role="presentation">Nel menu contestuale di un messaggio di posta, fare clic su <span class="guibutton"><strong>Sposta</strong></span>.</p></li>
-<li class="step"><p role="presentation">Selezionare una cartella nella finestra <span class="guilabel"><strong>Sposta</strong></span>. Fare clic su <span class="guibutton"><strong>Sposta</strong></span>.</p></li>
-</ol></div>
-<div class="taskrelated">
-          <p>O: </p>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Per ripristinare tutti i messaggi di posta dal cestino, fare clic sull'icona <span class="guibutton"><strong>Altre opzioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> sopra l'elenco. Fare clic sul pulsante <span class="guibutton"><strong>Sposta tutti i messaggi</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Se si è selezionato un singolo messaggio, utilizzare l'icona <span class="guibutton"><strong>Altre azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> nella vista dettagliata. Fare clic su <span class="guibutton"><strong>Sposta</strong></span>.</p></li>
-</ul>
-        </div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever">
-<p class="title">Come eliminare definitivamente un messaggio di posta:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Avviso:</strong></span> i messaggi di posta eliminati in modo definitivo <span class="phrase"><strong>non</strong></span> possono essere ripristinati.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Aprire la cartella <span class="guibutton"><strong>Cestino</strong></span> nella vista delle cartelle.</p></li>
-<li class="step"><p role="presentation">Selezionare uno o più messaggi di posta elettronica.</p></li>
-<li class="step">
-<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Elimina</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> nella barra degli strumenti.</p>
-<p role="presentation">Se si è selezionato un singolo messaggio, è possibile utilizzare anche l'icona <span class="guibutton"><strong>Elimina</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> nella vista dettagliata.</p>
-</li>
-<li class="step"><p role="presentation">Confermare di voler eliminare definitivamente i messaggi di posta selezionati.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptytrash">
-<p class="title">Come eliminare definitivamente il contenuto della cartella Cestino:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Avviso:</strong></span> i messaggi di posta eliminati in modo definitivo <span class="phrase"><strong>non</strong></span> possono essere ripristinati.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Selezionare la cartella <span class="guibutton"><strong>Cestino</strong></span> nella vista delle cartelle.</p></li>
-<li class="step">
-<p role="presentation">Utilizzare uno dei seguenti metodi: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Altre azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> accanto a <span class="guibutton"><strong>Cestino</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Altre azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> sopra l'elenco.</p></li>
-</ul></p>
-<p role="presentation">Fare clic su <span class="guibutton"><strong>Svuota cartella</strong></span>.</p>
-</li>
-<li class="step"><p role="presentation">Confermare di voler eliminare il contenuto della cartella.</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.email.manage.delete"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Pulire le cartelle di posta</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Ripristinare i messaggi di posta</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Eliminare i messaggi di posta</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.22.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Ripristinare definitivamente i messaggi di posta eliminati</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Pulire le cartelle di posta</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.email.manage.delete">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.deleteforever.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.deleteforever.html
new file mode 100644
index 000000000..0d2e2b584
--- /dev/null
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.deleteforever.html
@@ -0,0 +1,92 @@
+<html lang="it">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Eliminare i messaggi di posta</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuale utente">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestire i messaggi di posta">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.recover.html" title="Ripristinare i messaggi di posta">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Ripristinare definitivamente i messaggi di posta eliminati">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.recover.html">Indietro</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Avanti</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Posta elettronica</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestire i messaggi di posta</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.deleteforever">
+<div class="titlepage"><div><div><h3 class="title">Eliminare i messaggi di posta</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.24.2"></a><a class="indexterm" name="id-1.7.15.24.3"></a><p id="ox.appsuite.user.concept.email.manage.deleteforever">Esistono le seguenti opzioni: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Eliminare definitivamente singoli messaggi di posta dal cestino.</p></li>
+<li class="listitem"><p role="presentation">Eliminare definitivamente i messaggi di posta dal cestino svuotando il cestino.</p></li>
+</ul>
+<p id="ox.appsuite.user.hint.email.manage.deleteforever.html"><span class="cap-dumpster">I messaggi eliminati definitivamente possono essere recuperati entro 14 giorni. Una volta scaduto questo periodo: </span>i messaggi eliminati definitivamente <span class="phrase"><strong>non</strong></span> potranno essere recuperati.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.single">
+<p class="title">Come eliminare definitivamente singoli messaggi di posta:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Aprire la cartella <span class="guibutton"><strong>Cestino</strong></span> nella vista delle cartelle.</p></li>
+<li class="step"><p role="presentation">Selezionare uno o più messaggi di posta elettronica.</p></li>
+<li class="step">
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Elimina</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> nella barra degli strumenti.</p>
+<p role="presentation">Se si è selezionato un singolo messaggio, è possibile utilizzare anche l'icona <span class="guibutton"><strong>Elimina</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> nella vista dettagliata.</p>
+</li>
+<li class="step"><p role="presentation">Confermare di voler eliminare definitivamente i messaggi di posta selezionati.</p></li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.emptytrash">
+<p class="title">Eliminare definitivamente tutti i messaggi di posta dal cestino.</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selezionare la cartella <span class="guibutton"><strong>Cestino</strong></span> nella vista delle cartelle.</p></li>
+<li class="step">
+<p role="presentation">Utilizzare uno dei seguenti metodi: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Altre azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> accanto a <span class="guibutton"><strong>Cestino</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Altre azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> sopra l'elenco.</p></li>
+</ul></p>
+<p role="presentation">Fare clic su <span class="guibutton"><strong>Svuota cartella</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Confermare di voler eliminare il contenuto della cartella.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.deleteforever"></p>
+<p class="title">Interfaccia utente:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">Argomenti correlati:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Eliminare i messaggi di posta</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Ripristinare i messaggi di posta</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.24.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Ripristinare definitivamente i messaggi di posta eliminati</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Pulire le cartelle di posta</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.deleteforever">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.draft.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.draft.html
index f6a51e465..69a4db349 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.draft.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.draft.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.draft">
 <div class="titlepage"><div><div><h3 class="title">Utilizzare le bozze dei messaggi</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">Quando si compone un messaggio, il messaggio è salvato automaticamente come bozza del messaggio a intervallo regolari. Sono disponibili le seguenti opzioni:</p>
+<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">Quando si compone un messaggio, il messaggio è salvato automaticamente come bozza del messaggio a intervallo regolari. Sono disponibili le seguenti opzioni:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Modificare o inviare la bozza di un messaggio.</p></li>
 <li class="listitem"><p role="presentation">Modificare o inviare la copia della bozza di un messaggio</p></li>
@@ -69,11 +69,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.draft"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Utilizzare i modelli</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.manage.draft">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.expungefolder.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.expungefolder.html
index 8e55da80a..7da6738b4 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.expungefolder.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.expungefolder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestire i messaggi di posta">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Eliminare i messaggi di posta">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Ripristinare definitivamente i messaggi di posta eliminati">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.unifiedmail.html" title="Utilizzare la posta unificata">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Avanti</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.expungefolder">
 <div class="titlepage"><div><div><h3 class="title">Pulire le cartelle di posta</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.22.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">In base alle impostazioni del client di posta, i messaggi eliminati dall'interno di un client come Apple Mail, MS Outlook o Mozilla Thunderbird potrebbero essere eliminati solo dopo la chiusura del client. Nel frattempo, questi messaggi saranno mostrati come sbarrati nel groupware. Per eliminare tali messaggi eseguire una pulizia sulla cartella di posta.</p>
+<a class="indexterm" name="id-1.7.15.26.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">In base alle impostazioni del client di posta, i messaggi eliminati dall'interno di un client come Apple Mail, MS Outlook o Mozilla Thunderbird potrebbero essere eliminati solo dopo la chiusura del client. Nel frattempo, questi messaggi saranno mostrati come sbarrati nel groupware. Per eliminare tali messaggi eseguire una pulizia sulla cartella di posta.</p>
 <p id="ox.appsuite.user.hint.email.manage.expungefolder">Nota: in base alla configurazione, questa funzione non è disponibile poiché tali messaggi non sono visualizzati.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.expunge">
 <p class="title">Come pulire una cartella di posta:</p>
@@ -47,14 +47,12 @@
 <li class="step"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.expungefolder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> accanto al nome della cartella. Fare clic su <span class="guibutton"><strong>Pulisci</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.expungefolder">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.expungefolder"></p>
+<p class="title">Interfaccia utente:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Posta elettronica</span></a></p></li></ul>
+<p> </p>
 <p class="title">Argomenti correlati:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Eliminare i messaggi di posta</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Eliminare i messaggi di posta</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.expungefolder">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.html
index fcc359b95..485525bd2 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.html
@@ -43,17 +43,21 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Spostare o copiare i messaggi di posta</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marcare i messaggi di posta come letti o non letti</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collezionare indirizzi</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Utilizzare PGP in linea in modo predefinito per i nuovi messaggi</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Categorizzare i messaggi di posta</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Mostrare il sorgente di un messaggio di posta</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Utilizzare le bozze dei messaggi</a></p></li>
-<li class="listitem cap-tasks" id="id-1.7.15.4.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creare promemoria dei messaggi di posta</a></p></li>
+<li class="listitem cap-tasks" id="id-1.7.15.4.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creare promemoria dei messaggi di posta</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Aggiungere un messaggio di posta al portale</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Salvare i messaggi di posta</a></p></li>
-<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Esportare messaggi di posta come PDF</a></p></li>
+<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Esportare messaggi di posta come PDF</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importare i messaggi di posta</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Stampare i messaggi di posta</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archiviare i messaggi di posta</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Eliminare i messaggi di posta</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Ripristinare i messaggi di posta</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Eliminare i messaggi di posta</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.4.1.19"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Ripristinare definitivamente i messaggi di posta eliminati</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Pulire le cartelle di posta</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Utilizzare la posta unificata</a></p></li>
 </ul>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.import.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.import.html
index 5b7d00b54..9eeb9035c 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.import.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importare i messaggi di posta</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><p id="ox.appsuite.user.concept.email.manage.import">È possibile importare un messaggio di posta disponibile nel formato EML.</p>
+<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.import">È possibile importare un messaggio di posta disponibile nel formato EML.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.import">
 <p class="title">Come importare un messaggio di posta:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,14 +46,15 @@
 <li class="step"><p role="presentation">Trascinare il file eml da un navigatore di file o dal desktop nella vista Elenco dei messaggi di posta.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.import"></p>
+<p class="title">Interfaccia utente:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">Argomenti correlati:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Salvare i messaggi di posta</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Salvare i messaggi di posta</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.import">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.inboxcategories.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.inboxcategories.html
index 93f002161..a59d1ea03 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.inboxcategories.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.inboxcategories.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation">assegnare i messaggi di posta a una categoria di posta in arrivo</p></li>
 <li class="listitem"><p role="presentation">modifica la visualizzazione delle categoria della posta in arrivo</p></li>
 </ul>
-<p role="presentation" class="feat-io-ox-core-categories">Nota: le categorie della posta in arrivo qui descritte possono essere utilizzate solo per i messaggi di posta elettronica. In base alla configurazione, è possibile utilizzare categorie separate per appuntamenti, contatti e attività, vedere <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Nota: le categorie della posta in arrivo qui descritte possono essere utilizzate solo per i messaggi di posta elettronica. In base alla configurazione, è possibile utilizzare categorie separate per messaggi di posta, appuntamenti, contatti e attività, vedere <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Utilizzare PGP in linea in modo predefinito per i nuovi messaggi</a>.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.inboxcategories.activate">
 <p class="title">Come abilitare o disabilitare le schede della posta in arrivo:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,7 @@
 <p role="presentation">Per abilitare le schede di posta in arrivo, fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.activate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Categorie di posta in arrivo</strong></span>.</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">È possibile inoltre utilizzare il pulsante <span class="guibutton"><strong>Configura le categorie della posta in arrivo</strong></span> sotto le impostazioni di posta elettronica <span class="guibutton"><strong>Lettura</strong></span>.</p></li></ul>
 <p role="presentation">Si aprirà la finestra <span class="guilabel"><strong>Configura le categorie</strong></span>. Essa mostra le categorie di posta in arrivo disponibili. Fare clic su <span class="guibutton"><strong>Abilita le categorie</strong></span>.</p>
-<p role="presentation">Sul lato destro, sotto la barra dei menu, sarà visualizzata la barra delle schede.</p>
+<p role="presentation">Sotto la barra dei menu, sarà visualizzata la barra delle categorie della posta in arrivo.</p>
 </li>
 <li class="step">
 <p role="presentation">Per disabilitare le categorie di posta in arrivo, fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.deactivate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Categorie di posta in arrivo</strong></span>.</p>
@@ -68,7 +68,7 @@
 <p role="presentation">I messaggi di posta che non sono ancora stati assegnati a una categoria di posta in arrivo sono visualizzati nella scheda <span class="guibutton"><strong>Generale</strong></span>.</p>
 </li>
 <li class="step">
-<p role="presentation">Trascinare un messaggio di posta dalla vista Elenco a una scheda nella barra delle schede e rilasciarlo in quella posizione.</p>
+<p role="presentation">Trascinare un messaggio di posta dalla vista Elenco a una categoria nella barra delle categorie della posta elettronica e rilasciarlo in quella posizione.</p>
 <p role="presentation">È possibile inoltre selezionare un messaggio di posta. Fare clic sull'icona <span class="guibutton"><strong>Imposta categoria</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span> nella barra degli strumenti. Selezionare una scheda dal menu.</p>
 </li>
 <li class="step"><p role="presentation">Per completare il processo, scegliere una tra le seguenti opzioni: <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -82,14 +82,14 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Categorie di posta in arrivo</strong></span>.</p>
-<p role="presentation">È possibile fare clic anche sull'icona <span class="guibutton"><strong>Configura categorie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> nella barra delle categorie.</p>
+<p role="presentation">È possibile fare clic anche sull'icona <span class="guibutton"><strong>Configura le categorie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> nella barra delle categorie della posta in arrivo.</p>
 <p role="presentation">Si aprirà la finestra <span class="guilabel"><strong>Configura le categorie</strong></span>.</p>
 </li>
 <li class="step">
 <p role="presentation">Per abilitare o disabilitare una categoria della posta in arrivo, abilitare o disabilitare la rispettiva casella di selezione.</p>
 <p role="presentation">Per rinominare una categoria di posta in arrivo, modificare il relativo testo.</p>
 <p role="presentation">Nota: alcune categorie non possono essere modificate.</p>
-<p role="presentation">Per nascondere la barra delle categorie, fare clic su <span class="guibutton"><strong>Disabilita le categorie</strong></span>.</p>
+<p role="presentation">Per nascondere la barra delle categorie della posta in arrivo, fare clic su <span class="guibutton"><strong>Disabilita le categorie</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">Fare clic su <span class="guibutton"><strong>Salva</strong></span>.</p></li>
 </ol></div>
@@ -98,14 +98,11 @@
 <p class="title">Interfaccia utente:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">Il menu delle impostazioni di <span class="phrase">Posta elettronica</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra delle schede di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">La barra delle categorie della posta in arrivo</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualizzare i messaggio di posta</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.inboxcategories">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.label.html
index de48e5860..461e3dd33 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.label.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.label.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestire i messaggi di posta">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Collezionare indirizzi">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="Utilizzare PGP in linea in modo predefinito per i nuovi messaggi">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.source.html" title="Mostrare il sorgente di un messaggio di posta">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.categories.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.source.html">Avanti</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.label">
 <div class="titlepage"><div><div><h3 class="title">Categorizzare i messaggi di posta</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.label">In base alla configurazione, è possibile utilizzare una delle seguenti opzioni per classificare i messaggi di posta: </p>
+<a class="indexterm" name="id-1.7.15.12.2"></a><a class="indexterm" name="id-1.7.15.12.3"></a><p id="ox.appsuite.user.concept.email.manage.label">In base alla configurazione, è possibile utilizzare una delle seguenti opzioni per classificare i messaggi di posta: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">un'etichetta colorata</p></li>
 <li class="listitem"><p role="presentation">un contrassegno</p></li>
@@ -69,7 +69,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.label"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.mark.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.mark.html
index a16961947..8dca86b21 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.mark.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.mark.html
@@ -62,7 +62,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.mark"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualizzare i messaggio di posta</a></p></li></ul>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.movecopy.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.movecopy.html
index 222379a1d..1b94184b3 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.movecopy.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.movecopy.html
@@ -67,7 +67,11 @@
 </ul>
 <p id="ox.appsuite.user.related.email.manage.movecopy"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.pdfexport.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.pdfexport.html
index 752ea0387..ea74ecb52 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.pdfexport.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.pdfexport.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.pdfexport">
 <div class="titlepage"><div><div><h3 class="title">Esportare messaggi di posta come PDF</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.17.2"></a><a class="indexterm" name="id-1.7.15.17.3"></a><a class="indexterm" name="id-1.7.15.17.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Nota: in base alla configurazione, questa funzione potrebbe non essere disponibile.</p>
+<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><a class="indexterm" name="id-1.7.15.18.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Nota: in base alla configurazione, questa funzione potrebbe non essere disponibile.</p>
 <p id="ox.appsuite.user.concept.email.manage.pdfexport">È possibile esportare un messaggio di posta e i suoi allegati in formato docx come PDF. Non appena il file PDF è stato creato, sarà salvato in una cartella di <span class="phrase">File</span> che può essere definita dall'utente. In base al volume di dati, lo scaricamento può richiedere del tempo. Non appena il processo sarà terminato, si riceverà una notifica.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.pdfexport">
 <p class="title">Come esportare i messaggi di posta come PDF:</p>
@@ -54,7 +54,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.pdfexport"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Salvare i messaggi di posta</a></p></li></ul>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.print.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.print.html
index 0b5dad58b..4496ca2a7 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.print.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Stampare i messaggi di posta</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.print">È possibile stampare il contenuto di un messaggio o di più messaggi.</p>
+<a class="indexterm" name="id-1.7.15.20.2"></a><a class="indexterm" name="id-1.7.15.20.3"></a><p id="ox.appsuite.user.concept.email.manage.print">È possibile stampare il contenuto di un messaggio o di più messaggi.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.print">
 <p class="title">Come stampare il contenuto di un messaggio di posta:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -56,7 +56,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.print"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archiviare i messaggi di posta</a></p></li></ul>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.recover.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.recover.html
new file mode 100644
index 000000000..4285ce541
--- /dev/null
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.recover.html
@@ -0,0 +1,97 @@
+<html lang="it">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Ripristinare i messaggi di posta</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuale utente">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestire i messaggi di posta">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Eliminare i messaggi di posta">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Eliminare i messaggi di posta">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Indietro</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Avanti</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Posta elettronica</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestire i messaggi di posta</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.recover">
+<div class="titlepage"><div><div><h3 class="title">Ripristinare i messaggi di posta</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.recover">Esistono le seguenti opzioni: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Ripristinare singoli messaggi dal cestino.</p></li>
+<li class="listitem"><p role="presentation">Ripristinare tutti i messaggi dal cestino.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.single">
+<p class="title">Come recuperare singoli messaggi dal cestino:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Aprire la cartella <span class="guibutton"><strong>Cestino</strong></span> nella vista delle cartelle.</p></li>
+<li class="step">
+<p role="presentation">Selezionare uno o più messaggi di posta elettronica.</p>
+<p role="presentation">Nel menu contestuale di un messaggio di posta, fare clic su <span class="guibutton"><strong>Sposta</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Selezionare una cartella nella finestra <span class="guilabel"><strong>Sposta</strong></span>. Fare clic su <span class="guibutton"><strong>Sposta</strong></span>.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>O: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Utilizzare il trascinamento e rilascio per spostare i messaggi dal cestino a una cartella nella vista delle cartelle.</p></li>
+<li class="listitem"><p role="presentation">Se si è selezionato un singolo messaggio, utilizzare l'icona <span class="guibutton"><strong>Altre azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.single.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> nella vista dettagliata. Fare clic su <span class="guibutton"><strong>Sposta</strong></span>.</p></li>
+</ul>
+        </div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.all">
+<p class="title">Come ripristinare tutti i messaggi eliminati dal cestino.</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selezionare la cartella <span class="guibutton"><strong>Cestino</strong></span> nella vista delle cartelle.</p></li>
+<li class="step">
+<p role="presentation">Utilizzare uno dei seguenti metodi: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Altre azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> accanto a <span class="guibutton"><strong>Cestino</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Altre azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> sopra l'elenco.</p></li>
+</ul></p>
+<p role="presentation">Fare clic sul pulsante <span class="guibutton"><strong>Sposta tutti i messaggi</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Selezionare una cartella nella finestra <span class="guilabel"><strong>Sposta</strong></span>. Fare clic su <span class="guibutton"><strong>Sposta tutti</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.recover"></p>
+<p class="title">Interfaccia utente:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">Argomenti correlati:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Eliminare i messaggi di posta</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Eliminare i messaggi di posta</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.23.7.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Ripristinare definitivamente i messaggi di posta eliminati</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Pulire le cartelle di posta</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.recover">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.reminder.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.reminder.html
index a9f44102f..ce5a5ae93 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.reminder.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.reminder.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.reminder">
 <div class="titlepage"><div><div><h3 class="title">Creare promemoria dei messaggi di posta</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">È possibile attivare un promemoria per un messaggio di posta. Questa funzione crea un'attività e ricorda la data di scadenza.</p>
+<a class="indexterm" name="id-1.7.15.15.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">È possibile attivare un promemoria per un messaggio di posta. Questa funzione crea un'attività e ricorda la data di scadenza.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.email.manage.reminder">
 <p class="title">Come creare un promemoria di un messaggio di posta:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.reminder"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Creare nuove attività</a></p></li></ul>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.save.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.save.html
index 545173336..8b1a69d43 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.save.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.save.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.save">
 <div class="titlepage"><div><div><h3 class="title">Salvare i messaggi di posta</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.16.2"></a><p id="ox.appsuite.user.concept.email.manage.save">È possibile salvare un messaggio di posta come un file di testo. Il file di testo ha estensione EML. Se si selezionano più messaggi, un file eml sarà creato per ogni messaggio. Il file eml sarà poi salvato come archivio zip.</p>
+<a class="indexterm" name="id-1.7.15.17.2"></a><p id="ox.appsuite.user.concept.email.manage.save">È possibile salvare un messaggio di posta come un file di testo. Il file di testo ha estensione EML. Se si selezionano più messaggi, un file eml sarà creato per ogni messaggio. Il file eml sarà poi salvato come archivio zip.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.save">
 <p class="title">Come salvare un messaggio di posta:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.save"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -57,7 +60,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importare i messaggi di posta</a></p>
 <p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Esportare messaggi di posta come PDF</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.7.15.16.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Scaricare i dati personali</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.7.15.17.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Scaricare i dati personali</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.save">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.source.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.source.html
index 098154caf..1a0bf17e1 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.source.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.source.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.source">
 <div class="titlepage"><div><div><h3 class="title">Mostrare il sorgente di un messaggio di posta</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.12.2"></a><p id="ox.appsuite.user.concept.email.manage.source">Il sorgente del messaggio contiene l'intero contenuto di un messaggio di posta, cioè i dati completi dell'intestazione del messaggio stesso.</p>
+<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.source">Il sorgente del messaggio contiene l'intero contenuto di un messaggio di posta, cioè i dati completi dell'intestazione del messaggio stesso.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.source">
 <p class="title">Come visualizzare il sorgente di un messaggio:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.source"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.undelete.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.undelete.html
new file mode 100644
index 000000000..372b64d7a
--- /dev/null
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.undelete.html
@@ -0,0 +1,75 @@
+<html lang="it">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Ripristinare definitivamente i messaggi di posta eliminati</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuale utente">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Gestire i messaggi di posta">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Eliminare i messaggi di posta">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Pulire le cartelle di posta">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Indietro</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Avanti</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Posta elettronica</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestire i messaggi di posta</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.undelete">
+<div class="titlepage"><div><div><h3 class="title">Ripristinare definitivamente i messaggi di posta eliminati</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.25.2"></a><a class="indexterm" name="id-1.7.15.25.3"></a><p id="ox.appsuite.user.concept.email.manage.undelete.html">È possibile recuperare i messaggi di posta eliminati definitivamente entro 14 giorni. Trascorso questo periodo, i messaggi eliminati in modo permanente saranno persi irrevocabilmente.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
+<p class="title">Come ripristinare i messaggi di posta eliminati definitivamente:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selezionare la cartella <span class="guibutton"><strong>Cestino</strong></span> nella vista delle cartelle.</p></li>
+<li class="step">
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Altre azioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> accanto a <span class="guibutton"><strong>Cestino</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="guibutton"><strong>Recupera elementi eliminati</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Selezionare i messaggi di posta da recuperare nella finestra <span class="guilabel"><strong>Recupera elementi eliminati</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="guibutton"><strong>Sposta gli elementi selezionati</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Nella finestra <span class="guilabel"><strong>Sposta</strong></span>, specifica la cartella che dovrebbe contenere i messaggi recuperati.</p>
+<p role="presentation">Fare clic su <span class="guibutton"><strong>Sposta</strong></span>.</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.undelete"></p>
+<p class="title">Interfaccia utente:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Posta elettronica</span></a></p></li></ul>
+<p> </p>
+<p class="title">Argomenti correlati:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Eliminare i messaggi di posta</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Ripristinare i messaggi di posta</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Eliminare i messaggi di posta</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Pulire le cartelle di posta</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.undelete">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Gestire i messaggi di posta</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.unifiedmail.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.unifiedmail.html
index df73fd36f..e99008248 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.unifiedmail.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.manage.unifiedmail.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire i messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.unifiedmail">
 <div class="titlepage"><div><div><h3 class="title">Utilizzare la posta unificata</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">Con Posta unificata è possibile visualizzare i messaggi di più account di posta in una singola cartella. Ciò fornisce una panoramica rapida della posta in arrivo di più account. La posta unificata può essere descritta come segue: </p>
+<a class="indexterm" name="id-1.7.15.27.2"></a><a class="indexterm" name="id-1.7.15.27.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">Con Posta unificata è possibile visualizzare i messaggi di più account di posta in una singola cartella. Ciò fornisce una panoramica rapida della posta in arrivo di più account. La posta unificata può essere descritta come segue: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">In aggiunta alla posta in arrivo di un account di posta, la cartella <span class="guibutton"><strong>Posta unificata</strong></span> fornisce una vista ulteriore dei messaggi di un account. I messaggi, in effetti, sono presenti solo una volta.</p></li>
 <li class="listitem"><p role="presentation">I messaggi nelle sottocartelle della posta in arrivo non sono visualizzati nella cartella <span class="guibutton"><strong>Posta unificata</strong></span>.</p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.openai.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.openai.html
index 91fba39a9..76c31352c 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.openai.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.openai.html
@@ -37,12 +37,12 @@
   </h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.openai">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Utilizzare l'integrazione AI</h2></div></div></div>
-<a class="indexterm" name="id-1.7.12.2"></a><a class="indexterm" name="id-1.7.12.3"></a><p id="ox.appsuite.user.orientation.email.openai">Scoprire come utilizzare l'integrazione AI per modificare i contenuti dei messaggi di posta:le</p>
+<a class="indexterm" name="id-1.7.12.2"></a><a class="indexterm" name="id-1.7.12.3"></a><p id="ox.appsuite.user.orientation.email.openai">Scoprire come utilizzare l'integrazione AI per modificare i contenuti dei messaggi di posta: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">modificare il contenuto dei messaggi esistenti o creare suggerimenti del testo per rispondere a essi</p></li>
-<li class="listitem"><p role="presentation">creare suggerimenti del testo per inviare nuovi messaggi</p></li>
+<li class="listitem"><p role="presentation">modificare il contenuto di messaggi esistenti o creare suggerimenti del testo per rispondere a essi</p></li>
+<li class="listitem"><p role="presentation">ottenere suggerimenti di testo per inviare nuovi messaggi</p></li>
 </ul>
-<p> Nota: quando si utilizza l'integrazione AI, il contenuto del messaggio di posta relativo sarà inviato al servizio Microsoft Azure OpenAI </p>
+<p> Nota: quando si utilizza l'integrazione AI, il contenuto del messaggio di posta relativo sarà inviato a un servizio OpenAI. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">La prima volta che si utilizza una funzione AI, si apre una finestra in cui è possibile accettare di inviare questi dati. È possibile utilizzare le funzioni AI solo dopo aver acconsentito all'invio dei dati.</p></li>
 <li class="listitem"><p role="presentation">È possibile modificare il proprio consenso all'invio dei dati in qualsiasi momento. Per farlo, fare clic su <span class="guibutton"><strong>Modifica consenso</strong></span> sotto <span class="guibutton"><strong>Integrazione AI</strong></span> nelle impostazioni di posta elettronica.</p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.openai.send.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.openai.send.html
index e5a15d3d5..4dea60f61 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.openai.send.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.openai.send.html
@@ -64,7 +64,7 @@
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Utilizzo delle funzioni AI durante la risposta ai messaggi di posta</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.email.openai.send">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Utilizzare l'integrazione AI</a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.search.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.search.html
index 56c2cc5d5..f20879692 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.search.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.search.html
@@ -101,9 +101,14 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualizzare i messaggio di posta</a>
           </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Categorizzare i messaggi di posta</a>
-          </p></li>
+          </p>
+<p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Utilizzare PGP in linea in modo predefinito per i nuovi messaggi</a>
+          </p>
+</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attachmentexisting.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attachmentexisting.html
index 1744b5022..0ab146a9f 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attachmentexisting.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attachmentexisting.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="Aggiungere allegati">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Inviare allegati come collegamenti">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="aggiungere allegati">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="inviare allegati come collegamenti">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Inviare messaggi di posta</h2>
+<h2 class="sr-only">inviare messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentexisting">
 <div class="titlepage"><div><div><h3 class="title">Aggiungere allegati da messaggi di posta esistenti</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.9.2"></a><a class="indexterm" name="id-1.7.11.9.3"></a><p id="ox.appsuite.user.concept.email.send.attachmentexisting">In base alla configurazione, è possibile aggiungere allegati dai messaggi esistenti a un nuovo messaggio di posta.</p>
@@ -59,14 +59,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachmentexisting"></p>
 <p class="title">Azione sovraordinata:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p></li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Aggiungere allegati</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Inviare allegati come collegamenti</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">aggiungere allegati</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">inviare allegati come collegamenti</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attachmentlink.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attachmentlink.html
index 63238beb1..f8c875c97 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attachmentlink.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attachmentlink.html
@@ -1,11 +1,11 @@
 <html lang="it">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Inviare allegati come collegamenti</title>
+<title>inviare allegati come collegamenti</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Aggiungere allegati da messaggi di posta esistenti">
 <link rel="next" href="ox.appsuite.user.sect.email.send.templates.html" title="Utilizzare i modelli">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Inviare messaggi di posta</h2>
+<h2 class="sr-only">inviare messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentlink">
-<div class="titlepage"><div><div><h3 class="title">Inviare allegati come collegamenti</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">inviare allegati come collegamenti</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.10.2"></a><p id="ox.appsuite.user.concept.email.send.attachmentlink">Questa funzione consente di inviare allegati grandi tramite posta elettronica. Ecco come funziona: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Gli allegati sono caricati in una nuova cartella sotto <span class="guibutton"><strong>Drive Mail</strong></span> nell'applicazione <span class="phrase">File</span> Il nome di questa cartella corrisponde all'oggetto del messaggio. La cartella è condivisa con un collegamento pubblico.</p></li>
@@ -89,14 +89,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.attachmentlink"></p>
 <p class="title">Azione sovraordinata:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p></li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Aggiungere allegati</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">aggiungere allegati</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Aggiungere allegati da messaggi di posta esistenti</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachmentlink">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachmentlink">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attachments.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attachments.html
index 129461df7..9d3916ba1 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attachments.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attachments.html
@@ -1,11 +1,11 @@
 <html lang="it">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Aggiungere allegati</title>
+<title>aggiungere allegati</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.replyto.html" title="Impostare l'indirizzo di risposta">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Aggiungere allegati da messaggi di posta esistenti">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Inviare messaggi di posta</h2>
+<h2 class="sr-only">inviare messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachments">
-<div class="titlepage"><div><div><h3 class="title">Aggiungere allegati</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">aggiungere allegati</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.8.2"></a><a class="indexterm" name="id-1.7.11.8.3"></a><p id="ox.appsuite.user.concept.emal.add.attachments">In base alla configurazione, è possibile allegare file salvati sul proprio computer o nella applicazione <span class="phrase">File</span>.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.attachments">
 <p class="title">Come aggiungere allegati nella finestra di modifica di messaggi di posta:</p>
@@ -62,14 +62,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachments"></p>
 <p class="title">Azione sovraordinata:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p></li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Aggiungere allegati da messaggi di posta esistenti</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Inviare allegati come collegamenti</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">inviare allegati come collegamenti</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachments">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachments">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attendees.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attendees.html
index a0ff0f437..52da9624f 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attendees.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Inoltrare automaticamente i messaggi di posta">
 <link rel="next" href="ox.appsuite.user.sect.email.send.vacationnotice.html" title="Inviare automaticamente un avviso di assenza">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Inviare messaggi di posta</h2>
+<h2 class="sr-only">inviare messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attendees">
 <div class="titlepage"><div><div><h3 class="title">Inviare un messaggio di posta ai partecipanti a un appuntamento</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.16.2"></a><div class="task" id="ox.appsuite.user.task.email.send.attendees">
@@ -51,25 +51,16 @@
 <li class="step"><p role="presentation">Completare i dettagli per inviare il messaggio di posta.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.send.attendees">
-        </p>
+<p id="ox.appsuite.user.related.email.send.attendees"></p>
+<p class="title">Interfaccia utente:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Calendario</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">Argomenti correlati:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">La finestra a comparsa di <span class="phrase">Calendario</span></a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Calendario</span></a>
-            </p>
-</li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a>
-            </p></li>
-</ul>
-<p>
-      </p>
-<p id="ox.appsuite.user.parent.email.send.attendees">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p></li></ul>
+<p id="ox.appsuite.user.parent.email.send.attendees">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.autoforward.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.autoforward.html
index 7448be377..a86a7a5f1 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.autoforward.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.autoforward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.forward.html" title="Inoltrare messaggi di posta">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attendees.html" title="Inviare un messaggio di posta ai partecipanti a un appuntamento">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Inviare messaggi di posta</h2>
+<h2 class="sr-only">inviare messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.autoforward">
 <div class="titlepage"><div><div><h3 class="title">Inoltrare automaticamente i messaggi di posta</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.15.2"></a><p id="ox.appsuite.user.concept.email.send.autoforward">È possibile fare in modo che i messaggi siano inoltrati automaticamente a un altro indirizzo.</p>
@@ -67,7 +67,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a>
+              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Rispondere ai messaggi di posta</a>
@@ -90,7 +90,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.email.send.autoforward">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p id="ox.appsuite.user.parent.email.send.autoforward">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.forward.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.forward.html
index 412d163d2..14d078281 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.forward.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.forward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.reply.html" title="Rispondere ai messaggi di posta">
 <link rel="next" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Inoltrare automaticamente i messaggi di posta">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Inviare messaggi di posta</h2>
+<h2 class="sr-only">inviare messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.forward">
 <div class="titlepage"><div><div><h3 class="title">Inoltrare messaggi di posta</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.14.2"></a><p id="ox.appsuite.user.concept.email.send.forward">Se si inoltra un messaggio di posta, alcuni dei campi di inserimento del messaggio sono pre-compilati:</p>
@@ -74,11 +74,11 @@
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Rispondere ai messaggi di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Inoltrare automaticamente i messaggi di posta</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.forward">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p id="ox.appsuite.user.parent.email.send.forward">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.html
index 403ba6306..ec7c7dcba 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.html
@@ -1,13 +1,13 @@
 <html lang="it">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Inviare messaggi di posta</title>
+<title>inviare messaggi di posta</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="Posta elettronica">
 <link rel="prev" href="ox.appsuite.user.sect.email.attachments.html" title="Visualizzare o salvare gli allegati dei messaggi di posta">
-<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Inviare un nuovo messaggio di posta">
+<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Inviare nuovi messaggi di posta">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -36,15 +36,15 @@
     
   </h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.send">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Inviare messaggi di posta</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">inviare messaggi di posta</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.email.send">Scoprire come inviare un messaggio di posta elettronica e informazioni sulle funzioni disponibili per personalizzare il contenuto dei messaggi: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selezionare un indirizzo mittente</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">selezionare un indirizzo mittente</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Impostare l'indirizzo di risposta</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Aggiungere allegati</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">aggiungere allegati</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Aggiungere allegati da messaggi di posta esistenti</a></p></li>
-<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Inviare allegati come collegamenti</a></p></li>
+<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">inviare allegati come collegamenti</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.11.2.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Utilizzare i modelli</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Utilizzare le firme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Rispondere ai messaggi di posta</a></p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.new.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.new.html
index 7263e075b..73f6607cc 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.new.html
@@ -1,13 +1,13 @@
 <html lang="it">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Inviare un nuovo messaggio di posta</title>
+<title>Inviare nuovi messaggi di posta</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
-<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="Selezionare un indirizzo mittente">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
+<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="selezionare un indirizzo mittente">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Inviare messaggi di posta</h2>
+<h2 class="sr-only">inviare messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.new">
-<div class="titlepage"><div><div><h3 class="title">Inviare un nuovo messaggio di posta</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Inviare nuovi messaggi di posta</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.5.2"></a><a class="indexterm" name="id-1.7.11.5.3"></a><a class="indexterm" name="id-1.7.11.5.4"></a><div class="task" id="ox.appsuite.user.task.email.send.new">
 <p class="title">Come inviare un nuovo messaggio di posta:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -93,37 +93,26 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">Il pulsante Nuovo messaggio</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">La finestra di modifica dei messaggi di posta</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Azioni subordinate:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Aggiungere automaticamente contatti o risorse da una rubrica</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Aggiunta automatica di contatti o risorse dall'elenco degli indirizzi</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selezionare un indirizzo mittente</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">selezionare un indirizzo mittente</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Impostare l'indirizzo di risposta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Aggiungere allegati</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">aggiungere allegati</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Aggiungere allegati da messaggi di posta esistenti</a></p>
-<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Inviare allegati come collegamenti</a></p>
+<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">inviare allegati come collegamenti</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Utilizzare i modelli</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Utilizzare le firme</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Rispondere ai messaggi di posta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Inoltrare messaggi di posta</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Inoltrare automaticamente i messaggi di posta</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Inviare un messaggio di posta ai partecipanti a un appuntamento</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Inviare automaticamente un avviso di assenza</a></p>
-<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Inviare messaggi di posta cifrati</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Inviare i contatti come vCard</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Inviare messaggi dall'interno di una rubrica</a></p>
-</li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Utilizzare le funzioni AI durante la composizione dei messaggi di posta</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Utilizzare le funzioni AI durante la composizione dei messaggi di posta</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.new">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p id="ox.appsuite.user.parent.email.send.new">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.reply.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.reply.html
index 0fb511dcb..d8bac320c 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.reply.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.reply.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.signatures.html" title="Utilizzare le firme">
 <link rel="next" href="ox.appsuite.user.sect.email.send.forward.html" title="Inoltrare messaggi di posta">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Inviare messaggi di posta</h2>
+<h2 class="sr-only">inviare messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.reply">
 <div class="titlepage"><div><div><h3 class="title">Rispondere ai messaggi di posta</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.13.2"></a><p id="ox.appsuite.user.concept.email.send.reply">Quando si risponde a un messaggio di posta, alcuni dei campi di inserimento sono pre-compilati: </p>
@@ -70,13 +70,13 @@
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Inoltrare messaggi di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Inviare automaticamente un avviso di assenza</a></p>
 </li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.11.13.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Utilizzo delle funzioni AI durante la risposta ai messaggi di posta</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.reply">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p id="ox.appsuite.user.parent.email.send.reply">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.replyto.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.replyto.html
index 74c57ef92..86b17b16b 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.replyto.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.replyto.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="Selezionare un indirizzo mittente">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="Aggiungere allegati">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="selezionare un indirizzo mittente">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="aggiungere allegati">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Inviare messaggi di posta</h2>
+<h2 class="sr-only">inviare messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.replyto">
 <div class="titlepage"><div><div><h3 class="title">Impostare l'indirizzo di risposta</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.7.2"></a><p id="ox.appsuite.user.concept.email.send.replyto">In modo predefinito, quando un destinatario risponde ai propri messaggi di posta elettronica, la risposta viene inviata all'account di posta da cui hai inviato il messaggio. In alternativa, è possibile utilizzare la finestra di modifica dei messaggi per specificare gli indirizzi ai quali sarà inviata la risposta al messaggio inviato.</p>
@@ -43,8 +43,8 @@
 <p class="title">Come selezionare un indirizzo di risposta nella finestra di modifica del messaggio di posta elettronica:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Nella finestra di modifica del messaggio di posta, fare clic su <span class="guibutton"><strong>RE</strong></span> accanto all'indirizzo del mittente. Sarà visualizzato il campo di inserimento <span class="guibutton"><strong>Rispondi a</strong></span>.</p>
-<p role="presentation">Se sono stati specificati gli indirizzi di risposta predefiniti durante la modifica del proprio account di posta principale, il campo di inserimento <span class="guibutton"><strong>Rispondi a</strong></span> sarà visualizzato automaticamente. Il campo di inserimento include gli indirizzi di risposta preimpostati.</p>
+<p role="presentation">Nella finestra di modifica del messaggio di posta, fare clic su <span class="guibutton"><strong>Re</strong></span> accanto all'indirizzo del mittente. Sarà visualizzato il campo di inserimento <span class="guibutton"><strong>Rispondi a</strong></span>.</p>
+<p role="presentation">Se sono stati specificati gli indirizzi di risposta preimpostati durante la modifica del proprio account di posta principale, il campo di inserimento <span class="guibutton"><strong>Rispondi a</strong></span> sarà visualizzato automaticamente. Il campo di inserimento include gli indirizzi di risposta preimpostati.</p>
 </li>
 <li class="step">
 <p role="presentation">In <span class="guibutton"><strong>Rispondi a</strong></span>, digitare gli indirizzi di posta ai quali si desidera che la risposta al proprio messaggio sia inviata. <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -57,11 +57,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.replyto"></p>
 <p class="title">Azione sovraordinata:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p></li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">Modificare l'account di posta principale</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.replyto">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p id="ox.appsuite.user.parent.email.send.replyto">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.sender.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.sender.html
index 5accb6aa9..546425ad0 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.sender.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.sender.html
@@ -1,12 +1,12 @@
 <html lang="it">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Selezionare un indirizzo mittente</title>
+<title>selezionare un indirizzo mittente</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Inviare un nuovo messaggio di posta">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Inviare nuovi messaggi di posta">
 <link rel="next" href="ox.appsuite.user.sect.email.send.replyto.html" title="Impostare l'indirizzo di risposta">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">Inviare messaggi di posta</h2>
+<h2 class="sr-only">inviare messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.sender">
-<div class="titlepage"><div><div><h3 class="title">Selezionare un indirizzo mittente</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">selezionare un indirizzo mittente</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.6.2"></a><p id="ox.appsuite.user.concept.email.send.sender">Se si invia un messaggio di posta, è possibile impostare l'indirizzo mittente da mostrare al destinatario, nella finestra di modifica dei messaggi.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.sender">
 <p class="title">Come selezionare il proprio indirizzo mittente nella finestra di modifica dei messaggi:</p>
@@ -59,11 +59,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.sender"></p>
 <p class="title">Azione sovraordinata:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p></li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Aggiungere account di posta elettronica</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.sender">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p id="ox.appsuite.user.parent.email.send.sender">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.signatures.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.signatures.html
index fca6395e7..52cb503ba 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.signatures.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.signatures.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.templates.html" title="Utilizzare i modelli">
 <link rel="next" href="ox.appsuite.user.sect.email.send.reply.html" title="Rispondere ai messaggi di posta">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Inviare messaggi di posta</h2>
+<h2 class="sr-only">inviare messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.signatures">
 <div class="titlepage"><div><div><h3 class="title">Utilizzare le firme</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.12.2"></a><a class="indexterm" name="id-1.7.11.12.3"></a><p id="ox.appsuite.user.concept.email.send.signatures">La firma di un messaggio di posta è il testo che viene inserito automaticamente nel messaggio quando viene composto. È usato di solito per l'inserimento del nome, della società e dell'indirizzo di contatto in fondo al testo del messaggio. È possibile creare firme in testo semplice o in formato html. Le seguenti funzioni sono disponibili: </p>
@@ -91,7 +91,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.signatures"></p>
 <p class="title">Azione sovraordinata:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p></li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -99,7 +99,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Aggiungere account di posta elettronica</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Utilizzare i modelli</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.signatures">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p id="ox.appsuite.user.parent.email.send.signatures">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.templates.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.templates.html
index 4fb279ea0..cba15e2ff 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.templates.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.templates.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Inviare allegati come collegamenti">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="inviare allegati come collegamenti">
 <link rel="next" href="ox.appsuite.user.sect.email.send.signatures.html" title="Utilizzare le firme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Inviare messaggi di posta</h2>
+<h2 class="sr-only">inviare messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.templates">
 <div class="titlepage"><div><div><h3 class="title">Utilizzare i modelli</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.11.2"></a><a class="indexterm" name="id-1.7.11.11.3"></a><p id="ox.appsuite.user.concept.email.send.templates">I modelli sono moduli di testo che è possibile scrivere una volta e poi inserire nei propri messaggi tutte le volte che si desidera. Di conseguenza, è necessario scrivere solo una volta le frasi usate di frequente. Modelli, firme e bozze di messaggi differiscono nei seguenti modi: </p>
@@ -88,7 +88,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.templates"></p>
 <p class="title">Azione sovraordinata:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p></li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -96,7 +96,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Utilizzare le firme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Utilizzare le bozze dei messaggi</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.templates">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p id="ox.appsuite.user.parent.email.send.templates">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.vacationnotice.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.vacationnotice.html
index 9bf27cb04..57e5fbc00 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.send.vacationnotice.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.send.vacationnotice.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Inviare messaggi di posta">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="inviare messaggi di posta">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attendees.html" title="Inviare un messaggio di posta ai partecipanti a un appuntamento">
 <link rel="next" href="ox.appsuite.user.sect.email.openai.html" title="Utilizzare l'integrazione AI">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">Inviare messaggi di posta</h2>
+<h2 class="sr-only">inviare messaggi di posta</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.vacationnotice">
 <div class="titlepage"><div><div><h3 class="title">Inviare automaticamente un avviso di assenza</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.17.2"></a><a class="indexterm" name="id-1.7.11.17.3"></a><p id="ox.appsuite.user.concept.email.send.vacationnotice">Un avviso di assenza informa il mittente di un messaggio di posta che non si dispone dell'accesso alla propria casella di posta per un determinato periodo di tempo. È possibile impostare ciò che segue: </p>
@@ -81,14 +81,14 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Rispondere ai messaggi di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Inoltrare messaggi di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Inoltrare automaticamente i messaggi di posta</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">Utilizzare i filtri di posta elettronica</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.vacationnotice">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Inviare messaggi di posta</a></p>
+<p id="ox.appsuite.user.parent.email.send.vacationnotice">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.email.send.html">inviare messaggi di posta</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.settings.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.settings.html
index b842c343a..77f674e89 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.settings.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.settings.html
@@ -55,8 +55,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.composereply">Comporre e rispondere</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.20.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">Modelli</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.rules">Regole</a></p></li>
-<li class="listitem feat-zoom" id="id-1.7.20.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">Integrazione AI</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.7.20.5.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Impostazioni avanzate</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">Integrazione AI</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Impostazioni avanzate</a></p></li>
 </ul>
 <p>Vedere anche: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Ricerca delle impostazioni</a></p>
 <p id="ox.appsuite.user.reference.email.settings.reading"></p>
@@ -64,31 +64,32 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>disposizione. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Definisce la disposizione della vista Elenco e della vista dettagliata nell'area di visualizzazione.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>Disposizione. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Definisce la disposizione della vista Elenco e della vista dettagliata nell'area di visualizzazione.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>elenco dei messaggi. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a>
+<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>Elenco dei messaggi. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.list"><b>Immagini dei contatti, caselle di controllo, semplici. </b>Definisce se le immagini dei contatti, le caselle di controllo o nessuno di questi elementi saranno visualizzati nella vista Elenco.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.preview"><b>Mostra l'anteprima del testo. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.2.1.2"></a>Definisce se le prime parole del contenuto del messaggio saranno visualizzate nella vista Elenco dei messaggi.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Mostra sempre la data completa e l'ora. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Definisce se non solo la data di ricezione, ma anche l'ora di ricezione sarà visualizzata nella vista Elenco dei messaggi.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Mostrare la dimensione del messaggio. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Definisce se la dimensione di un messaggio sarà visualizzata nella vista Elenco dei messaggi.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.20.6.2.1.2.1.3.1.3"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>Mostrare le categorie. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Definisce se le categorie assegnate al messaggio saranno visualizzate nella vista Elenco dei messaggi di posta.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Mostra sempre la data completa e l'ora. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Definisce se non solo la data di ricezione, ma anche l'ora di ricezione sarà visualizzata nella vista Elenco dei messaggi.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Mostrare la dimensione del messaggio. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.5.1.2"></a>Definisce se la dimensione di un messaggio sarà visualizzata nella vista Elenco dei messaggi.</p></li>
 </ul>
 <p>
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>pannello di lettura. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a>
+<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>Pannello di lettura. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>mostrare il testo citato in un colore diverso. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Specifica se i messaggi originali saranno evidenziati e preceduti da una linea verticale. Questa opzione presuppone che il testo del messaggio originale non sia allegato, ma aggiunto al messaggio di posta.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>Mostra il testo citato in un colore diverso. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Specifica se i messaggi originali saranno evidenziati e preceduti da una linea verticale. Questa opzione presuppone che il testo del messaggio originale non sia allegato, ma aggiunto al messaggio di posta.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.fixedfont"><b>Usa un carattere a larghezza fissa per i messaggi in testo semplice. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.2.1.2"></a>Specifica se deve essere utilizzato un carattere a larghezza fissa quando si compone un messaggio di testo semplice.</p></li>
 </ul>
 <p>
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>marcare come letto. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Definisce il periodo dopo il quale un messaggio di posta sarà automaticamente contrassegnato come letto quando si seleziona il messaggio. </p>
+<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>Marcare come letto. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Definisce il periodo dopo il quale un messaggio di posta sarà automaticamente contrassegnato come letto quando si seleziona il messaggio. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.immediately"><b>Immediatamente. </b>Il messaggio sarà immediatamente contrassegnato come letto.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.seconds"><b>Dopo 5 secondi, dopo 20 secondi. </b>Il messaggio di posta sarà contrassegnato come letto dopo il periodo definito.</p></li>
@@ -126,7 +127,7 @@
 <p role="presentation">Nota: il nome del mittente è visualizzato davanti all'indirizzo di posta. Se si digita un nome nel campo di inserimento <span class="guibutton"><strong>Il tuo nome</strong></span> delle Impostazioni account, questo nome sovrascrive il nome preimpostato del mittente.</p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>formato del messaggio. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Specifica la formattazione dei nuovi messaggi di posta: </p>
+<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>Formato del messaggio. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Specifica la formattazione dei nuovi messaggi di posta: </p>
 <ul class="itemizedlist" style="list-style-type: square; ">
 <li class="listitem"><p><b>HTML. </b>Il messaggio sarà inviato con i contrassegni HTML. Sarà possibile formattare il testo del messaggio.</p></li>
 <li class="listitem"><p><b>Testo semplice. </b>Il testo del messaggio sarà inviato come testo semplice senza formattazione.</p></li>
@@ -173,10 +174,10 @@
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.html"><b>Consenti la visualizzazione dei messaggi in formato HTML. </b><a class="indexterm" name="id-1.7.20.12.2.1.1.1.2"></a>Specifica se consentire o meno la visualizzazione dei messaggi di posta HTML.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>mostrare le richieste di conferma di lettura. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Specifica se una conferma di lettura viene visualizzata se un messaggio ricevuto include la richiesta di conferma di ricezione.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>Mostrare le richieste di conferma di lettura. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Specifica se una conferma di lettura viene visualizzata se un messaggio ricevuto include la richiesta di conferma di ricezione.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>rimuovere definitivamente i messaggi di posta eliminati. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Definisce se i messaggi di posta eliminati saranno rimossi definitivamente o se saranno cestinati.</p>
-<p role="presentation"><span class="phrase"><strong>Avviso:</strong></span> i messaggi di posta rimossi definitivamente non possono essere ripristinati.</p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>Rimuovere definitivamente i messaggi di posta eliminati. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Definisce se i messaggi di posta eliminati saranno rimossi definitivamente o se saranno cestinati.</p>
+<p role="presentation"><span class="phrase"><strong>Avviso:</strong></span> in base alla configurazione, i messaggi eliminati definitivamente <span class="bold">non</span> possono essere recuperati.</p>
 <p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Eliminare i messaggi di posta</a></p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.selectrecent"><b>Seleziona automaticamente il messaggio letto più recente all'avvio. </b><a class="indexterm" name="id-1.7.20.12.2.1.4.1.2"></a>Definisce se il messaggio letto più recente sarà selezionato automaticamente all'avvio dell'applicazione.</p></li>
@@ -187,7 +188,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.mailinglist"><b>Chiedi prima di rispondere a una lista di distribuzione. </b><a class="indexterm" name="id-1.7.20.12.2.1.9.1.2"></a>Specifica se è necessario confermare il destinatario quando si risponde a un elenco di distribuzione.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.appendvcard"><b>Allega sempre i miei dati di contatto dettagliati come vCard. </b><a class="indexterm" name="id-1.7.20.12.2.1.10.1.2"></a>Specifica se i dati del proprio contatto devono essere allegati a un nuovo messaggio di posta nel formato vCard.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>inoltrare messaggi di posta come. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Specifica come deve essere inviato il testo di un messaggio di posta quando si inoltra. </p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>Inoltrare i messaggi come. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Specifica come deve essere inviato il testo di un messaggio di posta quando si inoltra. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p><b>In linea. </b>Il testo è inviato all'interno del testo del nuovo messaggio.</p></li>
 <li class="listitem"><p><b>Allegato. </b>Il testo è inviato come allegato del nuovo messaggio di posta elettronica.</p></li>
@@ -204,7 +205,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
@@ -224,7 +225,7 @@
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Impostazioni di posta elettronica</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">Visualizzare i messaggio di posta</a>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.email.view.html b/help/l10n/it_IT/ox.appsuite.user.sect.email.view.html
index f83d7bb17..7c2289a45 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.email.view.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.email.view.html
@@ -82,11 +82,10 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">La vista Elenco di <span class="phrase">Posta elettronica</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">La vista dettagliata di <span class="phrase">Posta elettronica</span></a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Lavorare con le categorie di posta in arrivo</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Visualizzare o salvare gli allegati dei messaggi di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Mostrare il sorgente di un messaggio di posta</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marcare i messaggi di posta come letti o non letti</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.firststeps.gui.notificationarea.html b/help/l10n/it_IT/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
index 45f0913b2..693f36178 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
@@ -83,7 +83,7 @@
               <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Modificare le impostazioni generali</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Utilizzare l'area di notifica</a>
+              <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">utilizzare l'area di notifica</a>
             </p>
 <p role="presentation" class="cap-calendar">
               <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Rispondere agli inviti di appuntamenti</a>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.createencrypted.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.createencrypted.html
index 4035eecf8..4b3d4dafc 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.createencrypted.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.createencrypted.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Cifrare i documenti di Office">
-<link rel="prev" href="ox.appsuite.user.sect.guard.documents.html" title="Cifrare i documenti di Office">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Cifrare documenti di Office">
+<link rel="prev" href="ox.appsuite.user.sect.guard.documents.html" title="Cifrare documenti di Office">
 <link rel="next" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html" title="Salvare i documenti selezionati in un formato cifrato">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Cifrare dati con <span class="phrase">Guard</span>
 </h1>
-<h2 class="sr-only">Cifrare i documenti di Office</h2>
+<h2 class="sr-only">Cifrare documenti di Office</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.createencrypted">
 <div class="titlepage"><div><div><h3 class="title">Creare nuovi documenti cifrati</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.8.2"></a><a class="indexterm" name="id-1.14.10.8.3"></a><a class="indexterm" name="id-1.14.10.8.4"></a><p id="ox.appsuite.user.concept.guard.documents.createencrypted">Quando si crea un nuovo documento, è disponibile l'opzione per creare un documento che sarà salvato con cifratura. Esistono le seguenti opzioni: </p>
@@ -84,7 +84,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.guard.documents.createencrypted">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Cifrare i documenti di Office</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.createencrypted">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Cifrare documenti di Office</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.html
index 743fce10e..02584d636 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.html
@@ -1,7 +1,7 @@
 <html lang="it">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Cifrare i documenti di Office</title>
+<title>Cifrare documenti di Office</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
@@ -32,8 +32,8 @@
   <h1 class="sr-only">Cifrare dati con <span class="phrase">Guard</span>
 </h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.documents">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Cifrare i documenti di Office</h2></div></div></div>
-<a class="indexterm" name="id-1.14.10.2"></a><a class="indexterm" name="id-1.14.10.3"></a><a class="indexterm" name="id-1.14.10.4"></a><a class="indexterm" name="id-1.14.10.5"></a><p id="ox.appsuite.user.concept.guard.documents">Esistono le seguenti opzioni: </p>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Cifrare documenti di Office</h2></div></div></div>
+<a class="indexterm" name="id-1.14.10.2"></a><a class="indexterm" name="id-1.14.10.3"></a><a class="indexterm" name="id-1.14.10.4"></a><a class="indexterm" name="id-1.14.10.5"></a><p id="ox.appsuite.user.concept.guard.documents">Sono disponibili le seguenti opzioni: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.createencrypted.html">Creare nuovi documenti cifrati</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Salvare i documenti selezionati in un formato cifrato</a></p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.open.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.open.html
index 169564fcf..61219be6f 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.open.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.open.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Cifrare i documenti di Office">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Cifrare documenti di Office">
 <link rel="prev" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html" title="Salvare i documenti selezionati in un formato cifrato">
 <link rel="next" href="ox.appsuite.user.sect.guard.logout.html" title="Uscire da Guard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Cifrare dati con <span class="phrase">Guard</span>
 </h1>
-<h2 class="sr-only">Cifrare i documenti di Office</h2>
+<h2 class="sr-only">Cifrare documenti di Office</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.open">
 <div class="titlepage"><div><div><h3 class="title">Aprire i documenti cifrati</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.10.2"></a><a class="indexterm" name="id-1.14.10.10.3"></a><p id="ox.appsuite.user.concept.guard.documents.open">È possibile aprire un documento cifrato per effettuare le seguenti operazioni:</p>
@@ -75,7 +75,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.guard.documents.open">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Cifrare i documenti di Office</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.open">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Cifrare documenti di Office</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.saveencrypted.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.saveencrypted.html
index 8727e2866..20795f356 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.saveencrypted.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.documents.saveencrypted.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Cifrare i documenti di Office">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Cifrare documenti di Office">
 <link rel="prev" href="ox.appsuite.user.sect.guard.documents.createencrypted.html" title="Creare nuovi documenti cifrati">
 <link rel="next" href="ox.appsuite.user.sect.guard.documents.open.html" title="Aprire i documenti cifrati">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Cifrare dati con <span class="phrase">Guard</span>
 </h1>
-<h2 class="sr-only">Cifrare i documenti di Office</h2>
+<h2 class="sr-only">Cifrare documenti di Office</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.saveencrypted">
 <div class="titlepage"><div><div><h3 class="title">Salvare i documenti selezionati in un formato cifrato</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.9.2"></a><a class="indexterm" name="id-1.14.10.9.3"></a><p id="ox.appsuite.user.concept.guard.documents.saveencrypted">Quando si apre un documento di testo, foglio di calcolo o una presentazione, è possibile salvare questo documento in un formato cifrato.</p>
@@ -68,7 +68,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.guard.documents.saveencrypted">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Cifrare i documenti di Office</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.saveencrypted">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Cifrare documenti di Office</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.drive.decrypt.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.drive.decrypt.html
index 88ec1f60a..972439ea5 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.guard.drive.decrypt.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.drive.decrypt.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.guard.drive.html" title="Cifrare o decifrare i file">
 <link rel="prev" href="ox.appsuite.user.sect.guard.drive.download.html" title="Scaricare i file cifrati">
-<link rel="next" href="ox.appsuite.user.sect.guard.documents.html" title="Cifrare i documenti di Office">
+<link rel="next" href="ox.appsuite.user.sect.guard.documents.html" title="Cifrare documenti di Office">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.email.send.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.email.send.html
index c42e21148..c28e9edfd 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.guard.email.send.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.email.send.html
@@ -49,7 +49,7 @@
 <p role="presentation">È possibile fare clic anche su <span class="guibutton"><strong>Impostazioni</strong></span> nell'esecutore delle applicazioni.</p>
 <p role="presentation">Si aprirà la finestra <span class="guilabel"><strong>Impostazioni</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra.</p></li>
+<li class="step"><p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>S/MIME</strong></span> nel pannello di destra.</p></li>
 <li class="step">
 <p role="presentation">Attivare <span class="guibutton"><strong>Abilita S/MIME</strong></span>.</p>
 <p role="presentation">Se la cifratura S/MIME deve essere impostata come predefinita, abilitare <span class="guibutton"><strong>Utilizzo predefinito di S/MIME per la firma e la cifratura</strong></span> sotto <span class="guibutton"><strong>Impostazioni predefinite</strong></span>.</p>
@@ -75,7 +75,7 @@
 <li class="listitem"><p role="presentation">Per consentire al destinatario di un messaggio di inviare una risposta cifrata, il destinatario deve avere la vostra chiave pubblica. È possibile inviare la chiave pubblica come allegato. Per fare ciò, abilitare <span class="guibutton"><strong>Allega la mia chiave</strong></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Quando si utilizza PGP, si applica la seguente opzione:</p>
-<p role="presentation">Se <span class="guibutton"><strong>Mostra impostazioni avanzate</strong></span> è abilitata nelle impostazioni di <span class="phrase">Guard</span>, è possibile impostare il formato PGP.</p>
+<p role="presentation">È possibile impostare il formato PGP se l'opzione <span class="guibutton"><strong>Mostra le impostazioni avanzate durante la composizione del messaggio</strong></span> è stata abilitata nelle impostazioni di <span class="phrase">Guard</span> sotto <span class="guibutton"><strong>Avanzate</strong></span>.</p>
 <p role="presentation">In modo predefinito, i messaggi di posta cifrati sono inviati nel formato <span class="guibutton"><strong>Mime</strong></span>. Alcuni client più datati supportano solo PGP/In linea. Se il destinatario utilizza uno di questi client, abilitare <span class="guibutton"><strong>In linea</strong></span>.</p>
 <p role="presentation">Nota: se si utilizza <span class="guibutton"><strong>In linea</strong></span>, non sarà possibile inviare messaggi di posta in formato HTML.</p>
 </li>
@@ -98,7 +98,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.read.html">Leggere i messaggi di posta cifrati</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.external.html">Come possono leggere un messaggio di posta cifrato i destinatari esterni?</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare un nuovo messaggio di posta</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Inviare nuovi messaggi di posta</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di <span class="phrase">Guard</span></a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.email.send">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.email.html">Cifrare le conversazioni di posta elettronica</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.html
index 045bdb7c7..0beb6e0ea 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Cifrare dati con Guard">
-<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Gestione delle password">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Rimuovere la funzione di ripristino della password">
 <link rel="next" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Gestire le proprie chiavi PGP">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Avanti</a></li>
@@ -44,9 +44,24 @@
 <p id="ox.appsuite.user.possibilities.guard.keys">Sono disponibili le seguenti opzioni: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestire le proprie chiavi PGP</a></p></li>
-<li class="listitem cap-smime" id="id-1.14.13.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestire le proprie chiavi S/MIME</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestire le chiavi pubbliche</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestire le chiavi PGP dei destinatari</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestire le proprie chiavi S/MIME</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Gestire le chiavi S/MIME dei destinatari</a></p></li>
 </ul>
+<p id="ox.appsuite.user.related.guard.keys">
+      </p>
+<p class="title">Argomenti correlati:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di <span class="phrase">Guard</span></a>
+          </p></li>
+</ul>
+<p>
+    </p>
+<p id="ox.appsuite.user.parent.guard.keys">Argomento principale: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Cifrare dati con <span class="phrase">Guard</span></i></a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.pgppublickeys.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
index 08c1c9a0b..b480bfcd7 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
@@ -1,13 +1,13 @@
 <html lang="it">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Gestire le chiavi pubbliche</title>
+<title>Gestire le chiavi PGP dei destinatari</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestione delle chiavi">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gestire le proprie chiavi S/MIME">
-<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Impostazioni di Guard">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Gestire le proprie chiavi PGP">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gestire le proprie chiavi S/MIME">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Avanti</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Avanti</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,55 +33,37 @@
 </h1>
 <h2 class="sr-only">Gestione delle chiavi</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.pgppublickeys">
-<div class="titlepage"><div><div><h3 class="title">Gestire le chiavi pubbliche</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">Nella pagina <span class="phrase"><span class="guilabel"><strong>Impostazioni di sicurezza di Guard</strong></span></span>, è possibile: </p>
+<div class="titlepage"><div><div><h3 class="title">Gestire le chiavi PGP dei destinatari</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.8.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">Sono disponibili le seguenti opzioni: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">visualizzare chiavi pubbliche</p></li>
+<li class="listitem"><p role="presentation">visualizzare o eliminare le chiavi pubbliche</p></li>
 <li class="listitem"><p role="presentation">caricare chiavi pubbliche</p></li>
-<li class="listitem"><p role="presentation">eliminare una propria chiave pubblica</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.guard.pgppublickeys">
-<p class="title">Come utilizzare le funzioni di gestione delle chiavi:</p>
+<p class="title">Come visualizzare le chiavi PGP dei destinatari:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
-<p role="presentation">È possibile fare clic anche su <span class="guibutton"><strong>Impostazioni</strong></span> nell'esecutore delle applicazioni.</p>
-<p role="presentation">Si aprirà la finestra <span class="guilabel"><strong>Impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>Chiavi PGP dei destinatari</strong></span> nel pannello di destra.</p>
+<p role="presentation">Saranno visualizzate le chiavi PGP pubbliche dei destinatari.</p>
 </li>
 <li class="step">
-<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra.</p>
-<p role="presentation">Sarà visualizzata la pagina <span class="phrase"><span class="guilabel"><strong>Impostazioni di sicurezza di Guard</strong></span></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Abilita <span class="guibutton"><strong>Mostra impostazioni avanzate</strong></span>.</p>
-<p role="presentation">Saranno visualizzate le funzioni di gestione delle chiavi.</p>
+<p role="presentation">Per mostrare i dettagli di una chiave, fare clic sull'ID della chiave.</p>
+<p role="presentation">Per eliminare una chiave, fare clic sull'icona <span class="guibutton"><strong>Elimina</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>
+&gt; accanto alla chiave.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.display">
-<p class="title">Come mostrare le chiavi pubbliche:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
+<p class="title">Come caricare la chiave pubblica di un destinatario:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Fare clic su <span class="guibutton"><strong>Chiavi pubbliche dei destinatari</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Chiavi pubbliche</strong></span>.</p>
-<p role="presentation">Sono visualizzate le chiavi pubbliche condivise da voi o da altri utenti. Se la chiave pubblica di un utente è visualizzata in questo elenco, è possibile inviare un messaggio cifrato a questo utente e verificare i messaggi cifrati inviati a voi da questo utente.</p>
-</li>
-<li class="step">
-<p role="presentation">Per visualizzare i dettagli per una chiave, fare clic sull'icona <span class="guibutton"><strong>Dettagli</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> accanto a una chiave. Si aprirà la finestra <span class="guilabel"><strong>Dettagli chiavi pubbliche</strong></span>.</p>
-<p role="presentation">È possibile condividere le proprie chiavi pubbliche abilitando <span class="guibutton"><strong>Condividi chiave</strong></span>. Gli altri utenti possono visualizzare e scaricare le vostre chiavi condivise. Le chiavi pubbliche sono disponibili solo per gli utenti del groupware.</p>
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>Chiavi PGP dei destinatari</strong></span> nel pannello di destra.</p>
 </li>
+<li class="step"><p role="presentation">Fare clic su <span class="guibutton"><strong>Carica chiave del destinatario</strong></span>. Selezionare un file contenente una chiave pubblica.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
-<p class="title">Come caricare la chiave pubblica di un destinatario nella finestra <span class="guilabel"><strong>Chiavi pubbliche</strong></span>:</p>
-<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Aggiungi</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.upload.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> accanto a <span class="guilabel"><strong>Elenco chiavi pubbliche PGP</strong></span>. Selezionare un file che contiene una chiave pubblica.</p></li></ul></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.delete">
-<p class="title">Come eliminare la chiave pubblica nella finestra <span class="guilabel"><strong>Chiavi pubbliche</strong></span>:</p>
-<div class="procedure"><ul class="procedure"><li class="step">
-<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Elimina</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> accanto a una chiave pubblica.</p>
-<p role="presentation">Confermare che si desidera eliminare la chiave pubblica.</p>
-</li></ul></div>
-</div>
 <p id="ox.appsuite.user.related.guard.keys.pgppublickeys">
         </p>
 <p class="title">Argomenti correlati:</p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.smimepublickeys.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
new file mode 100644
index 000000000..825859759
--- /dev/null
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
@@ -0,0 +1,85 @@
+<html lang="it">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Gestire le chiavi S/MIME dei destinatari</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuale utente">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestione delle chiavi">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gestire le proprie chiavi S/MIME">
+<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Impostazioni di Guard">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Indietro</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Avanti</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Cifrare dati con <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Gestione delle chiavi</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.keys.smimepublickeys">
+<div class="titlepage"><div><div><h3 class="title">Gestire le chiavi S/MIME dei destinatari</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.10.2"></a><p id="ox.appsuite.user.concept.guard.keys.smimepublickeys">Sono disponibili le seguenti opzioni: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">visualizzare chiavi pubbliche</p></li>
+<li class="listitem"><p role="presentation">caricare chiavi pubbliche</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.smimepublickeys">
+<p class="title">Come visualizzare la chiave S/MIME di un destinatario:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>Destinatari S/MIME</strong></span> nel pannello di destra.</p>
+</li>
+<li class="step">
+<p role="presentation">Digitare un indirizzo di posta elettronica in <span class="guibutton"><strong>Cerca certificato</strong></span>. Fare clic su <span class="guibutton"><strong>Cerca</strong></span>.</p>
+<p role="presentation">Se è stato trovato un certificato, saranno visualizzati i dati del certificato.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.guard.keys.smimepublickeys.upload">
+<p class="title">Come caricare la chiave pubblica di un destinatario:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>Destinatari S/MIME</strong></span> nel pannello di destra.</p>
+</li>
+<li class="step"><p role="presentation">Fare clic su <span class="guibutton"><strong>Carica certificato del destinatario</strong></span>. Selezionare un file contenente una chiave pubblica.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.keys.smimepublickeys">
+        </p>
+<p class="title">Argomenti correlati:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestire le proprie chiavi PGP</a>
+            </p>
+<p role="presentation" class="cap-smime">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestire le proprie chiavi S/MIME</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a>
+            </p>
+</li></ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.keys.smimepublickeys">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
index 7fe35692d..a043deca3 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestione delle chiavi">
 <link rel="prev" href="ox.appsuite.user.sect.guard.keys.html" title="Gestione delle chiavi">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Gestire le proprie chiavi S/MIME">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gestire le chiavi PGP dei destinatari">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Avanti</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Avanti</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,121 +34,93 @@
 <h2 class="sr-only">Gestione delle chiavi</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yourpgpkeys">
 <div class="titlepage"><div><div><h3 class="title">Gestire le proprie chiavi PGP</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.5.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">Nella pagina <span class="phrase"><span class="guilabel"><strong>Impostazioni di sicurezza di Guard</strong></span></span>   , è possibile: </p>
+<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">Sono disponibili le seguenti opzioni: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">aggiungere nuove chiavi PGP</p></li>
 <li class="listitem"><p role="presentation">visualizzare le proprie chiavi PGP, visualizzare i dettagli</p></li>
-<li class="listitem">
-<p role="presentation">aggiungere nuove chiavi PGP</p>
-<p role="presentation">Se si dispone di più chiavi, è possibile definire quale chiave dovrebbe essere quella attuale. La chiave attuale viene utilizzata per cifrare i dati.</p>
-</li>
-<li class="listitem">
-<p role="presentation">aggiungere gli ID utente</p>
-<p role="presentation">Quando si aggiungono ulteriori ID utente a una chiave, è possibile utilizzare la chiave per più account di posta elettronica.</p>
-</li>
-<li class="listitem"><p role="presentation">scaricare le chiavi</p></li>
-<li class="listitem"><p role="presentation">eliminare le chiavi</p></li>
+<li class="listitem"><p role="presentation">gestire le proprie chiavi PGP: rendere correnti, modificare ID, revocare, scaricare, eliminare </p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys">
-<p class="title">Come utilizzare le funzioni di gestione delle chiavi PGP:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.add">
+<p class="title">Come aggiungere una nuova chiave PGP:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
-<p role="presentation">È possibile fare clic anche su <span class="guibutton"><strong>Impostazioni</strong></span> nell'esecutore delle applicazioni.</p>
-<p role="presentation">Si aprirà la finestra <span class="guilabel"><strong>Impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.addkey"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>Le tue chiavi PGP</strong></span> nel pannello di destra.</p>
 </li>
 <li class="step">
-<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra.</p>
-<p role="presentation">Sarà visualizzata la pagina <span class="phrase"><span class="guilabel"><strong>Impostazioni di sicurezza di Guard</strong></span></span>.</p>
+<p role="presentation">Si hanno le seguenti opzioni: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">Per creare una nuova coppia di chiavi, fare clic su <span class="guibutton"><strong>Crea nuove</strong></span>. Si aprirà la finestra <span class="phrase"><span class="guilabel"><strong>Crea chiavi di sicurezza di Guard</strong></span></span>.</p>
+<p role="presentation">Digitare una password per la nuova chiave. Confermare la password.</p>
+<p role="presentation">La nuova chiave consiste di una chiave principale e di una sottochiave corrispondente.</p>
 </li>
-<li class="step">
-<p role="presentation">Abilita <span class="guibutton"><strong>Mostra impostazioni avanzate</strong></span>.</p>
-<p role="presentation">Saranno visualizzate le funzioni di gestione delle chiavi.</p>
+<li class="listitem">
+<p role="presentation">Per aggiungere una chiave privata esistente, fare clic su <span class="guibutton"><strong>Carica chiave privata</strong></span>. Selezionare un file contenente una chiave privata. Si aprirà la finestra <span class="guilabel"><strong>Carica chiavi private</strong></span>.</p>
+<p role="presentation">Per caricare la nuova chiave, digitare la propria password di sicurezza di <span class="phrase">Guard</span>. Digitare una nuova password per la nuova chiave.</p>
+</li>
+<li class="listitem"><p role="presentation">Per aggiungere una chiave pubblica esistente, fare clic su <span class="guibutton"><strong>Carica chiave pubblica</strong></span>. Selezionare un file contenente una chiave pubblica.</p></li>
+</ul></p>
+<p role="presentation">La nuova chiave sarà inserita in cima all'elenco delle proprie chiavi. La nuova chiave diventa la chiave attuale.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.display">
-<p class="title">Come visualizzare le proprie chiavi PGP o rendere una chiave PGP quella corrente:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.display">
+<p class="title">Come visualizzare le chiavi PGP esistenti:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Fare clic su <span class="guibutton"><strong>Le tue chiavi</strong></span> sotto <span class="guilabel"><strong>Chiavi</strong></span>.</p>
-<p role="presentation" class="cap-smime">In base alla configurazione, si aprirà la finestra <span class="guilabel"><strong>Seleziona il tipo di chiavi da modificare</strong></span>. Selezionare <span class="guibutton"><strong>PGP</strong></span>.</p>
-<p role="presentation">Si aprirà la finestra <span class="guilabel"><strong>Le tue chiavi</strong></span>.</p>
-<p role="presentation">
-              <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Saranno visualizzate le proprie chiavi PGP. Ogni chiave PGP consiste di una chiave principale e di una sottochiave. <ul class="itemizedlist" style="list-style-type: circle; ">
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>Le tue chiavi PGP</strong></span> nel pannello di destra.</p>
+<p role="presentation">Saranno visualizzate le proprie chiavi PGP. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Ogni chiave PGP è composta da una chiave principale e da una sottochiave. <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Tra le altre cose, la chiave principale è utilizzata per firmare i propri messaggi di posta elettronica.</p></li>
 <li class="listitem"><p role="presentation">La sottochiave sarà utilizzata per cifrare e decifrare.</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">In base ai requisiti, <span class="phrase">Guard</span> utilizza automaticamente la chiave principale o la sottochiave.</p></li>
-</ul>
-            </p>
+</ul></p>
 </li>
-<li class="step"><p role="presentation">Se il proprio elenco di chiavi contiene più di una chiave, è possibile definire la chiave attuale. Per fare ciò, abilitare la casella di selezione <span class="guibutton"><strong>Attuale</strong></span> accanto alla chiave. Da questo momento, la chiave attuale sarà utilizzata per la cifratura.</p></li>
-<li class="step"><p role="presentation">Per visualizzare i dettagli di una chiave, fare clic sull'icona <span class="guibutton"><strong>Dettagli</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> accanto a una chiave. Si aprirà la finestra <span class="guilabel"><strong>Dettagli chiave</strong></span>. Per visualizzare le firme della chiave, fare clic su <span class="guibutton"><strong>Firme</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addkey">
-<p class="title">Come aggiungere una nuova chiave PGP nella finestra <span class="guilabel"><strong>Le tue chiavi</strong></span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Aggiungi chiave utente</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> accanto a <span class="guibutton"><strong>Il tuo elenco di chiavi</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Aggiunta chiavi</strong></span>.</p></li>
 <li class="step">
-<p role="presentation">Si hanno le seguenti opzioni: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-<p role="presentation">Per aggiungere una chiave privata, fare clic su <span class="guibutton"><strong>Carica chiave privata</strong></span>. Selezionare un file contenente una chiave privata. Si aprirà la finestra <span class="guilabel"><strong>Carica chiavi private</strong></span>.</p>
-<p role="presentation">Per caricare la nuova chiave, digitare la propria password di sicurezza di <span class="phrase">Guard</span>. Digitare una nuova password per la nuova chiave.</p>
-</li>
-<li class="listitem"><p role="presentation">Per aggiungere una chiave pubblica, fare clic su <span class="guibutton"><strong>Carica solo la chiave pubblica</strong></span>. Selezionare un file contenente una chiave pubblica.</p></li>
-<li class="listitem">
-<p role="presentation">Per creare una nuova coppia di chiavi, fare clic su <span class="guibutton"><strong>Crea nuove chiavi</strong></span>. Si aprirà la finestra <span class="phrase"><span class="guilabel"><strong>Crea chiavi di sicurezza di Guard</strong></span></span>.</p>
-<p role="presentation">Digitare una password per la nuova chiave. Confermare la password.</p>
-<p role="presentation">La nuova chiave consiste di una chiave principale e di una sottochiave corrispondente.</p>
-</li>
-</ul></p>
-<p role="presentation">La nuova chiave sarà inserita in cima all'elenco delle proprie chiavi. La nuova chiave diventa la chiave attuale.</p>
+<p role="presentation">Per visualizzare i dettagli di una chiave, fare clic sull'icona <span class="guibutton"><strong>Gestisci le chiavi</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> accanto a una chiave principale. Si aprirà la finestra <span class="guilabel"><strong>Dettagli chiave</strong></span>.</p>
+<p role="presentation">Per visualizzare le firme della chiave, fare clic su <span class="guibutton"><strong>Firme</strong></span>.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addaccount">
-<p class="title">Come aggiungere un ID utente aggiuntivo nella finestra <span class="guilabel"><strong>Le tue chiavi</strong></span>:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.manage">
+<p class="title">Come gestire le proprie chiavi PGP esistenti:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Modifica ID</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addaccount.edit"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> accanto a una chiave. Si aprirà la finestra <span class="guilabel"><strong>Aggiungi ID utente</strong></span>.</p></li>
 <li class="step">
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>Le tue chiavi PGP</strong></span> nel pannello di destra.</p>
+<p role="presentation">Saranno visualizzate le proprie chiavi PGP.</p>
+</li>
+<li class="step"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Gestisci le chiavi</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> accanto a una chiave principale. Utilizzare le seguenti funzioni. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Se il proprio elenco di chiavi contiene più di una chiave, è possibile definire la chiave attuale. Per fare ciò, fare clic su <span class="guibutton"><strong>Rendi attuale</strong></span>. Da questo momento, la chiave attuale sarà utilizzata per la cifratura.</p></li>
+<li class="listitem">
+<p role="presentation">Se si desidera utilizzare la chiave per un altro account di posta, fare clic su <span class="guibutton"><strong>Modifica ID</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Aggiungi ID utente</strong></span>.</p>
 <p role="presentation">Digitare un nome per l'ID utente. Digitare l'indirizzo di posta che si desidera utilizzare per questa chiave.</p>
 <p role="presentation">Digitare la propria password per questa chiave.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.download">
-<p class="title">Come scaricare una chiave nella finestra <span class="guilabel"><strong>Le tue chiavi</strong></span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Scarica</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> accanto a una chiave.</p></li>
-<li class="step">
+<li class="listitem">
+<p role="presentation">Per scaricare una chiave privata, fare clic su <span class="guibutton"><strong>Scarica</strong></span>.</p>
 <p role="presentation">Specificare se scaricare solo la chiave privata, la propria chiave pubblica o entrambe le chiavi.</p>
 <p role="presentation"><span class="phrase"><strong>Attenzione:</strong></span> la propria chiave privata sarà scaricata in forma cifrata. Non si dovrebbe, tuttavia, scaricare la propria chiave privata su un sistema accessibile pubblicamente.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.delete">
-<p class="title">Come eliminare una chiave nella finestra <span class="guilabel"><strong>Le tue chiavi</strong></span>:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Avviso:</strong></span> se si elimina una chiave privata, non sarà più possibile decifrare gli oggetti che sono stati cifrati con questa chiave. Se non si è sicuri, non si dovrebbe eliminare la chiave, ma revocarla. Una chiave revocata non può più essere utilizzata per cifrare, ma consente ancora di decifrare gli oggetti che sono stati cifrati con questa chiave.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Elimina</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> accanto a una chiave. Si aprirà la finestra <span class="guilabel"><strong>Elimina chiave privata</strong></span>.</p></li>
-<li class="step"><p role="presentation">Sono disponibili le seguenti opzioni:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Per revocare o eliminare una chiave privata, fare clic su <span class="guibutton"><strong>Elimina</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Elimina chiave privata</strong></span>. Note: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">se si revoca una chiave, questa non sarà più utilizzata, ma sarà ancora possibile decifrare gli oggetti che sono stati cifrati con questa chiave. Per questo motivo, revocare una chiave è meglio che eliminarla.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Avviso:</strong></span> se si elimina una chiave privata, non sarà più possibile decifrare gli oggetti che sono stati cifrati con questa chiave.</p></li>
+</ul> <p role="presentation">Sono disponibili le seguenti opzioni:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
-<p role="presentation">Per revocare una chiave privata, fare clic su <span class="guibutton"><strong>Revoca</strong></span>.</p>
-<p role="presentation">Se si revoca una chiave, questa non sarà più utilizzata, ma sarà ancora possibile decifrare gli oggetti che sono stati cifrati con questa chiave. Per questo motivo, revocare una chiave è meglio che eliminarla.</p>
+<p role="presentation">per revocare una chiave privata, fare clic su <span class="guibutton"><strong>Revoca</strong></span>.</p>
 <p role="presentation">Digitare la password della chiave privata. Se richiesto, selezionare un motivo per la revoca della chiave.</p>
 <p role="presentation">Fare clic su <span class="guibutton"><strong>Revoca</strong></span>.</p>
+<p role="presentation">È possibile anche fare clic su <span class="guibutton"><strong>Revoca</strong></span> nel menu.</p>
 </li>
 <li class="listitem">
-<p role="presentation">Per eliminare una chiave privata, fare clic su <span class="guibutton"><strong>Elimina</strong></span>. </p>
-<p role="presentation"><span class="phrase"><strong>Avviso:</strong></span> se si elimina una chiave privata, non sarà più possibile decifrare gli oggetti cifrati con questa chiave.</p>
+<p role="presentation">Per eliminare una chiave privata, fare clic su <span class="guibutton"><strong>Elimina</strong></span>.</p>
 <p role="presentation">Digitare la password della chiave privata.</p>
 <p role="presentation">Fare clic sul pulsante <span class="guibutton"><strong>Elimina</strong></span>.</p>
 </li>
-</ul>Se si elimina una chiave principale, sarà eliminata anche la sottochiave corrispondente.</p></li>
+</ul> Quando si elimina una chiave principale, sarà eliminata anche la sottochiave corrispondente.</p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yourpgpkeys">
@@ -156,7 +128,7 @@
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestire le chiavi pubbliche</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestire le chiavi PGP dei destinatari</a>
             </p>
 <p role="presentation" class="cap-smime">
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestire le proprie chiavi S/MIME</a>
@@ -167,7 +139,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yourpgpkeys">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yourpgpkeys">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
index 4b6bc0a8c..77a76c14c 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Gestione delle chiavi">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Gestire le proprie chiavi PGP">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gestire le chiavi pubbliche">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gestire le chiavi PGP dei destinatari">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Gestire le chiavi S/MIME dei destinatari">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Avanti</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Avanti</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,46 +34,27 @@
 <h2 class="sr-only">Gestione delle chiavi</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yoursmimekeys">
 <div class="titlepage"><div><div><h3 class="title">Gestire le proprie chiavi S/MIME</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.6.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">Nella pagina <span class="phrase"><span class="guilabel"><strong>Impostazioni di sicurezza di Guard</strong></span></span>   , è possibile: </p>
+<a class="indexterm" name="id-1.14.13.9.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">Sono disponibili le seguenti opzioni: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">aggiungere nuove chiavi S/MIME</p>
 <p role="presentation">Se si dispone di più chiavi, è possibile definire quale chiave dovrebbe essere quella attuale. La chiave attuale viene utilizzata per cifrare i dati.</p>
 </li>
 <li class="listitem"><p role="presentation">visualizzare le proprie chiavi S/MIME, visualizzare i dettagli</p></li>
-<li class="listitem"><p role="presentation">scaricare le chiavi</p></li>
-<li class="listitem"><p role="presentation">eliminare le chiavi</p></li>
+<li class="listitem"><p role="presentation">gestire le proprie chiavi S/MIME: rendere correnti, modificare ID, revocare, scaricare, eliminare</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys">
-<p class="title">Come utilizzare le funzioni di gestione delle chiavi S/MIME:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.add">
+<p class="title">Come aggiungere una nuova chiave S/MIME:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
-<p role="presentation">È possibile fare clic anche su <span class="guibutton"><strong>Impostazioni</strong></span> nell'esecutore delle applicazioni.</p>
-<p role="presentation">Si aprirà la finestra <span class="guilabel"><strong>Impostazioni</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra.</p>
-<p role="presentation">Sarà visualizzata la pagina <span class="phrase"><span class="guilabel"><strong>Impostazioni di sicurezza di Guard</strong></span></span>.</p>
-</li>
-<li class="step">
+<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>S/MIME</strong></span> nel pannello di destra.</p>
 <p role="presentation">Attivare <span class="guibutton"><strong>Abilita S/MIME</strong></span>.</p>
-<p role="presentation">Abilita <span class="guibutton"><strong>Mostra impostazioni avanzate</strong></span>.</p>
-<p role="presentation">Saranno visualizzate le funzioni di gestione delle chiavi.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.addkey">
-<p class="title">Come aggiungere una nuova chiave S/MIME:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Fare clic su <span class="guibutton"><strong>Le tue chiavi</strong></span> sotto <span class="guibutton"><strong>Chiavi</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Seleziona il tipo di chiavi da modificare</strong></span>.</p>
-<p role="presentation">Selezionare <span class="guibutton"><strong>S/MIME</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>I tuoi certificati</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Aggiungi</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> accanto a <span class="guilabel"><strong>Il tuo elenco di chiavi</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Carica chiavi S/MIME</strong></span>.</p></li>
 <li class="step">
+<p role="presentation">Fare clic su <span class="guibutton"><strong>Carica certificato privato</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Carica chiavi S/MIME</strong></span>.</p>
 <p role="presentation">Digitare le seguenti password: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Per caricare la nuova chiave, digitare la propria password di sicurezza di <span class="phrase">Guard</span>. Digitare una nuova password per la nuova chiave.</p></li>
+<li class="listitem"><p role="presentation">La propria password di sicurezza di <span class="phrase">Guard</span> per caricare la nuova chiave.</p></li>
 <li class="listitem">
 <p role="presentation">Una nuova password per cifrare i messaggi di posta.</p>
 <p role="presentation">Confermare la nuova password.</p>
@@ -85,48 +66,51 @@
 </ol></div>
 </div>
 <div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.display">
-<p class="title">Come visualizzare le proprie chiavi S/MIME o rendere una chiave S/MIME quella corrente:</p>
+<p class="title">Come visualizzare le proprie chiavi S/MIME:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Fare clic su <span class="guibutton"><strong>Le tue chiavi</strong></span> sotto <span class="guilabel"><strong>Chiavi</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Seleziona il tipo di chiavi da modificare</strong></span>.</p>
-<p role="presentation">Selezionare <span class="guibutton"><strong>S/MIME</strong></span>.</p>
-<p role="presentation">Si aprirà la finestra <span class="guilabel"><strong>I tuoi certificati</strong></span>. Saranno visualizzate le proprie chiavi S/MIME.</p>
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>S/MIME</strong></span> nel pannello di destra.</p>
+<p role="presentation">Attivare <span class="guibutton"><strong>Abilita S/MIME</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Per visualizzare i dettagli per una chiave, fare clic sull'icona <span class="guibutton"><strong>Gestisci le chiavi</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> accanto a una chiave. Si aprirà la finestra <span class="guilabel"><strong>Dettagli chiave</strong></span>.</p>
+<p role="presentation">Per visualizzare le firme della chiave, fare clic su <span class="guibutton"><strong>Firme</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Se il proprio elenco di chiavi contiene più di una chiave, è possibile definire la chiave attuale. Per fare ciò, abilitare la casella di selezione <span class="guibutton"><strong>Attuale</strong></span> accanto alla chiave. Da questo momento, la chiave attuale sarà utilizzata per la cifratura.</p></li>
-<li class="step"><p role="presentation">Per visualizzare i dettagli di una chiave, fare clic sull'icona <span class="guibutton"><strong>Dettagli</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> accanto a una chiave. Si aprirà la finestra <span class="guilabel"><strong>Dettagli chiave</strong></span>. Per visualizzare le firme della chiave, fare clic su <span class="guibutton"><strong>Firme</strong></span>.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.download">
-<p class="title">Come scaricare una chiave nella finestra <span class="guilabel"><strong>Le tue chiavi</strong></span>:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.manage">
+<p class="title">Come gestire le proprie chiavi S/MIME esistenti:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Scarica</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> accanto a una chiave.</p></li>
 <li class="step">
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>S/MIME</strong></span> nel pannello di destra.</p>
+<p role="presentation">Attivare <span class="guibutton"><strong>Abilita S/MIME</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Gestisci le chiavi</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> accanto a una chiave principale. Utilizzare le seguenti funzioni. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Se il proprio elenco di chiavi contiene più di una chiave, è possibile definire la chiave attuale. Per fare ciò, fare clic su <span class="guibutton"><strong>Rendi attuale</strong></span>. Da questo momento, la chiave attuale sarà utilizzata per la cifratura.</p></li>
+<li class="listitem">
+<p role="presentation">Per scaricare una chiave privata, fare clic su <span class="guibutton"><strong>Scarica</strong></span>.</p>
 <p role="presentation">Specificare se scaricare solo la chiave privata, la propria chiave pubblica o entrambe le chiavi.</p>
 <p role="presentation"><span class="phrase"><strong>Attenzione:</strong></span> la propria chiave privata sarà scaricata in forma cifrata. Non si dovrebbe, tuttavia, scaricare la propria chiave privata su un sistema accessibile pubblicamente.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.delete">
-<p class="title">Come eliminare una chiave nella finestra <span class="guilabel"><strong>Le tue chiavi</strong></span>:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Avviso:</strong></span> se si elimina una chiave privata, non sarà più possibile decifrare gli oggetti che sono stati cifrati con questa chiave. Se non si è sicuri, non si dovrebbe eliminare la chiave, ma revocarla. Una chiave revocata non può più essere utilizzata per cifrare, ma consente ancora di decifrare gli oggetti che sono stati cifrati con questa chiave.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Elimina</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> accanto a una chiave. Si aprirà la finestra <span class="guilabel"><strong>Elimina chiave privata</strong></span>.</p></li>
-<li class="step"><p role="presentation">Si hanno le seguenti opzioni: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Per revocare o eliminare una chiave privata, fare clic su <span class="guibutton"><strong>Elimina</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Elimina chiave privata</strong></span>. Note: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">se si revoca una chiave, non sarà più utilizzata. Ma è possibile ancora decifrare gli oggetti che sono stati cifrati con questa chiave. Per questo motivo, revocare una chiave è meglio che eliminarla.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Avviso:</strong></span> se si elimina una chiave privata, non sarà più possibile decifrare gli oggetti che sono stati cifrati con questa chiave.</p></li>
+</ul> <p role="presentation">Si hanno le seguenti opzioni:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">Per revocare una chiave privata, fare clic su <span class="guibutton"><strong>Revoca</strong></span>.</p>
-<p role="presentation">se si revoca una chiave, non sarà più utilizzata. Ma è possibile ancora decifrare gli oggetti che sono stati cifrati con questa chiave. Per questo motivo, revocare una chiave è meglio che eliminarla.</p>
 <p role="presentation">Digitare la password per la chiave privata. Se necessario, selezionare un motivo per la revoca della chiave.</p>
 <p role="presentation">Fare clic su <span class="guibutton"><strong>Revoca</strong></span>.</p>
+<p role="presentation">È possibile fare clic anche su <span class="guibutton"><strong>Revoca</strong></span> nel menu.</p>
 </li>
 <li class="listitem">
 <p role="presentation">Per eliminare una chiave privata, fai clic su <span class="guibutton"><strong>Elimina</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Avviso:</strong></span> se si elimina una chiave privata, non sarà più possibile decifrare gli oggetti che sono stati cifrati con questa chiave.</p>
 <p role="presentation">Digitare la password per la chiave privata.</p>
 <p role="presentation">Fare clic sul pulsante <span class="guibutton"><strong>Elimina</strong></span>.</p>
 </li>
 </ul></p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yoursmimekeys">
@@ -137,7 +121,7 @@
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestire le proprie chiavi PGP</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestire le chiavi pubbliche</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestire le chiavi PGP dei destinatari</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a>
@@ -145,7 +129,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yoursmimekeys">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yoursmimekeys">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.password.change.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.password.change.html
new file mode 100644
index 000000000..dc827b568
--- /dev/null
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.password.change.html
@@ -0,0 +1,75 @@
+<html lang="it">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Cambiare la password</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuale utente">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Gestione delle password">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Gestione delle password">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.reset.html" title="ripristinare la password">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Indietro</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.reset.html">Avanti</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Cifrare dati con <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Gestione delle password</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.change">
+<div class="titlepage"><div><div><h3 class="title">Cambiare la password</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.6.2"></a><a class="indexterm" name="id-1.14.12.6.3"></a><p role="presentation" class="cap-smime">In base alla configurazione è possibile utilizzare anche S/MIME invece di PGP per la cifratura. Per PGP e S/MIME saranno utilizzate password separate.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.change">
+<p class="title">Come cambiare la password di <span class="phrase">Guard</span>:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.change"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>Gestione delle password (PGP)</strong></span><span class="cap-smime"> o su <span class="guibutton"><strong>Gestione delle password (S/MIME)</strong></span></span> nel pannello di destra.</p>
+</li>
+<li class="step">
+<p role="presentation">Nel campo <span class="guibutton"><strong>Vecchia password</strong></span>, digitare la password utilizzata in precedenza per cifrare i propri dati.</p>
+<p role="presentation">Se è stato trovato un certificato, saranno visualizzati i dati del certificato. Nel campo <span class="guibutton"><strong>Password</strong></span>, digitare la password che si desidera utilizzare per cifrare i propri dati.</p>
+<p role="presentation">Digitare nuovamente la nuova password nel campo <span class="guibutton"><strong>Conferma la nuova password</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Fare clic su <span class="guibutton"><strong>Cambia password</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.change">
+        </p>
+<p class="title">Argomenti correlati:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">ripristinare la password</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Rimuovere la funzione di ripristino della password</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.change">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.password.deleterecovery.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.password.deleterecovery.html
new file mode 100644
index 000000000..173171cb7
--- /dev/null
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.password.deleterecovery.html
@@ -0,0 +1,74 @@
+<html lang="it">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Rimuovere la funzione di ripristino della password</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuale utente">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Gestione delle password">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.reset.html" title="ripristinare la password">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Gestione delle chiavi">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.reset.html">Indietro</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Avanti</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Cifrare dati con <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Gestione delle password</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.deleterecovery">
+<div class="titlepage"><div><div><h3 class="title">Rimuovere la funzione di ripristino della password</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.8.2"></a><p id="ox.appsuite.user.concept.guard.password.deleterecovery">Per poter ripristinare la password, se necessario, la password deve essere salvata sul server in una versione cifrata. Se non si desidera che la password sia salvata sul server, è possibile eliminare la funzione di recupero password.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
+<p class="title">Come rimuovere la funzione per ripristinare la password:</p>
+<div class="taskprerequisites">
+          <p><span class="phrase"><strong>Avviso:</strong></span> se si rimuove la funzione per ripristinare la password, non sarà più possibile ripristinare la propria password. Se si dimentica in seguito la propria password, non ci sarà alcuna possibilità di decifrare i propri dati cifrati.</p>
+        </div>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.remove"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>Avanzate</strong></span> nel pannello di destra.</p>
+</li>
+<li class="step"><p role="presentation">Sotto <span class="guibutton"><strong>Opzioni di ripristino</strong></span>, fare clic su <span class="guibutton"><strong>Elimina ripristino della password</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Elimina ripristino</strong></span>.</p></li>
+<li class="step"><p role="presentation">Fare clic sul pulsante <span class="guibutton"><strong>Elimina</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.deleterecovery">
+        </p>
+<p class="title">Argomenti correlati:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Cambiare la password</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">ripristinare la password</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.deleterecovery">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.password.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.password.html
index ca7232de3..290b1b119 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.guard.password.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.password.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Cifrare dati con Guard">
 <link rel="prev" href="ox.appsuite.user.sect.guard.logout.html" title="Uscire da Guard">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Gestione delle chiavi">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.change.html" title="Cambiare la password">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.logout.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Avanti</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.change.html">Avanti</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,102 +33,24 @@
 </h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.password">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Gestione delle password</h2></div></div></div>
-<a class="indexterm" name="id-1.14.12.2"></a><a class="indexterm" name="id-1.14.12.3"></a><a class="indexterm" name="id-1.14.12.4"></a><a class="indexterm" name="id-1.14.12.5"></a><a class="indexterm" name="id-1.14.12.6"></a><p id="ox.appsuite.user.concept.guard.password">Sono disponibili le seguenti opzioni:</p>
+<a class="indexterm" name="id-1.14.12.2"></a><p id="ox.appsuite.user.concept.guard.password">Sono disponibili le seguenti opzioni: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Cambiare la password di sicurezza di <span class="phrase">Guard</span></p></li>
-<li class="listitem"><p role="presentation">Se si perde la propria password di sicurezza di <span class="phrase">Guard</span>, è possibile richiedere una password di sicurezza temporanea di <span class="phrase">Guard</span> ripristinando la password di sicurezza di <span class="phrase">Guard</span>.</p></li>
-<li class="listitem"><p role="presentation">Definire un indirizzo di posta per ripristinare la password.</p></li>
-<li class="listitem"><p role="presentation">Per poter ripristinare la propria password, se necessario, la password deve essere salvata sul server in una versione cifrata. Se non si desidera che la password sia salvata sul server, è possibile eliminare il ripristino della password.</p></li>
-<li class="listitem cap-smime" id="id-1.14.12.7.1.5"><p role="presentation">In base alla configurazione, è possibile anche utilizzare S/MIME per la cifratura invece di PGP. In questo caso, saranno utilizzate password separate per PGP e S/MIME.</p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Cambiare la password</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">ripristinare la password</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Rimuovere la funzione di ripristino della password</a></p></li>
 </ul>
-<p>Nota: in base alla configurazione, alcune di queste funzioni potrebbero non essere disponibili.</p>
-<div class="task help-hide-inline" id="ox.appsuite.user.task.guard.password">
-<p class="title">Come aprire le funzioni di gestione delle password:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
-<p role="presentation">È possibile fare clic anche su <span class="guibutton"><strong>Impostazioni</strong></span> nell'esecutore delle applicazioni.</p>
-<p role="presentation">Si aprirà la finestra <span class="guilabel"><strong>Impostazioni</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra.</p>
-<p role="presentation">Sarà visualizzata la pagina <span class="phrase"><span class="guilabel"><strong>Impostazioni di sicurezza di Guard</strong></span></span>.</p>
-<p role="presentation">Saranno visualizzate le funzioni di gestione della password.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.change">
-<p class="title">Come cambiare la password di <span class="phrase">Guard</span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Fare clic su <span class="guibutton"><strong>Cambia password</strong></span>.</p>
-<p role="presentation" class="cap-smime">In base alla configurazione, si aprirà la finestra <span class="guilabel"><strong>Seleziona il tipo di chiavi da modificare</strong></span>. In base al tipo di cifratura per cui si desidera reimpostare la password, selezionare <span class="guibutton"><strong>PGP</strong></span> o <span class="guibutton"><strong>S/MIME</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Ripristina la password</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Nel campo <span class="phrase"><span class="guibutton"><strong>Digita la password attuale di sicurezza di Guard</strong></span></span>, digitare la password utilizzata fino a quel momento per cifrare i propri dati.</p>
-<p role="presentation">Nel campo <span class="phrase"><span class="guibutton"><strong>Digita la nuova password di sicurezza di Guard</strong></span></span>, digitare la password che si desidera utilizzare da quel momento in poi.</p>
-<p role="presentation">Confermare la password nel campo <span class="phrase"><span class="guibutton"><strong>Verifica la nuova password di sicurezza di Guard</strong></span></span> digitandola nuovamente.</p>
-</li>
-<li class="step"><p role="presentation">Fare clic su <span class="guibutton"><strong>Cambia</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.reset">
-<p class="title">Come ripristinare la password di <span class="phrase">Guard</span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Fare clic su <span class="guibutton"><strong>Ripristina la password</strong></span>.</p>
-<p role="presentation" class="cap-smime">In base alla configurazione, si aprirà la finestra <span class="guilabel"><strong>Seleziona il tipo di chiavi da modificare</strong></span>. In base al tipo di cifratura per cui si desidera reimpostare la password, selezionare <span class="guibutton"><strong>PGP</strong></span> o <span class="guibutton"><strong>S/MIME</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Ripristina la password</strong></span>.</p>
-<p role="presentation">Fare clic su <span class="guibutton"><strong>Ripristina</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Una nuova password sarà inviata all'indirizzo di posta secondario.</p>
-<p role="presentation">Se non è stato digitato un indirizzo di posta secondario, la nuova password sarà inviata all'indirizzo di posta principale.</p>
-<p role="presentation">Questa nuova password è ora la propria password di sicurezza di <span class="phrase">Guard</span>. È consigliabile <a class="link" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.task.guard.settings">cambiare</a> immediatamente questa password.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.secondarymail">
-<p class="title">Come modificare il proprio indirizzo secondario di posta elettronica per ripristinare la password:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Fare clic su <span class="guibutton"><strong>Cambia indirizzo di posta per ripristino</strong></span>.</p>
-<p role="presentation" class="cap-smime">In base alla configurazione, si aprirà la finestra <span class="guilabel"><strong>Seleziona il tipo di chiavi da modificare</strong></span>. In base al tipo di cifratura per cui si desidera reimpostare la password, selezionare <span class="guibutton"><strong>PGP</strong></span> o <span class="guibutton"><strong>S/MIME</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Indirizzo di posta secondario</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Nel campo <span class="phrase"><span class="guibutton"><strong>Digita la password attuale di sicurezza di Guard</strong></span></span>, digitare la password utilizzata fino a quel momento per cifrare i propri dati.</p>
-<p role="presentation">Nel campo <span class="guibutton"><strong>Digita il nuovo indirizzo di posta secondario</strong></span>, digitare l'indirizzo di posta utilizzato per ricevere la password temporanea per il ripristino della propria password di sicurezza di <span class="phrase">Guard</span>.</p>
-<p role="presentation">Digitare nuovamente l'indirizzo di posta in <span class="guibutton"><strong>Verifica indirizzo di posta</strong></span>.</p>
-<p role="presentation">Fare clic su <span class="guibutton"><strong>Cambia indirizzo di posta</strong></span>.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
-<p class="title">Come rimuovere la funzione per ripristinare la password:</p>
-<div class="taskprerequisites">
-        <p><span class="phrase"><strong>Avviso:</strong></span> se si rimuove la funzione per ripristinare la password, non sarà più possibile ripristinare la propria password. Se si dimentica in seguito la propria password, non ci sarà alcuna possibilità di decifrare i propri dati cifrati.</p>
-      </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Abilita <span class="guibutton"><strong>Mostra impostazioni avanzate</strong></span>.</p>
-<p role="presentation">Fare clic su <span class="guibutton"><strong>Elimina ripristino della password</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Elimina ripristino</strong></span>.</p>
-</li>
-<li class="step"><p role="presentation">Fare clic sul pulsante <span class="guibutton"><strong>Elimina</strong></span>.</p></li>
-</ol></div>
-</div>
+<p> Nota: in base alla configurazione, alcune di queste funzioni potrebbero non essere disponibili.</p>
 <p id="ox.appsuite.user.related.guard.password">
       </p>
 <p class="title">Argomenti correlati:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestire le proprie chiavi PGP</a>
-          </p>
-<p role="presentation" class="cap-smime">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Gestire le proprie chiavi S/MIME</a>
-          </p>
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestire le chiavi pubbliche</a>
-          </p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di <span class="phrase">Guard</span></a>
+          </p></li>
+</ul>
 <p>
     </p>
 <p id="ox.appsuite.user.parent.guard.password">Argomento principale: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Cifrare dati con <span class="phrase">Guard</span></i></a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.password.reset.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.password.reset.html
new file mode 100644
index 000000000..d48bb65de
--- /dev/null
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.password.reset.html
@@ -0,0 +1,91 @@
+<html lang="it">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>ripristinare la password</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuale utente">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Gestione delle password">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.change.html" title="Cambiare la password">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Rimuovere la funzione di ripristino della password">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.change.html">Indietro</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Avanti</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Cifrare dati con <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Gestione delle password</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.reset">
+<div class="titlepage"><div><div><h3 class="title">ripristinare la password</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.7.2"></a><a class="indexterm" name="id-1.14.12.7.3"></a><p id="ox.appsuite.user.concept.guard.password.reset">Sono disponibili le seguenti opzioni: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Se si smarrisce la password di <span class="phrase">Guard</span>, è possibile richiedere una password temporanea di <span class="phrase">Guard</span> ripristinando la password di <span class="phrase">Guard</span>.</p></li>
+<li class="listitem"><p role="presentation">È possibile definire un indirizzo di posta per reimpostare la password.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.password.reset">
+<p class="title">Come ripristinare la password di <span class="phrase">Guard</span>:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Fare clic sull'icona <span class="guibutton"><strong>Impostazioni</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.reset"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> nella barra dei menu. Fare clic su <span class="guibutton"><strong>Tutte le impostazioni</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra. Fare clic su <span class="guibutton"><strong>Gestione delle password (PGP)</strong></span><span class="cap-smime"> o su <span class="guibutton"><strong>Gestione delle password (S/MIME)</strong></span></span> nel pannello di destra.</p>
+</li>
+<li class="step">
+<p role="presentation">Per impostare un indirizzo di posta elettronica secondario a cui inviare una password temporanea, fare clic su <span class="guibutton"><strong>Imposta l'indirizzo di posta per il ripristino</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Indirizzo di posta secondario</strong></span>.</p>
+<p role="presentation">Digitare la propria password attuale. Digitare l'indirizzo di posta che si desidera utilizzare per ripristinare la password.</p>
+</li>
+<li class="step">
+<p role="presentation">Fare clic su <span class="guibutton"><strong>Ripristina password</strong></span>. Si aprirà la finestra <span class="guilabel"><strong>Ripristina password</strong></span>.</p>
+<p role="presentation">Fare clic su <span class="guibutton"><strong>Ripristina</strong></span>.</p>
+</li>
+</ol></div>
+<div class="taskrelated">
+          <p>Risultato: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">Una nuova password sarà inviata all'indirizzo di posta secondario.</p>
+<p role="presentation">Se non è stato digitato un indirizzo di posta secondario, la nuova password sarà inviata all'indirizzo di posta principale.</p>
+</li>
+<li class="listitem"><p role="presentation">Questa nuova password è ora la propria password di sicurezza di <span class="phrase">Guard</span>. È consigliabile cambiare immediatamente questa password.</p></li>
+</ul>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.reset">
+        </p>
+<p class="title">Argomenti correlati:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Cambiare la password</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Rimuovere la funzione di ripristino della password</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.reset">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.guard.settings.html b/help/l10n/it_IT/ox.appsuite.user.sect.guard.settings.html
index cac66c4f0..4d9ad34f4 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.guard.settings.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.guard.settings.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Cifrare dati con Guard">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Gestire le chiavi pubbliche">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Gestire le chiavi S/MIME dei destinatari">
 <link rel="next" href="ox.appsuite.user.index.html" title="Indice analitico">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.index.html">Avanti</a></li>
@@ -44,84 +44,170 @@
 </li>
 <li class="step"><p role="presentation">Fare clic su <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> nel pannello di sinistra.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>Sarà visualizzata la pagina <span class="phrase"><span class="guilabel"><strong>Impostazioni di sicurezza di Guard</strong></span></span>.</p>
-      </div>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings">Sono disponibili le seguenti impostazioni:</p>
+<p id="ox.appsuite.user.reference.guard.settings">In base alla configurazione, sono disponibili le seguenti impostazioni:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.default">Impostazioni predefinite di <span class="phrase">Guard</span></a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.pgppasswords">Gestione delle password (PGP)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.smimepasswords">Gestione delle password (S/MIME)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yourpgpkeys">Le proprie chiavi PGP</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientpgpkeys">Chiavi PGP dei destinatari</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yoursmime">S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientsmime">Destinatari S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.advanced">Avanzate</a></p></li>
+</ul>
+<p>Vedere anche: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Ricerca delle impostazioni</a></p>
 <p id="ox.appsuite.user.reference.guard.settings.default"></p>
-<h3 class="title">Impostazioni predefinite</h3>
+<h3 class="title">Impostazioni predefinite di <span class="phrase">Guard</span>
+</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.encrypt"><b>Utilizzare in modo predefinito la cifratura quando si compone un messaggio di posta. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>Specifica se un nuovo messaggio di posta è cifrato in modo predefinito.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.sign"><b>Aggiungere in modo predefinito una firma ai messaggi di posta in uscita. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Specifica se un nuovo messaggio di posta è cifrato in modo predefinito.</p></li>
-<li class="listitem cap-smime" id="id-1.14.14.7.2.1.3">
-<p id="ox.appsuite.user.task.guard.settings.default.smime"><b>Utilizzo predefinito di S/MIME per la firma e la cifratura. </b><a class="indexterm" name="id-1.14.14.7.2.1.3.1.2"></a>
+<li class="listitem">
+<p id="ox.appsuite.user.reference.guard.settings.default.create"><b>Opzioni di composizione. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>
                 </p>
-<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p role="presentation">Definisce se S/MIME è utilizzato per la cifratura in modo predefinito. </p></li></ul>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.encrypt"><b>Utilizzare in modo predefinito la cifratura quando si compone un messaggio di posta. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.1.1.2"></a>Specifica se un nuovo messaggio di posta è cifrato in modo predefinito.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.sign"><b>Aggiungere in modo predefinito una firma ai messaggi di posta in uscita. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.2.1.2"></a>Specifica se un nuovo messaggio di posta è cifrato in modo predefinito.</p></li>
+<li class="listitem cap-smime" id="id-1.14.14.7.2.1.1.1.3.1.3">
+<p id="ox.appsuite.user.task.guard.settings.default.create.smime"><b>Utilizzo predefinito di S/MIME per la firma e la cifratura. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.3.1.2"></a>
+                        </p>
+<ul class="itemizedlist" style="list-style-type: square; "><li class="listitem"><p role="presentation">Definisce se S/MIME è utilizzato per la cifratura in modo predefinito.</p></li></ul>
 <p>
-              </p>
+                      </p>
 </li>
-<li class="listitem">
-<p id="ox.appsuite.user.task.guard.settings.default.inline"><b>Utilizzare PGP in linea in modo predefinito per i nuovi messaggi. </b><a class="indexterm" name="id-1.14.14.7.2.1.4.1.2"></a>Nota: questa funzionalità è disponibile solo se si abilita la casella di selezione <span class="guibutton"><strong>Impostazioni avanzate</strong></span>. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">Definisce se PGP/In linea viene utilizzato per la cifratura in modo predefinito.</p></li>
-<li class="listitem"><p role="presentation">Utilizzare queste impostazioni solo se il client di posta elettronica di un destinatario non supporta PGP. Con PGP/In linea, il destinatario può comunque decifrare il messaggio.</p></li>
-<li class="listitem"><p role="presentation">Se si utilizza questa impostazione, non sarà possibile inviare messaggi di posta in formato HTML.</p></li>
 </ul>
+<p>
+              </p>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Impostazione predefinita per Ricorda password. </b><a class="indexterm" name="id-1.14.14.7.2.1.5.1.2"></a>Specifica il valore predefinito dell'intervallo di tempo di <span class="phrase">Guard</span> per ricordare la password. È possibile modificare questa impostazione predefinita quando richiesto per la propria password di <span class="phrase">Guard</span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Impostazione predefinita per Ricorda password. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Specifica il valore predefinito dell'intervallo di tempo di <span class="phrase">Guard</span> per ricordare la password. È possibile modificare questa impostazione predefinita quando richiesto per la propria password di <span class="phrase">Guard</span>.</p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.pgppasswords"></p>
+<h3 class="title">Gestione delle password (PGP)</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funzioni per modificare o reimpostare la password PGP.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a></p></li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.reference.guard.settings.password"></p>
-<h3 class="title">Gestione delle password</h3>
+<div id="ox.appsuite.user.reference.guard.settings.smimepasswords" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.smimepasswords"></p>
+<h3 class="title">Gestione delle password (S/MIME)</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funzioni per cambiare o ripristinare la password.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funzioni per modificare o reimpostare la password S/MIME.</p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Gestione delle password</a></p></li>
 </ul>
 <p>
       </p>
-<div id="ox.appsuite.user.reference.guard.settings.smime" class="cap-smime">
-<p id="ox.appsuite.user.reference.guard.settings.smime"></p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.yourpgpkeys"></p>
+<h3 class="title">Le proprie chiavi PGP</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funzioni per la gestione delle proprie chiavi PGP.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Gestire le proprie chiavi PGP</a></p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.recipientpgpkeys"></p>
+<h3 class="title">Chiavi PGP dei destinatari</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funzioni per la gestione delle chiavi PGP dei destinatari.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Gestire le chiavi PGP dei destinatari</a></p></li>
+</ul>
+<p>
+      </p>
+<div id="ox.appsuite.user.reference.guard.settings.yoursmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.yoursmime"></p>
 <h3 class="title">S/MIME</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.smime.enable"><b>Abilita S/MIME. </b><a class="indexterm" name="id-1.14.14.9.2.1.1.1.2"></a>Definisce se è possibile inviare e ricevere messaggi di posta con cifratura S/MIME.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">Contiene funzioni per la gestione della cifratura di tipo S/MIME.</p>
+<p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a></p>
+</li></ul>
 <p>
       </p>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings.extended"></p>
+<div id="ox.appsuite.user.reference.guard.settings.recipientsmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.recipientsmime"></p>
+<h3 class="title">Destinatari S/MIME</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Contiene funzioni per visualizzare e aggiungere certificati dei destinatari di tipo S/MIME. </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a></p></li>
+</ul>
+<p>
+      </p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.advanced"></p>
 <h3 class="title">Avanzate</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<p id="ox.appsuite.user.reference.guard.settings.extended.advanced"><b>Impostazioni avanzate. </b><a class="indexterm" name="id-1.14.14.10.2.1.1.1.2"></a>Se <span class="guibutton"><strong>Mostra impostazioni avanzate</strong></span> è abilitata, saranno disponibili le seguenti impostazioni e funzioni. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
+<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Cache dei messaggi di posta elettronica</strong></span></p>
-<p role="presentation">Definisce se un messaggio di posta decifrato viene conservato nella cache del browser in un formato leggibile quando si visualizza un altro messaggio di posta o si passa a un'altra applicazione di groupware.</p>
-<p role="presentation">Per rimuovere il messaggio di posta decifrato dalla cache del browser, abilitare <span class="guibutton"><strong>Non mantenere i messaggi di posta decifrati.</strong></span>.</p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.email"><b>Mostrare le impostazioni avanzate per la composizione dei messaggi. </b>
+                </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<a class="indexterm" name="id-1.14.14.14.2.1.1.1.2.1.1.1"></a><p role="presentation">Se questa opzione è abilitata, è possibile utilizzare ulteriori opzioni quando si inviano messaggio di posta cifrati.</p>
+<p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Inviare messaggi di posta cifrati</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">La sezione <span class="guibutton"><strong>Chiavi</strong></span></p>
-<p role="presentation">Gestire le proprie chiavi, chiavi pubbliche o chiavi di Autocrypt.</p>
-<p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Gestione delle chiavi</a></p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.inline"><b>Utilizzare PGP in linea in modo predefinito per i nuovi messaggi. </b><a class="indexterm" name="id-1.14.14.14.2.1.2.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Definisce se PGP/In linea viene utilizzato per la cifratura in modo predefinito.</p></li>
+<li class="listitem"><p role="presentation">Utilizzare queste impostazioni solo se il client di posta elettronica di un destinatario non supporta PGP. Con PGP/In linea, il destinatario può comunque decifrare il messaggio.</p></li>
+<li class="listitem"><p role="presentation">Se si utilizza questa impostazione, non sarà possibile inviare messaggi di posta in formato HTML.</p></li>
+</ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">La sezione <span class="guibutton"><strong>Autocrypt</strong></span></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.autocrypt"><b>Impostazioni di Autocrypt. </b><a class="indexterm" name="id-1.14.14.14.2.1.3.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
 <p role="presentation">Configurare l'utilizzo di Autocrypt per i messaggi di posta in arrivo. Consente di trasferire le chiavi di Autocrypt ad altri client.</p>
 <p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">Cifrare le conversazioni di posta elettronica con Autocrypt</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Quando si inviano messaggi di posta cifrati, sono disponibili opzioni aggiuntive.</p>
-<p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Inviare messaggi di posta cifrati</a></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.cache"><b>Cache dei messaggi di posta elettronica. </b><a class="indexterm" name="id-1.14.14.14.2.1.4.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation">Definisce se un messaggio di posta decifrato viene conservato nella cache del browser in un formato leggibile quando si visualizza un altro messaggio di posta o si passa a un'altra applicazione di groupware.</p>
+<p role="presentation">Per rimuovere il messaggio di posta decifrato dalla cache del browser, abilitare <span class="guibutton"><strong>Non mantenere i messaggi di posta decifrati.</strong></span>.</p>
+</li></ul>
+<p>
+              </p>
 </li>
-</ul>
+<li class="listitem">
+<p id="ox.appsuite.user.task.guard.settings.advanced.reset"><b>Ripristinare le opzioni. </b><a class="indexterm" name="id-1.14.14.14.2.1.5.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation"><span class="guibutton"><strong>Elimina ripristino della password</strong></span>. Elimina la funzione per il recupero della password smarrita.</p>
+<p role="presentation"><span class="phrase"><strong>Avviso:</strong></span> se si rimuove la funzione per ripristinare la password, non sarà più possibile ripristinare la propria password. Se si dimentica in seguito la propria password, non ci sarà alcuna possibilità di decifrare i propri dati cifrati.</p>
+<p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Rimuovere la funzione di ripristino della password</a></p>
 </li></ul>
+<p>
+              </p>
+</li>
+</ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.guard.settings">Argomento principale: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Cifrare dati con <span class="phrase">Guard</span></i></a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.settings.commonsettings.html b/help/l10n/it_IT/ox.appsuite.user.sect.settings.commonsettings.html
index aa135203f..ffd89a3b7 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.settings.commonsettings.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.settings.commonsettings.html
@@ -165,9 +165,9 @@
               </p>
 </li>
 <li class="listitem cap-deputy" id="id-1.4.6.11.2.1.3">
-<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Gestire i delegati. </b>
+<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Gestisci i delegati. </b>
                 </p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Gestire i delegati</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Vedere <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">gestire i delegati</a></p></li></ul>
 <p>
               </p>
 </li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.settings.countdown.html b/help/l10n/it_IT/ox.appsuite.user.sect.settings.countdown.html
index 82693c9d1..fa6d806a8 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.settings.countdown.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.settings.countdown.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Impostazioni personalizzate">
 <link rel="prev" href="ox.appsuite.user.sect.settings.notifications.html" title="Personalizzare le notifiche">
-<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Utilizzare l'area di notifica">
+<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="utilizzare l'area di notifica">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.settings.notificationarea.html b/help/l10n/it_IT/ox.appsuite.user.sect.settings.notificationarea.html
index 3c6ae79a2..1e72a399b 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.settings.notificationarea.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.settings.notificationarea.html
@@ -1,7 +1,7 @@
 <html lang="it">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Utilizzare l'area di notifica</title>
+<title>utilizzare l'area di notifica</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Impostazioni personalizzate</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.notificationarea">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Utilizzare l'area di notifica</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">utilizzare l'area di notifica</h2></div></div></div>
 <a class="indexterm" name="id-1.4.9.2"></a><a class="indexterm" name="id-1.4.9.3"></a><p id="ox.appsuite.user.concept.settings.notificationarea">Si riceveranno notifiche nell'area di notifica per i seguenti eventi: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Promemoria per appuntamenti o attività imminenti</p></li>
@@ -62,9 +62,9 @@
 <li class="listitem"><p role="presentation">Per accettare o rifiutare un invito, fare clic sul pulsante relativo.</p></li>
 </ul></p>
 <p role="presentation" class="feat-io-ox-core-managedResources">Quando si ricevono richieste di prenotazione per risorse gestite, è possibile utilizzare le seguenti funzioni: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Per visualizzare le richieste di prenotazione nel calendario delle risorse, fare clic sulla data.</p></li>
-<li class="listitem"><p role="presentation">Per accettare o rifiutare una richiesta di prenotazione, fare clic sul pulsante relativo.</p></li>
-</ul></p>
+<li class="listitem"><p role="presentation">Per visualizzare la richiesta di prenotazione nel calendario delle risorse, fare clic sulla data.</p></li>
+<li class="listitem"><p role="presentation">Per accettare o rifiutare la richiesta di prenotazione, fare clic sul pulsante corrispondente.</p></li>
+</ul> </p>
 <p role="presentation">Se sono presenti attività scadute, è possibile utilizzare le seguenti funzioni: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Per mostrare i dettagli in una finestra a comparsa, fare clic sul promemoria.</p></li>
 <li class="listitem"><p role="presentation">Per modificare l'attività, utilizzare le funzioni nella finestra a comparsa.</p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.settings.notifications.html b/help/l10n/it_IT/ox.appsuite.user.sect.settings.notifications.html
index 192be3f96..16165d4be 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.settings.notifications.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.settings.notifications.html
@@ -60,7 +60,7 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>mostrare le notifiche del desktop. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Definisce se si riceverà una notifica sul desktop relativa ai messaggi di posta in arrivo se il groupware è in background.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>Mostrare le notifiche del desktop. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Definisce se si riceverà una notifica sul desktop relativa ai messaggi di posta in arrivo se il groupware è in background.</p></li>
 <li class="listitem">
 <p role="presentation">In base alle impostazioni del browser, il pulsante <span class="guibutton"><strong>Gestisci ora i permessi del browser</strong></span> sarà visualizzato. Fare clic sul pulsante. Si riceverà una richiesta dal browser se abilitare la ricezione delle notifiche. Accordare questo permesso.</p>
 <p role="presentation">Nota: in base al browser, potrebbe essere necessario consentire la ricezione di notifiche nelle impostazioni del browser affinché l'impostazione abbia effetto. Informazioni sono disponibili nelle pagine della guida del browser.</p>
@@ -74,7 +74,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.show"><b>Apri automaticamente l'area di notifica quando ci sono nuovi promemoria. </b><a class="indexterm" name="id-1.4.7.8.2.1.1.1.2"></a>Definisce se l'area di notifica si apre automaticamente quando si riceve un promemoria per un appuntamento o un'attività.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.birthdays"><b>Mostra i compleanni nell'area di notifica. </b>Definisce se l'area di notifica include anche i prossimi compleanni.</p></li>
 </ul>
-<p>Vedere <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Utilizzare l'area di notifica</a></p>
+<p>Vedere <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">utilizzare l'area di notifica</a></p>
 <p id="ox.appsuite.user.reference.settings.notifications.email"></p>
 <h3 class="title">posta elettronica</h3>
 <p>
@@ -98,9 +98,9 @@
 <p id="ox.appsuite.user.reference.settings.notifications.calendar.email"><b>Notifiche dei messaggi di posta. </b>Specifica se si riceverà un messaggio di notifica se è vera la seguente condizione: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.changes"><b>Ricevere notifiche quando un appuntamento al quale si partecipa viene creato, modificato o eliminato. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.1.1.2"></a>Un appuntamento al quale si partecipa è stata ricreato, cambiato o eliminato.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>ricevere una notifica come autore di un appuntamento quando i partecipanti accettano o rifiutano. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Un partecipante ha accettato o rifiutato un appuntamento creato da voi.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>Ricevere una notifica come autore di un appuntamento quando i partecipanti accettano o rifiutano. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Un partecipante ha accettato o rifiutato un appuntamento creato da voi.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>Ricevere una notifica come partecipante all'appuntamento quando altri partecipanti accettano o rifiutano. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>un partecipante ha accettato o rifiutato un appuntamento al quale si partecipa.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>eliminare automaticamente i messaggi di invito quando l'appuntamento è stato accettato o rifiutato. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Specifica se la notifica tramite messaggio di posta per gli inviti a un appuntamento sarà eliminata automaticamente quando si accetta o rifiuta l'appuntamento. Vedere <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Rispondere agli inviti di appuntamenti</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>Eliminare automaticamente il messaggio di invito dopo che l'appuntamento è stato accettato o rifiutato. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Specifica se la notifica tramite messaggio di posta per gli inviti a un appuntamento sarà eliminata automaticamente quando si accetta o rifiuta l'appuntamento. Vedere <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Rispondere agli inviti di appuntamenti</a></p></li>
 </ul>
 </li>
 </ul>
@@ -148,7 +148,7 @@
           </p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Utilizzare l'area di notifica</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">utilizzare l'area di notifica</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.settings.personaldata.html b/help/l10n/it_IT/ox.appsuite.user.sect.settings.personaldata.html
index 7c7807e01..5746e90e4 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.settings.personaldata.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.settings.personaldata.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Impostazioni personalizzate">
-<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Utilizzare l'area di notifica">
+<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="utilizzare l'area di notifica">
 <link rel="next" href="ox.appsuite.user.sect.settings.wizard.html" title="Utilizzare una procedura guidata per configurare le applicazioni locali">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.settings.search.html b/help/l10n/it_IT/ox.appsuite.user.sect.settings.search.html
index e92b27665..9094cdfd7 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.settings.search.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.settings.search.html
@@ -80,6 +80,9 @@
 <p role="presentation" class="cap-infostore">
             <a class="xref" href="ox.appsuite.user.sect.drive.settings.html">Le impostazioni di <span class="phrase">File</span></a>
           </p>
+<p role="presentation" class="cap-guard">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Impostazioni di <span class="phrase">Guard</span></a>
+          </p>
 </li>
 </ul>
 <p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.add.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.add.html
index b21ab8e70..e8ee62b6f 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.add.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.add.html
@@ -52,7 +52,7 @@
             <a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importare le attività</a>
           </p>
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">creare appuntamenti</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creare appuntamenti</a>
           </p>
 </li></ul>
 <p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.detailview.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.detailview.html
index f6b671db2..473b677ab 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.detailview.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.detailview.html
@@ -55,7 +55,7 @@
 <li class="listitem"><p role="presentation">L'oggetto dell'attività</p></li>
 <li class="listitem"><p role="presentation">La data del promemoria dell'attività, se impostata.</p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.7.10.4.1.5">
-<p role="presentation">Le categorie assegnate</p>
+<p role="presentation">le categorie assegnate</p>
 <p role="presentation">Un clic su una categoria cerca le attività assegnate a tale categoria.</p>
 </li>
 <li class="listitem"><p role="presentation">Se l'attività è un'attività ricorrente, saranno visualizzati i parametri di ricorrenza.</p></li>
@@ -70,7 +70,7 @@
 <li class="listitem"><p role="presentation">data iniziale</p></li>
 <li class="listitem"><p role="presentation">definizione</p></li>
 <li class="listitem"><p role="presentation">informazioni di fatturazione</p></li>
-<li class="listitem"><p role="presentation">allegati</p></li>
+<li class="listitem"><p role="presentation">Allegati</p></li>
 <li class="listitem">
 <p role="presentation">i nomi dei partecipanti</p>
 <p role="presentation">Facendo clic su un nome, si apre una finestra a comparsa. Mostra la <span class="guibutton"><strong>Vista Aura</strong></span> del partecipante.</p>
@@ -87,14 +87,11 @@
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista Elenco di <span class="phrase">Attività</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.create.html">La finestra di modifica</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Visualizzare le attività</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Visualizzare o salvare gli allegati delle attività</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">Chiamare i partecipanti a un'attività</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestire le attività</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Visualizzare i contatti nella vista Aura</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.gui.detailview">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">I componenti di <span class="phrase">Attività</span></a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.foldertree.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.foldertree.html
index ae4733781..11a4dd8db 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.foldertree.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.foldertree.html
@@ -59,6 +59,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Visualizzare le attività</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Aggiungere elenchi di attività</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestire le attività</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gestire i dati con le cartelle</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.list.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.list.html
index 0a6d5f0b7..b212dc49f 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.list.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.list.html
@@ -59,17 +59,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.list.html">La vista Elenco</a></p></li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.settingsmenu.html">Il menu delle impostazioni di <span class="phrase">Attività</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.detailview.html">La vista dettagliata di <span class="phrase">Attività</span></a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Visualizzare le attività</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Visualizzare o salvare gli allegati delle attività</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestire le attività</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.list">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">I componenti di <span class="phrase">Attività</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.settingsmenu.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
index 885fc4b91..af75e05c8 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
@@ -46,17 +46,14 @@
 <li class="listitem"><p role="presentation">Selezionare un tema per l'interfaccia utente</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Opzioni elenco</strong></span>. Definisce se ci saranno caselle di selezione visualizzate nella vista Elenco.</p></li>
 <li class="listitem"><p role="presentation">Sottoscrivi cartelle di attività condivise</p></li>
-<li class="listitem"><p role="presentation">In base alla configurazione: <span class="guibutton"><strong>Collega il tuo dispositivo</strong></span>. Avvia una procedura guidata per la configurazione di  applicazioni locali con cui è possibile accedere ai dati del groupware.</p></li>
+<li class="listitem"><p role="presentation">In base alla configurazione: <span class="guibutton"><strong>Collega il tuo dispositivo</strong></span>. Avvia una procedura guidata per la configurazione di applicazioni locali con cui è possibile accedere ai dati del groupware.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.tasks.gui.settingsmenu"></p>
 <p class="title">Descrizione generale dell'interfaccia utente:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.menubar.html">La barra dei menu</a></p></li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista Elenco di <span class="phrase">Attività</span></a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Sottoscrivere elenchi di attività pubblici e condivisi</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Sottoscrivere elenchi di attività pubblici e condivisi</a></p></li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.settingsmenu">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">I componenti di <span class="phrase">Attività</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.toolbar.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.toolbar.html
index 8a13422f3..a9bef3901 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.toolbar.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.gui.toolbar.html
@@ -60,13 +60,7 @@
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Modificare le attività</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Cambiare la data di scadenza di un'attività</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marcare le attività come completate</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Spostare le attività in un'altra cartella</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Cambiare le conferme delle attività</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Esportare le attività</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.print.html">Stampare le attività</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.delete.html">Eliminare le attività</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestire le attività</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.toolbar">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">I componenti di <span class="phrase">Attività</span></a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.categories.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.categories.html
new file mode 100644
index 000000000..7ce5e92c8
--- /dev/null
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="it">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Utilizzare le categorie per le attività</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Manuale utente">
+<link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Gestire le attività">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Cambiare la data di scadenza di un'attività">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Spostare le attività in un'altra cartella">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Indietro</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Avanti</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Attività</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Gestire le attività</h2>
+<div class="sect2" id="ox.appsuite.user.sect.tasks.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Utilizzare le categorie per le attività</h3></div></div></div>
+<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.categories">Per organizzare le attività indipendentemente dalle cartelle, è possibile utilizzare le categorie. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">È possibile contrassegnare le attività con categorie.</p></li>
+<li class="listitem"><p role="presentation">È possibile visualizzare tutte le attività contrassegnate con una categoria specifica.</p></li>
+</ul>
+<p> È possibile creare, modificare o eliminare le proprie categorie, vedere <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>.</p>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories">
+<p class="title">Come contrassegnare le attività con una categoria:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Selezionare un'attività. Fare clic sull'icona <span class="guibutton"><strong>Modifica contatto</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.mark.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> nella barra degli strumenti.</p>
+<p role="presentation">Si aprirà la finestra di modifica dell'attività.</p>
+</li>
+<li class="step">
+<p role="presentation">Per fare ciò, fare clic su <span class="guibutton"><strong>Aggiungi categoria</strong></span> accanto a <span class="guibutton"><strong>Categorie</strong></span>. Selezionare una categoria.</p>
+<p role="presentation">Per rimuovere una categoria dall'attività, fare clic sull'icona <span class="guibutton"><strong>Rimuovi categoria</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> accanto alla categoria.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories.view">
+<p class="title">Come visualizzare le attività contrassegnate con una categoria specifica:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selezionare un'attività contrassegnata da una categoria.</p></li>
+<li class="step"><p role="presentation">Fare clic sulla categoria nella vista dettagliata.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Risultato: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">La vista Elenco mostra tutte le attività contrassegnate con questa categoria.</p></li>
+<li class="listitem"><p role="presentation">Per visualizzare l'elenco precedente, fare clic sull'icona <span class="guibutton"><strong>Annulla la ricerca</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> nel campo di ricerca.</p></li>
+</ul>
+          <p>Suggerimento: è possibile anche utilizzare la funzione di ricerca per cercare una categoria utilizzando le opzioni di ricerca.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.tasks.manage.categories">
+        </p>
+<p class="title">Argomenti correlati:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Ricercare attività</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Utilizzare PGP in linea in modo predefinito per i nuovi messaggi</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Utilizzare le categorie per gli appuntamenti</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Utilizzo delle categorie per i contatti</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.tasks.manage.categories">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestire le attività</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.changeduedate.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.changeduedate.html
index 1e1693ec5..cc644e53d 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.changeduedate.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.changeduedate.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Gestire le attività">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="Marcare le attività come completate">
-<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Spostare le attività in un'altra cartella">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Utilizzare le categorie per le attività">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Avanti</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Avanti</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -48,7 +48,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changeduedate"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Attività</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Attività</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista Elenco di <span class="phrase">Attività</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.changestatus.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.changestatus.html
index c8e601196..29f0b9e2f 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.changestatus.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.changestatus.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire le attività</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.changestatus">
 <div class="titlepage"><div><div><h3 class="title">Cambiare le conferme delle attività</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.10.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Se si è un partecipante all'attività, è possibile cambiare in seguito lo stato di conferma per questa attività. È possibile aggiungere un commento visibile agli altri partecipanti all'attività.</p>
+<a class="indexterm" name="id-1.10.15.11.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Se si è un partecipante all'attività, è possibile cambiare in seguito lo stato di conferma per questa attività. È possibile aggiungere un commento visibile agli altri partecipanti all'attività.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.changestatus">
 <p class="title">Come cambiare la propria conferma:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changestatus"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Attività</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Attività</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista Elenco di <span class="phrase">Attività</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.delete.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.delete.html
index 30775c192..14c514326 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.delete.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire le attività</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Eliminare le attività</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Avviso:</strong></span> le attività eliminate, <span class="phrase"><strong>non</strong></span> possono essere ripristinate.</p>
+<a class="indexterm" name="id-1.10.15.15.2"></a><a class="indexterm" name="id-1.10.15.15.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Avviso:</strong></span> le attività eliminate, <span class="phrase"><strong>non</strong></span> possono essere ripristinate.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.delete">
 <p class="title">Come eliminare le attività:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -50,9 +50,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.delete">
         </p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Attività</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista Elenco di <span class="phrase">Attività</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.delete">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestire le attività</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.export.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.export.html
index d1312ace2..3b235a339 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.export.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire le attività</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Esportare le attività</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">È possibile esportare le attività nel formato iCal. È possibile ad es. utilizzare questo formato per scambiare attività con altre applicazioni di calendario. È possibile esportare singole attività o tutte le attività da una cartella.</p>
+<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><a class="indexterm" name="id-1.10.15.13.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">È possibile esportare le attività nel formato iCal. È possibile ad es. utilizzare questo formato per scambiare attività con altre applicazioni di calendario. È possibile esportare singole attività o tutte le attività da una cartella.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.export.selected">
 <p class="title">Come esportare singole attività:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -63,12 +63,16 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.export"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Attività</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Attività</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Attività</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista Elenco di <span class="phrase">Attività</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importare le attività</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.10.15.12.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Scaricare i dati personali</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.10.15.13.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Scaricare i dati personali</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.manage.export">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestire le attività</a></p>
 </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.html
index 448fd0efc..dfe62d1c6 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marcare le attività come completate</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Cambiare la data di scadenza di un'attività</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utilizzare le categorie per le attività</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Spostare le attività in un'altra cartella</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Cambiare le conferme delle attività</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importare le attività</a></p></li>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.import.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.import.html
index c344b83e0..fa8bf875e 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.import.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire le attività</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importare le attività</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.11.2"></a><a class="indexterm" name="id-1.10.15.11.3"></a><a class="indexterm" name="id-1.10.15.11.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">È possibile importare attività da file nel formato iCal.</p>
+<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">È possibile importare attività da file nel formato iCal.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.import">
 <p class="title">Come importare attività da un file iCal:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,19 +54,15 @@
           <p>Risultato: le attività sono aggiunte alla cartella.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.tasks.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.tasks.manage.import"></p>
+<p class="title">Interfaccia utente:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Attività</span></a></p></li></ul>
+<p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Esportare le attività</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Creare le attività</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Esportare le attività</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Creare le attività</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.tasks.manage.import">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestire le attività</a></p>
 </div>
           </div>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.markasdone.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.markasdone.html
index 18c7b69f9..12875ef28 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.markasdone.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.markasdone.html
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.markasdone"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Attività</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Attività</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista Elenco di <span class="phrase">Attività</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.move.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.move.html
index 08c485699..cc12959dc 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.move.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.move.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Manuale utente">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Gestire le attività">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Cambiare la data di scadenza di un'attività">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Utilizzare le categorie per le attività">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.changestatus.html" title="Cambiare le conferme delle attività">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Nota Legale">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Cambiar la navegación</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Indietro</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Indietro</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Inizio</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Sommario</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Avanti</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire le attività</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Spostare le attività in un'altra cartella</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">È possibile spostare le attività in un'altra cartella.</p>
+<a class="indexterm" name="id-1.10.15.10.2"></a><a class="indexterm" name="id-1.10.15.10.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">È possibile spostare le attività in un'altra cartella.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.move">
 <p class="title">Come spostare le attività in un'altra cartella:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 <p id="ox.appsuite.user.tip.tasks.manage.move">Suggerimento: è possibile inoltre spostare gli oggetti selezionati trascinandoli dalla vista delle cartelle a una cartella.</p>
 <p id="ox.appsuite.user.related.tasks.manage.move"></p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Attività</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">La vista delle cartelle di <span class="phrase">Attività</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Attività</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista Elenco di <span class="phrase">Attività</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">Argomenti correlati:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">Aggiungere elenchi di attività personali</a></p></li></ul>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.print.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.print.html
index 3ccaf96c9..6da58fec0 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.print.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Gestire le attività</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Stampare le attività</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">È possibile stampare i dati di una singola attività o di più attività.</p>
+<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">È possibile stampare i dati di una singola attività o di più attività.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.print.data">
 <p class="title">Come stampare i dati di un'attività:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,9 +51,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.print">
         </p>
 <p class="title">Interfaccia utente:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">La barra degli strumenti di <span class="phrase">Attività</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">La vista Elenco di <span class="phrase">Attività</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.print">Argomento principale: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Gestire le attività</a></p>
diff --git a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.search.html b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.search.html
index b2d52a9e5..e7d1a18ff 100644
--- a/help/l10n/it_IT/ox.appsuite.user.sect.tasks.search.html
+++ b/help/l10n/it_IT/ox.appsuite.user.sect.tasks.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Visualizzare le attività</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Gestire le categorie</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Utilizzare le categorie per le attività</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/ja_JP/bk01-toc.html b/help/l10n/ja_JP/bk01-toc.html
index 2661afb73..cb25bed48 100644
--- a/help/l10n/ja_JP/bk01-toc.html
+++ b/help/l10n/ja_JP/bk01-toc.html
@@ -124,7 +124,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.new.html">新規メール ボタン</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">メール</span> フォルダービュー</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">The <span class="phrase">メール</span> タブバー</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">受信カテゴリバー</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.popup.html"><span class="phrase">メール</span> ポップアップ</a></li>
@@ -136,11 +136,11 @@
 <li class="sect1 cap-webmail">
 <a href="ox.appsuite.user.sect.email.send.html">メールの送信</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">新規メールの送信</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択する</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.replyto.html">返信先アドレスを設定</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルの追加</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルを追加</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachmentexisting.html">既存メールから添付ファイルを追加</a></li>
-<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">リンクとして添付ファイルを送信する</a></li>
+<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">リンクとして添付ファイルを送信する:</a></li>
 <li class="sect2 feat-io-ox-core-templates"><a href="ox.appsuite.user.sect.email.send.templates.html">テンプレートの使用</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.signatures.html">署名を使用</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.reply.html">メールの返信</a></li>
@@ -164,6 +164,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.movecopy.html">メールの移動またはコピー</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.mark.html">メールを既読、未読にする</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.collectaddress.html">アドレスの収集</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">新規メールにインライン PGP 使用を既定にする</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.label.html">メールの分類</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.source.html">メールのソースの表示</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.draft.html">メールの下書きの使用</a></li>
@@ -175,6 +176,9 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.print.html">メールの印刷</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.archive.html">メールのアーカイブ</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.delete.html">メールの削除</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.recover.html">メールの復元</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.deleteforever.html">メールの削除</a></li>
+<li class="sect2 cap-dumpster"><a href="ox.appsuite.user.sect.email.manage.undelete.html">完全に削除されたメールを復元する</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.expungefolder.html">メールフォルダーのクリーンアップ</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.unifiedmail.html">統合メールの使用</a></li>
 </ul>
@@ -258,6 +262,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changereminder.html">予定のアラームを変更</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">開催者を変更</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.timezones.html">お気に入りのタイムゾーンの管理</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">予定にカテゴリを使用する</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.colors.html">予定表の色を使用する</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.move.html">別の予定表への予定の移動</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.import.html">予定をインポート</a></li>
@@ -340,6 +345,7 @@
 <a href="ox.appsuite.user.sect.contacts.manage.html">連絡先の管理</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.contacts.manage.sendmail.html">アドレス帳からのメールの送信</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">予定への出席を連絡先に依頼</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">連絡先にカテゴリを使用</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.movecopy.html">連絡先の移動またはコピー</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">vCard での連絡先の送信</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.import.html">連絡先のインポート</a></li>
@@ -388,6 +394,7 @@
 <a href="ox.appsuite.user.sect.tasks.manage.html">タスクの管理</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.markasdone.html">タスクに完了の印を付ける</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">タスクの終了日時の変更</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">タスクにカテゴリを使用する</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.move.html">別のフォルダーへのタスクの移動</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changestatus.html">タスクのステータスの変更</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.import.html">タスクをインポート</a></li>
@@ -547,19 +554,26 @@
 </ul>
 </li>
 <li class="sect1 cap-guard">
-<a href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントの暗号化</a><ul>
+<a href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントを暗号化</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.createencrypted.html">新しい暗号化ドキュメントの作成</a></li>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">選択したドキュメントを暗号化形式に保存します。</a></li>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.open.html">暗号化されたドキュメントを表示する</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.logout.html"><span class="phrase">Guard</span>からのログアウト</a></li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a></li>
+<li class="sect1 cap-guard">
+<a href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a><ul>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.change.html">パスワードの変更</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.reset.html">パスワードのリセット</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.deleterecovery.html">パスワードリセット機能を削除する</a></li>
+</ul>
+</li>
 <li class="sect1 cap-guard">
 <a href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">自分のPGP鍵を管理する</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">受取人のPGP鍵を管理する</a></li>
 <li class="sect2 cap-smime"><a href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">自分のS/MIME鍵を管理する</a></li>
-<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">公開鍵を管理する</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">受取人のS/MIME鍵を管理する</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> 設定</a></li>
diff --git a/help/l10n/ja_JP/index.html b/help/l10n/ja_JP/index.html
index 83e7e6899..20fb1df30 100644
--- a/help/l10n/ja_JP/index.html
+++ b/help/l10n/ja_JP/index.html
@@ -31,7 +31,7 @@
 <div><h1 class="title">ユーザ ガイド</h1></div>
 <div><p class="copyright">製作著作 ©  OX Software GmbH </p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">法律上の通知</a></div>
-<div><p class="pubdate">火曜日, 14. 11 月 2023 バージョン 8.19.0 </p></div>
+<div><p class="pubdate">木曜日, 21. 12 月 2023 バージョン 8.20.0 </p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">ヘルプ内容の概要</h2>
@@ -64,6 +64,13 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">アカウントの管理</a></p></li>
 </ul>
 </li>
+<li class="listitem" id="ox.appsuite.user.startpage.toc.keyboard" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.chap.keyboard.html"><i>キーボード入力</i></a></p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.keyboard.navigation.html">キーボードのナビゲーションを使用する</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.keyboard.shortkeys.html">キーボードショートカットを使用する</a></p></li>
+</ul>
+</li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.portal" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.chap.portal.html"><i><span class="phrase">ポータル</span></i></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -78,15 +85,15 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">メール</span>構成</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">メールを表示する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">メールの送信</a></p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.1.5.2.2.1.5.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">AI 統合の使用</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.5.2.2.1.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">送信者または別の受取人に通話</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.1.5.2.2.1.6.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">AI 統合の使用</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.5.2.2.1.6.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">送信者または別の受取人に通話</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">メールフォルダーを追加</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">メールフィルタの使用</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">メールの検索</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.5.2.2.1.5.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">代理としてメールを送信または受信する</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.5.2.2.1.6.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">代理としてメールを送信または受信する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">メールアカウントを追加</a></p></li>
-<li class="listitem cap-webmail" id="id-1.1.5.2.2.1.5.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">メール設定</a></p></li>
+<li class="listitem cap-webmail" id="id-1.1.5.2.2.1.6.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">メール設定</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-calendar" id="ox.appsuite.user.startpage.toc.calendar">
@@ -97,16 +104,16 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">予定の作成</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">予定への招待の回答</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">予定の編集</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.5.2.2.1.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">予定の参加者に通話する</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.5.2.2.1.7.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">予定の参加者に通話する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.html">予定表を追加する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">予定の管理</a></p></li>
-<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.5.2.2.1.6.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">リソースカレンダーを使用</a></p></li>
+<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.5.2.2.1.7.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">リソースカレンダーを使用</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">予定の検索</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.5.2.2.1.6.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">代理として予定を作成、編集、または管理する</a></p></li>
-<li class="listitem cap-edit_group" id="id-1.1.5.2.2.1.6.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">グループを使用</a></p></li>
-<li class="listitem cap-edit_resource" id="id-1.1.5.2.2.1.6.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">リソースを使用</a></p></li>
-<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.5.2.2.1.6.1.15"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">管理リソースを使用</a></p></li>
-<li class="listitem cap-calendar" id="id-1.1.5.2.2.1.6.1.16"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">予定表の設定</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.5.2.2.1.7.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">代理として予定を作成、編集、または管理する</a></p></li>
+<li class="listitem cap-edit_group" id="id-1.1.5.2.2.1.7.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">グループを使用</a></p></li>
+<li class="listitem cap-edit_resource" id="id-1.1.5.2.2.1.7.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">リソースを使用</a></p></li>
+<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.5.2.2.1.7.1.15"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">管理リソースを使用</a></p></li>
+<li class="listitem cap-calendar" id="id-1.1.5.2.2.1.7.1.16"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">予定表の設定</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-contacts" id="ox.appsuite.user.startpage.toc.contacts">
@@ -115,16 +122,16 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">アドレス帳</span>構成</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">アドレス帳の連絡先を表示する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">アドレス帳から連絡先またはリソースを自動で追加する</a></p></li>
-<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.5.2.2.1.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">アドレスディレクトリから連絡先またはリソースを自動で追加する</a></p></li>
+<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.5.2.2.1.8.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">アドレスディレクトリから連絡先またはリソースを自動で追加する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">連絡先の追加</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.html">連絡先グループの追加</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">連絡先または連絡先グループを編集する</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.5.2.2.1.7.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">連絡先に通話する</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.5.2.2.1.8.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">連絡先に通話する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">アドレス帳の追加</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.managesubscribed.html">アドレス帳登録の更新および管理</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">連絡先の管理</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">連絡先の検索</a></p></li>
-<li class="listitem cap-contacts" id="id-1.1.5.2.2.1.7.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">アドレス帳の設定</a></p></li>
+<li class="listitem cap-contacts" id="id-1.1.5.2.2.1.8.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">アドレス帳の設定</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-tasks" id="ox.appsuite.user.startpage.toc.tasks">
@@ -151,18 +158,18 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">ファイルと <span class="phrase">ドライブ</span> フォルダーを整理する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.search.html">ファイルまたはフォルダの検索</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">ストレージアカウントを追加する</a></p></li>
-<li class="listitem cap-infostore" id="id-1.1.5.2.2.1.9.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">ドライブ</span> 設定</a></p></li>
+<li class="listitem cap-infostore" id="id-1.1.5.2.2.1.10.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">ドライブ</span> 設定</a></p></li>
 </ul>
 </li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.dataorganisation" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>データの整理と共有</i></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">フォルダーでデータを管理</a></p></li>
-<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.5.2.2.1.10.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">共有データ</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.5.2.2.1.10.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">代理を管理する</a></p></li>
+<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.5.2.2.1.11.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">共有データ</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.5.2.2.1.11.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">代理を管理する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">アカウントの管理</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.1.5.2.2.1.10.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.1.5.2.2.1.10.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">個人データをダウンロード</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.1.5.2.2.1.11.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.1.5.2.2.1.11.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">個人データをダウンロード</a></p></li>
 </ul>
 </li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.security" style="list-style-type: none">
@@ -171,7 +178,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">自動サインアウト</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.emaillinkedimages.html">メールに外部リンク先の画像</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.sessions.html">アクティブクライアントの表示またはログアウト</a></p></li>
-<li class="listitem cap-multifactor" id="id-1.1.5.2.2.1.11.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">多要素認証</a></p></li>
+<li class="listitem cap-multifactor" id="id-1.1.5.2.2.1.12.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">多要素認証</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-guard" id="ox.appsuite.user.startpage.toc.guard">
@@ -181,7 +188,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.html">メールのやり取りを暗号化する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">Autocryptを使ってメールのやり取りを暗号化する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">ファイルの暗号化または復号化</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントの暗号化</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントを暗号化</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.logout.html"><span class="phrase">Guard</span>からのログアウト</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.chap.calendar.html b/help/l10n/ja_JP/ox.appsuite.user.chap.calendar.html
index 655527697..2f9872d22 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.chap.calendar.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.chap.calendar.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="index.html" title="ユーザ ガイド">
-<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="メール設定">
+<link rel="prev" href="ox.appsuite.user.sect.email.mailfilter.apply.html" title="ルールを既存のメールに適用する">
 <link rel="next" href="ox.appsuite.user.sect.calendar.gui.html" title="カレンダー 構成">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.mailfilter.apply.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.gui.html">次へ</a></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/ja_JP/ox.appsuite.user.chap.dataorganisation.html
index 1d37c506c..42444b9c0 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.chap.dataorganisation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="index.html" title="ユーザ ガイド">
-<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="Windows環境での WebDAV のセットアップ">
+<link rel="prev" href="ox.appsuite.user.sect.drive.settings.html" title="ドライブ 設定">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.folder.html" title="フォルダーでデータを管理">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.settings.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.folder.html">次へ</a></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.chap.drive.html b/help/l10n/ja_JP/ox.appsuite.user.chap.drive.html
index 81fdb778d..acff6ecda 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.chap.drive.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="index.html" title="ユーザ ガイド">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.search.html" title="タスクの検索">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.delete.html" title="タスクの削除">
 <link rel="next" href="ox.appsuite.user.sect.drive.gui.html" title="The ドライブ 構成">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.search.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.delete.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.drive.gui.html">次へ</a></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.chap.guard.html b/help/l10n/ja_JP/ox.appsuite.user.chap.guard.html
index 4f317ada0..dc054cfd7 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.chap.guard.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="index.html" title="ユーザ ガイド">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="検証方法を管理する">
+<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="自動サインアウト">
 <link rel="next" href="ox.appsuite.user.sect.guard.setup.html" title="Guardの設定">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.autologout.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.setup.html">次へ</a></li>
@@ -45,7 +45,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.html">メールのやり取りを暗号化する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">Autocryptを使ってメールのやり取りを暗号化する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">ファイルの暗号化または復号化</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントの暗号化</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントを暗号化</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.logout.html"><span class="phrase">Guard</span>からのログアウト</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.chap.security.html b/help/l10n/ja_JP/ox.appsuite.user.chap.security.html
index 3e7e4ab68..5ad7eb7a9 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.chap.security.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.chap.security.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="index.html" title="ユーザ ガイド">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="アカウントの表示、編集、削除">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="個人データをダウンロード">
 <link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="アクティブクライアントの表示またはログアウト">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">次へ</a></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.chap.tasks.html b/help/l10n/ja_JP/ox.appsuite.user.chap.tasks.html
index 5ece15a8e..8e3626e36 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.chap.tasks.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.chap.tasks.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="index.html" title="ユーザ ガイド">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="アドレス帳の設定">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.delete.html" title="連絡先の削除">
 <link rel="next" href="ox.appsuite.user.sect.tasks.gui.html" title="タスク 構成">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.settings.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.delete.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.gui.html">次へ</a></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.index.html b/help/l10n/ja_JP/ox.appsuite.user.index.html
index 83e6f0f3e..fd14efeb3 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.index.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="index.html" title="ユーザ ガイド">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="Guard 設定">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="受取人のS/MIME鍵を管理する">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -21,7 +21,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.settings.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 </ul></div>
@@ -154,12 +154,12 @@
 </dt>
 <dt class="cap-contacts">vCard フォーマットの連絡先, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">連絡先のインポート</a>
 </dt>
-<dt class="cap-calendar">カレンダー, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">ファイルから予定表をインポートする</a>
-</dt>
 <dt class="cap-webmail">メール, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">メールのインポート</a>
 </dt>
 <dt class="cap-calendar">予定, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">予定をインポート</a>
 </dt>
+<dt class="cap-calendar">予定表, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">ファイルから予定表をインポートする</a>
+</dt>
 <dt class="cap-tasks">仕事, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">タスクをインポート</a>
 </dt>
 </dl></dd>
@@ -177,14 +177,20 @@
 <dt class="">カスタム設定, <a class="indexterm" href="ox.appsuite.user.chap.settings.html">カスタム設定</a>
 </dt>
 <dt class="feat-io-ox-core-categories">カテゴリ</dt>
-<dd><dl><dt class="feat-io-ox-core-categories">管理, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="feat-io-ox-core-categories">タスクに使用, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">タスクにカテゴリを使用する</a>
+</dt>
+<dt class="feat-io-ox-core-categories">メールに使用, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">新規メールにインライン PGP 使用を既定にする</a>
+</dt>
+<dt class="feat-io-ox-core-categories">管理, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a>
+</dt>
+<dt class="feat-io-ox-core-categories">連絡先に使用, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">予定にカテゴリを使用する</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">連絡先にカテゴリを使用</a>
+</dt>
+</dl></dd>
 <dt class="cap-calendar">カレンダー, <a class="indexterm" href="ox.appsuite.user.chap.calendar.html">カレンダー</a>
 </dt>
 <dd><dl>
-<dt class="cap-calendar_google">Googleカレンダーに登録, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Googleカレンダーに登録する</a>
-</dt>
-<dt class="cap-calendar">インポート, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">ファイルから予定表をインポートする</a>
+<dt class="feat-io-ox-core-categories">カテゴリを使用, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">予定にカテゴリを使用する</a>
 </dt>
 <dt class="cap-calendar">カレンダービュー, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.calendarview.html">日、稼働日、週、月、年 の予定表ビュー</a>
 </dt>
@@ -221,9 +227,6 @@
 <dt class="cap-calendar">詳細ビュー, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.detailview.html">カレンダー 詳細ビュー</a>
 </dt>
 </dl></dd>
-<dt class="cap-calendar">カレンダーの設定</dt>
-<dd><dl><dt class="cap-calendar">辞退した予定の表示, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">予定表の設定</a>
-</dt></dl></dd>
 <dt class="">カレンダー設定</dt>
 <dd><dl>
 <dt class="cap-calendar">Jitsi 会議, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">予定表の設定</a>
@@ -314,7 +317,7 @@
 </dt>
 <dt class="cap-guard">Guard 設定, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
 </dt>
-<dt class="cap-guard">Office ドキュメントを暗号化, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントの暗号化</a>
+<dt class="cap-guard">Office ドキュメントを暗号化, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントを暗号化</a>
 </dt>
 <dt class="">アクティブクライアントの表示またはログアウト, <a class="indexterm" href="ox.appsuite.user.sect.security.sessions.html">アクティブクライアントの表示またはログアウト</a>
 </dt>
@@ -345,6 +348,8 @@
 </dt>
 <dt class="cap-tasks">エクスポート, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.export.html">タスクのエクスポート</a>
 </dt>
+<dt class="feat-io-ox-core-categories">カテゴリを使用, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">タスクにカテゴリを使用する</a>
+</dt>
 <dt class="cap-tasks cap-switchboard">タスクの参加者に通話, <a class="indexterm" href="ox.appsuite.user.sect.tasks.call.html">タスクの参加者に通話する</a>
 </dt>
 <dt class="cap-tasks">タスクリストの追加, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.html">タスクリストを追加する</a>
@@ -522,9 +527,9 @@
 </dt>
 <dt class="">パスワード</dt>
 <dd><dl>
-<dt class="cap-guard">Guard パスワードをリセット, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a>
+<dt class="cap-guard">Guard パスワードをリセット, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">パスワードのリセット</a>
 </dt>
-<dt class="cap-guard">Guard パスワードを変更, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a>
+<dt class="cap-guard">Guard パスワードを変更, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">パスワードの変更</a>
 </dt>
 <dt class="">アプリケーションパスワードを使用, <a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">アプリケーションパスワードを使用する</a>
 </dt>
@@ -754,12 +759,12 @@
 </dt>
 <dt class="cap-webmail">アーカイブ, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">メールのアーカイブ</a>
 </dt>
+<dt class="feat-io-ox-core-categories">カテゴリを使用, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">新規メールにインライン PGP 使用を既定にする</a>
+</dt>
 <dt class="cap-webmail">カラー を割り当てる, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">メールの分類</a>
 </dt>
 <dt class="cap-webmail">コピー, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">メールの移動またはコピー</a>
 </dt>
-<dt class="cap-webmail">タブバー, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">The メール タブバー</a>
-</dt>
 <dt class="cap-webmail">ツールバー, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.toolbar.html">メールツールバー</a>
 </dt>
 <dt class="feat-io-ox-core-templates">テンプレートの使用, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">テンプレートの使用</a>
@@ -786,7 +791,7 @@
 </dt>
 <dt class="cap-webmail">リストビュー, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.list.html">The メール リストビュー</a>
 </dt>
-<dt class="cap-infostore">リンクとして添付ファイルを送信, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">リンクとして添付ファイルを送信する</a>
+<dt class="cap-infostore">リンクとして添付ファイルを送信, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">リンクとして添付ファイルを送信する:</a>
 </dt>
 <dt class="cap-webmail">下書きを使用, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">メールの下書きの使用</a>
 </dt>
@@ -804,13 +809,21 @@
 </dt>
 <dt class="cap-webmail">印刷, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">メールの印刷</a>
 </dt>
+<dt class="cap-webmail">受信カテゴリバー, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">受信カテゴリバー</a>
+</dt>
 <dt class="cap-webmail">受信トレイのカテゴリ, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">受信トレイのカテゴリの使い方</a>
 </dt>
 <dt class="cap-guard">受信メールを暗号化, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">フィルタールールを使用して受信メールを暗号化する</a>
 </dt>
 <dt class="">外部画像, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">メールに外部リンク先の画像</a>
 </dt>
-<dt class="cap-webmail">差出人アドレスの選択, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択する</a>
+<dt class="cap-webmail">完全に削除, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">メールの削除</a>
+</dt>
+<dt class="cap-dumpster">完全に削除されたメールを復元, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">完全に削除されたメールを復元する</a>
+</dt>
+<dt class="cap-webmail">差出人アドレスの選択, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択</a>
+</dt>
+<dt class="cap-webmail">復元, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">メールの復元</a>
 </dt>
 <dt class="cap-webmail">新規メールボタン, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.new.html">新規メール ボタン</a>
 </dt>
@@ -838,7 +851,7 @@
 </dt>
 <dt class="cap-infostore">添付ファイルを表示, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">ドライブにメール添付ファイルを表示する</a>
 </dt>
-<dt class="cap-webmail">添付ファイルを追加, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルの追加</a>
+<dt class="cap-webmail">添付ファイルを追加, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルを追加</a>
 </dt>
 <dt class="cap-webmail">移動, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">メールの移動またはコピー</a>
 </dt>
@@ -911,6 +924,8 @@
 </dt>
 <dt class="cap-webmail">すべてフラグ付きメッセージのフォルダーを表示, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">メール設定</a>
 </dt>
+<dt class="cap-webmail">カテゴリを表示, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">メール設定</a>
+</dt>
 <dt class="cap-webmail">ダイアログを作成, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">メール設定</a>
 </dt>
 <dt class="cap-webmail">テキストプレビューを表示, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">メール設定</a>
@@ -923,7 +938,7 @@
 </dt>
 <dt class="cap-webmail">メーリングリストに返信する前に確認, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">メール設定</a>
 </dt>
-<dt class="cap-webmail">メールの転送方法, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">メール設定</a>
+<dt class="cap-webmail">メールの転送, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">メール設定</a>
 </dt>
 <dt class="cap-webmail">メールを常にBCCで送信, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">メール設定</a>
 </dt>
@@ -1095,6 +1110,8 @@
 </dt>
 <dt class="">カウントダウンを使用, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">通知のカスタマイズ</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">予定にカウントダウンを使用する</a>
 </dt>
+<dt class="feat-io-ox-core-categories">カテゴリを使用, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">予定にカテゴリを使用する</a>
+</dt>
 <dt class="cap-calendar">カレンダーの色を使用する, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">予定表の色を使用する</a>
 </dt>
 <dt class="cap-calendar">スケジューリングビューの使用, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">スケジューリングビューの使用</a>
@@ -1176,8 +1193,12 @@
 </dt>
 <dt class="cap-calendar">予定表</dt>
 <dd><dl>
+<dt class="cap-calendar_google">Googleカレンダーに登録, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Googleカレンダーに登録する</a>
+</dt>
 <dt class="cap-calendar">iCalカレンダーに登録, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">iCal URLから外部カレンダーに登録</a>
 </dt>
+<dt class="cap-calendar">インポート, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">ファイルから予定表をインポートする</a>
+</dt>
 <dt class="cap-calendar">スケジューリングビューの使用, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">スケジューリングビューの使用</a>
 </dt>
 <dt class="cap-calendar">ミニ予定表, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">ミニ予定表</a>
@@ -1197,6 +1218,8 @@
 </dt>
 <dt class="">参加者が承諾または辞退した場合に予定作成者として通知を受信, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">通知のカスタマイズ</a>
 </dt>
+<dt class="cap-calendar">辞退した予定の表示, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">予定表の設定</a>
+</dt>
 </dl></dd>
 <dt class="cap-share_links cap-share_mail_attachments">仕事</dt>
 <dd><dl><dt class="cap-share_links cap-share_mail_attachments">共有、共有を参照, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">共有データ</a>
@@ -1282,7 +1305,7 @@
 </dt>
 <dt class="">フォルダー, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.delete.html">フォルダーの削除</a>
 </dt>
-<dt class="cap-webmail">メール, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">メールの削除</a>
+<dt class="cap-webmail">メール, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">メールの削除</a>, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">メールの削除</a>
 </dt>
 <dt class="cap-calendar">予定, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.delete.html">予定の削除</a>
 </dt>
@@ -1336,6 +1359,13 @@
 </dl></dd>
 <dt class="">定義, <a class="indexterm" href="ox.appsuite.user.sect.about.glossary.html">用語</a>
 </dt>
+<dt class="cap-webmail">復元</dt>
+<dd><dl>
+<dt class="cap-webmail">メール, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">メールの復元</a>
+</dt>
+<dt class="cap-dumpster">完全に削除されたメールを復元, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">完全に削除されたメールを復元する</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">新規</dt>
 <dd><dl>
 <dt class="cap-contacts">アドレス帳, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.html">アドレス帳の追加</a>
@@ -1398,7 +1428,7 @@
 <dd><dl>
 <dt class="cap-guard">Autocryptを使ったメール, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.html">Autocryptを使ってメールのやり取りを暗号化する</a>
 </dt>
-<dt class="cap-guard">Office ドキュメントを暗号化, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントの暗号化</a>
+<dt class="cap-guard">Office ドキュメントを暗号化, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントを暗号化</a>
 </dt>
 <dt class="cap-guard">ファイル, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.html">ファイルの暗号化または復号化</a>, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.encrypt.html">ファイルの暗号化</a>
 </dt>
@@ -1473,7 +1503,7 @@
 </dt>
 <dt class="cap-webmail">添付ファイルを追加</dt>
 <dd><dl>
-<dt class="cap-webmail">メール, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルの追加</a>
+<dt class="cap-webmail">メール, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルを追加</a>
 </dt>
 <dt class="cap-calendar">予定, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">添付ファイルの追加</a>
 </dt>
@@ -1670,6 +1700,8 @@
 </dt>
 <dt class="cap-contacts">エクスポート, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.export.html">連絡先をエクスポートする</a>
 </dt>
+<dt class="feat-io-ox-core-categories">カテゴリを使用, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">連絡先にカテゴリを使用</a>
+</dt>
 <dt class="cap-contacts">コピー, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">連絡先の移動またはコピー</a>
 </dt>
 <dt class="cap-webmail cap-calendar cap-tasks">ハロー ビューの表示, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">ハロー ビューで連絡先を表示するハロー ビューで連絡先を表示</a>
@@ -1809,11 +1841,13 @@
 </dt>
 <dt class="cap-guard">Autocrypt鍵を表示, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Autocrypt鍵を管理する</a>
 </dt>
-<dt class="cap-guard">Office ドキュメントの暗号化, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントの暗号化</a>
+<dt class="cap-guard">Office ドキュメントの暗号化, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントを暗号化</a>
 </dt>
-<dt class="cap-guard">パスワードをリセット, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a>
+<dt class="cap-guard">パスワードをリセット, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">パスワードのリセット</a>
 </dt>
-<dt class="cap-guard">パスワードを変更, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a>
+<dt class="cap-guard">パスワードを変更, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">パスワードの変更</a>
+</dt>
+<dt class="cap-guard">パスワードリセット機能を削除, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">パスワードリセット機能を削除する</a>
 </dt>
 <dt class="cap-guard">パスワード管理, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a>
 </dt>
@@ -1823,10 +1857,12 @@
 </dt>
 <dt class="cap-guard">ログアウト, <a class="indexterm" href="ox.appsuite.user.sect.guard.logout.html">Guardからのログアウト</a>
 </dt>
-<dt class="cap-guard">公開鍵を管理, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">公開鍵を管理する</a>
-</dt>
 <dt class="cap-guard">受信メールを暗号化, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">フィルタールールを使用して受信メールを暗号化する</a>
 </dt>
+<dt class="cap-guard">受取人のPGP鍵を管理, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">受取人のPGP鍵を管理する</a>
+</dt>
+<dt class="cap-guard">受取人のS/MIME鍵を管理, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">受取人のS/MIME鍵を管理する</a>
+</dt>
 <dt class="cap-guard">新しい暗号化ドキュメントの作成, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.createencrypted.html">新しい暗号化ドキュメントの作成</a>
 </dt>
 <dt class="cap-guard">新しい暗号化ファイルの作成, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.upload.html">暗号化を使用してファイルを安全にアップロードする</a>
@@ -1855,20 +1891,30 @@
 </dt>
 </dl></dd>
 <dt class="cap-guard">Guard セキュリティ設定</dt>
-<dd><dl><dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+<dd><dl>
+<dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+</dt>
+<dt class="cap-guard">Autocrypt設定, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+</dt>
+<dt class="cap-guard">メールのキャッシュ設定, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+</dt>
+</dl></dd>
+<dt class="cap-guard">Guard セキュリティ詳細</dt>
+<dd><dl><dt class="cap-guard">メール作成の詳細設定を表示, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+</dt></dl></dd>
+<dt class="cap-guard">Guard 設定</dt>
+<dd><dl><dt class="cap-guard">オプションを作成, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
 </dt></dl></dd>
 <dt class="cap-guard">Guardセキュリティ設定</dt>
 <dd><dl>
-<dt class="cap-guard">S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
-</dt>
 <dt class="cap-guard">メールの作成時に暗号化を既定にする, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
 </dt>
+<dt class="cap-guard">リセットオプション, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+</dt>
 <dt class="cap-guard">新規メールにインライン PGP 使用を既定にする, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
 </dt>
 <dt class="cap-guard">既定のパスワードを記憶, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
 </dt>
-<dt class="cap-guard">詳細設定, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
-</dt>
 <dt class="cap-guard">送信メールへの署名の追加を既定にする, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
 </dt>
 </dl></dd>
@@ -1923,7 +1969,7 @@
 </div>
 <div class="indexdiv">
 <h3>O</h3>
-<dl><dt class="cap-guard">Office ドキュメントを暗号化します。, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントの暗号化</a>
+<dl><dt class="cap-guard">Office ドキュメントを暗号化します。, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントを暗号化</a>
 </dt></dl>
 </div>
 <div class="indexdiv">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.about.glossary.html b/help/l10n/ja_JP/ox.appsuite.user.sect.about.glossary.html
index e83921afd..bfaa41114 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.about.glossary.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.about.glossary.html
@@ -64,8 +64,8 @@
 <dd class="glossdef"><p role="presentation">オブジェクトはユーザが作成、整理のできるグループウェアデータです。例:メール、連絡先、予定、タスク、ドキュメント、ファイル、フォルダー、アドレス帳、予定表</p></dd>
 <dt class="feat-io-ox-core-categories" id="ox.appsuite.user.reference.about.glossary.categories"><span class="glossterm">カテゴリ</span></dt>
 <dd class="glossdef feat-io-ox-core-categories">
-<p role="presentation">カテゴリを使用して予定、連絡先、タスクを分類できます。そうすることで、意味的に関連するオブジェクトを識別し、簡単に見つけることができます。構成によって、特定のカテゴリを既定できます。自分のカテゴリの設定もできます。</p>
-<p role="presentation">注:このようなカテゴリはメールでは使用できません。メールには受信トレイタブがあります。</p>
+<p role="presentation">カテゴリは、フォルダ構造から独立して、アプリ間で電子メール、予定、連絡先、タスクを整理することができます。これにより、例えば、特定のプロジェクトや顧客に属するすべての電子メール、予定、連絡先、タスクなど、論理的に関連するオブジェクトをより簡単に識別し、見つけることができます。構成によって、特定のカテゴリを既定できます。自分のカテゴリの設定もできます。</p>
+<p role="presentation">注:メールについては、受信トレイタブも使用できます。</p>
 <p role="presentation">関連トピック<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a></p></li></ul></p>
 </dd>
 <dt class="cap-calendar" id="ox.appsuite.user.reference.about.glossary.group"><span class="glossterm">グループ</span></dt>
@@ -155,11 +155,11 @@
 </dd>
 <dt id="ox.appsuite.user.reference.about.glossary.participant"><span class="glossterm">参加者</span></dt>
 <dd class="glossdef"><p role="presentation">予定やタスクへの招待を受けたユーザーです。参加者は、ゲストとして招待された外部参加者に対して、内部参加者とも呼ばれます。</p></dd>
-<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">受信トレイのタブ</span></dt>
+<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">受信トレイのカテゴリ</span></dt>
 <dd class="glossdef cap-webmail">
 <p role="presentation">受信トレイ タブによって<span class="guilabel"><strong>受信トレイ</strong></span>フォルダーを簡単に、そしてシンプルに整理することができます。タブを使って受信メールを<span class="guilabel"><strong>受信トレイ</strong></span>フォルダーの差出人ごとに保存できます。構成によって、特定の受信トレイタブが既定されます。必要に応じて追加の受信トレイタブを設定できます。</p>
 <p role="presentation">受信トレイタブは<span class="guilabel"><strong>受信トレイ</strong></span>フォルダーでのみ使用できます。追加のストレージオプションが必要な場合は、フォルダービューを使用してメールフォルダーを作成してください。</p>
-<p role="presentation" class="feat-io-ox-core-categories">注:ここで説明されている受信トレイはメールにのみ使用できます。構成によって、予定、連絡先、タスクに別々のカテゴリを使用できます。</p>
+<p role="presentation" class="feat-io-ox-core-categories">注:ここで説明されている受信トレイのカテゴリはメールにのみ使用できます。構成によって、メール、予定、連絡先、タスクに別々のカテゴリを使用できます。</p>
 <p role="presentation">関連トピック<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">受信トレイのカテゴリの使い方</a></p></li></ul></p>
 </dd>
 <dt id="ox.appsuite.user.reference.about.glossary.primarymailaccount"><span class="glossterm">外部メール アカウント</span></dt>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.add.participants.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.add.participants.html
index 3262f6e54..506f5d0f0 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.add.participants.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.add.participants.html
@@ -62,6 +62,7 @@
 <li class="listitem"><p role="presentation">外部の参加者が予定を承諾した場合は、メールが届きます。</p></li>
 </ul>
           <p role="presentation" class="feat-io-ox-core-managedResources">注:管理リソースを追加すると、予約委任がこのリソースに対する予約リクエストを受信します。予約委任がリソースに対する予約リクエストを承諾、または辞退するとすぐにお知らせが届きます。</p>
+          
         </div>
 </div>
 <p id="ox.appsuite.user.tip.calendar.add.participants">ヒント: すべての参加者とリソースの空き状況を検索するには、<a class="link" href="ox.appsuite.user.sect.calendar.add.scheduling.html">スケジューリングビューの使用</a> をお勧めします。</p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.create.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.create.html
index d2333d2d5..944c2ea0e 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.create.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.create.html
@@ -103,7 +103,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">カレンダー</span> 詳細ビュー</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">新規予定の作成</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">予定の作成</a></p>
 <p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">代理として予定を作成、編集、または管理する</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">予定の編集</a></p>
 </li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.detailview.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.detailview.html
index 713cda058..f15136377 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.detailview.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.detailview.html
@@ -97,10 +97,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">ハロー ビューで連絡先を表示するハロー ビューで連絡先を表示</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">予定の参加者に通話する</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">予定のステータスの変更</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">予定のアラームを変更</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">予定の管理</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.detailview">親記事:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">カレンダー</span> 構成</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.foldertree.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.foldertree.html
index 22f56b186..fdc7f7261 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.foldertree.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.foldertree.html
@@ -60,7 +60,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">予定の表示</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">個人の予定表を追加する</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">予定表の色を使用する</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">予定の管理</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">リソースカレンダーをリソースカレンダーグループを作成</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.edit.html">リソースカレンダーを編集する</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">リソースカレンダーを使用して予定を作成</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.list.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.list.html
index 9c813d1bd..fa4cad004 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.list.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.list.html
@@ -49,11 +49,11 @@
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">カレンダー</span> 詳細ビュー</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">異なるビューで予定を表示する</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.view.html">リソースカレンダーを表示する</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">予定の管理</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.list">親記事:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">カレンダー</span> 構成</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.new.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.new.html
index 92a34dd07..0b86419be 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.new.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.new.html
@@ -47,10 +47,7 @@
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">新規予定の作成</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">スケジューリングビューの使用</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">予定の作成</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">Googleカレンダーに登録する</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">パブリックカレンダーと共有カレンダーを登録する</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.popup.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.popup.html
index c593178c1..3b28dddac 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.popup.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.popup.html
@@ -111,15 +111,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">予定の編集</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">フォロー予定の作成</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">予定のステータスの変更</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">予定のアラームを変更</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">開催者を変更</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">別の予定表への予定の移動</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">予定をエクスポートする</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">予定の印刷</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">予定の削除</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">予定の管理</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">予定の参加者へのメールの送信</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.popup">親記事:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">カレンダー</span> 構成</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.toolbar.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.toolbar.html
index bed12a20f..38ce2fc4a 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.toolbar.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.gui.toolbar.html
@@ -71,14 +71,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">予定の編集</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">予定のアラームを変更</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">開催者を変更</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">別の予定表への予定の移動</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">予定をエクスポートする</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">予定の印刷</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">予定の削除</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">予定の管理</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.toolbar">親記事:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">カレンダー</span> 構成</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.categories.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.categories.html
new file mode 100644
index 000000000..79a6d3fd2
--- /dev/null
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.categories.html
@@ -0,0 +1,88 @@
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>予定にカテゴリを使用する</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="ユーザ ガイド">
+<link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="予定の管理">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="お気に入りのタイムゾーンの管理">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="予定表の色を使用する">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">戻る</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">次へ</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">カレンダー</span></h1>
+<h2 class="sr-only">予定の管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.calendar.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">予定にカテゴリを使用する</h3></div></div></div>
+<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><a class="indexterm" name="id-1.8.15.11.4"></a><p id="ox.appsuite.user.concept.calendar.manage.categories">カレンダーとは別に予定を整理するために、カテゴリを使用できます。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">予定にカテゴリで印をつけることができます。</p></li>
+<li class="listitem"><p role="presentation">特定のカテゴリで印をつけられたすべての予定を表示できます。</p></li>
+</ul>
+<p>自分のカテゴリを作成、編集、削除できます。<a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a>参照。</p>
+<div class="task" id="ox.appsuite.user.task.calendar.manage.categories">
+<p class="title">予定にカテゴリで印をつける:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">ビューに応じて、次のいずれかの方法を使用します。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">カレンダービュー上の予定をクリックします。ポップアップで、<span class="guibutton"><strong>予定を編集</strong></span> アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>をクリックします。</p></li>
+<li class="listitem"><p role="presentation">リスト ビューで予定を選択し、ツールバーで、<span class="guibutton"><strong>連絡先を編集</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>をクリックします。</p></li>
+</ul></p>
+<p role="presentation">予定編集ウィンドウが開きます。</p>
+</li>
+<li class="step">
+<p role="presentation">割り当てるには、<span class="guibutton"><strong>カテゴリ</strong></span>の横の<span class="guibutton"><strong>カテゴリを追加</strong></span>をクリックします。カテゴリを選択します。</p>
+<p role="presentation">カテゴリを予定から削除するには、カテゴリの隣の<span class="guibutton"><strong>カテゴリを削除</strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> をクリックします。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.calendar.categories.view">
+<p class="title">特定のカテゴリで印をつけられた予定を表示する:</p>
+<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">ビューに応じて、次のいずれかの方法を使用します。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">カレンダービューで、カテゴリで印をつけられた予定をクリックします。ポップアップで、カテゴリをクリックします。</p></li>
+<li class="listitem"><p role="presentation">リストビューで、カテゴリで印をつけられた予定を選択します。詳細ビューでカテゴリをクリックします。</p></li>
+</ul></p></li></ul></div>
+<div class="taskrelated">
+          <p>結果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">リストビューにこのカテゴリで印をつけられたすべての予定が表示されます。</p></li>
+<li class="listitem"><p role="presentation">前のビューを表示するには、検索フィールドで<span class="guibutton"><strong>検索をキャンセル</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>をクリックします。</p></li>
+</ul>
+          <p>ヒント:検索オプションを使用してカテゴリを検索することで、検索機能を使用することもできます。</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.calendar.manage.categories"></p>
+<p class="title">関連トピック</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">予定の検索</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">新規メールにインライン PGP 使用を既定にする</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">連絡先にカテゴリを使用</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">タスクにカテゴリを使用する</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.calendar.manage.categories">親記事:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">予定の管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.changeorganizer.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
index 21c5e60ba..aabf7cefe 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
@@ -59,8 +59,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changeorganizer"></p>
 <p class="title">ユーザ インターフェース</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">カレンダー</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">カレンダー</span> リストビュー</a></p>
 </li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.changereminder.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.changereminder.html
index c4126b269..c7ddba1de 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.changereminder.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.changereminder.html
@@ -55,9 +55,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changereminder"></p>
 <p class="title">ユーザ インターフェース</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">カレンダー</span> ツールバー</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">カレンダー</span> 詳細ビュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">カレンダー</span> リストビュー</a></p>
 </li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.changestatus.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.changestatus.html
index 62a3bfb6a..d5786f785 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.changestatus.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.changestatus.html
@@ -59,6 +59,7 @@
 <p class="title">ユーザ インターフェース</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">カレンダー</span> リストビュー</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">カレンダー</span> 詳細ビュー</a></p>
 </li></ul>
 <p> </p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.colors.html
index e5bc69ced..f7ba49a48 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.colors.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.colors.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="予定の管理">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="お気に入りのタイムゾーンの管理">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="予定にカテゴリを使用する">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.move.html" title="別の予定表への予定の移動">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.move.html">次へ</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">予定の管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.colors">
 <div class="titlepage"><div><div><h3 class="title">予定表の色を使用する</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">カレンダーの色を指定できます。既定では、このカレンダーのすべての予定は、そのカレンダーの色で表示されます。個別の色を予定の作成または編集時に割り当てる場合、予定は予定表の色ではなく、割り当てられた色で表示されます。</p>
+<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">カレンダーの色を指定できます。既定では、このカレンダーのすべての予定は、そのカレンダーの色で表示されます。個別の色を予定の作成または編集時に割り当てる場合、予定は予定表の色ではなく、割り当てられた色で表示されます。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.colors">
 <p class="title">予定表の色を選択する:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -42,10 +42,13 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.calendar.manage.colors"></p>
+<p class="title">ユーザ インターフェース</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">カレンダー</span> フォルダービュー</a></p></li></ul>
+<p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">予定は予定表ビューにどのように表示されますか?</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">カレンダー</span> フォルダービュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">予定は予定表ビューにどのように表示されますか?</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.colors">親記事:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">予定の管理</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.delete.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.delete.html
index 068831d09..a83f76532 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.delete.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">予定の管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">予定の削除</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>警告:</strong></span>削除したファイルを復元することは<span class="phrase"><strong>できません</strong></span>。構成によって、予定の開催者のみがその開催者の個人用の予定表にある予定を削除できます。</p>
+<a class="indexterm" name="id-1.8.15.17.2"></a><a class="indexterm" name="id-1.8.15.17.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>警告:</strong></span>削除したファイルを復元することは<span class="phrase"><strong>できません</strong></span>。構成によって、予定の開催者のみがその開催者の個人用の予定表にある予定を削除できます。</p>
 <p id="ox.appsuite.user.concept.calendar.manage.delete">アイテムを削除する権限がある場合、カレンダーから予定を削除できます。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.delete">
 <p class="title">予定を削除する:</p>
@@ -67,8 +67,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.delete"></p>
 <p class="title">ユーザ インターフェース</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">カレンダー</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">カレンダー</span> リストビュー</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.delete">親記事:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">予定の管理</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.export.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.export.html
index a048cc5fe..4fabe7dec 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.export.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">予定の管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.export">
 <div class="titlepage"><div><div><h3 class="title">予定をエクスポートする</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">予定を iCal 形式でエクスポートできます。この形式を使用して、予定を他の予定表アプリケーションと交換することができます。予定表から一つの予定またはすべての予定をエクスポートできます。</p>
+<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">予定を iCal 形式でエクスポートできます。この形式を使用して、予定を他の予定表アプリケーションと交換することができます。予定表から一つの予定またはすべての予定をエクスポートできます。</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.manage.export.selected">
 <p class="title">一つの予定をエクスポートする:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -60,14 +60,16 @@
 <p id="ox.appsuite.user.related.calendar.manage.export"></p>
 <p class="title">ユーザ インターフェース</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">カレンダー</span> フォルダービュー</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">カレンダー</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">カレンダー</span> リストビュー</a></p>
 </li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">予定をインポート</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.8.15.14.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">個人データをダウンロード</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.8.15.15.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">個人データをダウンロード</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.manage.export">親記事:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">予定の管理</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.html
index 6b264a55b..77a4afc0d 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.html
@@ -38,6 +38,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">予定のアラームを変更</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">開催者を変更</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">お気に入りのタイムゾーンの管理</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">予定にカテゴリを使用する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">予定表の色を使用する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">別の予定表への予定の移動</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">予定をインポート</a></p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.import.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.import.html
index eb3918aad..9bbab4fa4 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.import.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">予定の管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.import">
 <div class="titlepage"><div><div><h3 class="title">予定をインポート</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><a class="indexterm" name="id-1.8.15.13.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">iCal形式のファイルから予定をインポートできます。</p>
+<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">iCal形式のファイルから予定をインポートできます。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.import">
 <p class="title">iCalファイルから予定をインポートする:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,6 +51,9 @@
         </div>
 </div>
 <p id="ox.appsuite.user.related.calendar.manage.import"></p>
+<p class="title">ユーザ インターフェース</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">カレンダー</span> フォルダービュー</a></p></li></ul>
+<p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">予定をエクスポートする</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.move.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.move.html
index 6966c777d..993e50355 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.move.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.move.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">予定の管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.move">
 <div class="titlepage"><div><div><h3 class="title">別の予定表への予定の移動</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">単独の予定を別のカレンダーに移動することはできますが、繰り返しの予定は移動できません。</p>
+<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">単独の予定を別のカレンダーに移動することはできますが、繰り返しの予定は移動できません。</p>
 <p>前提条件:目的の予定表にオブジェクトを作成する権限が必要です。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.move">
 <p class="title">予定を別の予定表に移動する:</p>
@@ -52,8 +52,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.move"></p>
 <p class="title">ユーザ インターフェース</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">カレンダー</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">カレンダー</span> リストビュー</a></p>
 </li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.print.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.print.html
index eda2149b1..ce9c9804c 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.print.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">予定の管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.print">
 <div class="titlepage"><div><div><h3 class="title">予定の印刷</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><a class="indexterm" name="id-1.8.15.15.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">予定表や予定を印刷できます。ここでは、次の機能が利用できます。</p>
+<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><a class="indexterm" name="id-1.8.15.16.4"></a><a class="indexterm" name="id-1.8.15.16.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">予定表や予定を印刷できます。ここでは、次の機能が利用できます。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">予定のある予定表シートの印刷</p></li>
 <li class="listitem"><p role="presentation">予定のデータの印刷</p></li>
@@ -82,9 +82,11 @@
 <p id="ox.appsuite.user.related.calendar.manage.print"></p>
 <p class="title">ユーザ インターフェース</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html"><span class="phrase">カレンダー</span> 設定メニュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">カレンダー</span> フォルダービュー</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">カレンダー</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">カレンダー</span> リストビュー</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.print">親記事:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">予定の管理</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.timezones.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.timezones.html
index d015566ba..70c11278b 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.timezones.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.manage.timezones.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="予定の管理">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="開催者を変更">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="予定表の色を使用する">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="予定にカテゴリを使用する">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">次へ</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">次へ</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.search.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.search.html
index f65e2e747..ccdbb9367 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.search.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.search.html
@@ -80,7 +80,7 @@
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">異なるビューで予定を表示する</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">予定にカテゴリを使用する</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.search">親記事:<a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">カレンダー</span></i></a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.appointments.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.appointments.html
index 9ad4b0eea..2e167434a 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.appointments.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.appointments.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">予定の表示</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.appointments">
 <div class="titlepage"><div><div><h3 class="title">予定は予定表ビューにどのように表示されますか?</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.9.2"></a><a class="indexterm" name="id-1.8.8.9.3"></a><a class="indexterm" name="id-1.8.8.9.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">次の予定プロパティは、カレンダービューの予定表示を指定します。</p>
+<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><a class="indexterm" name="id-1.8.8.8.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">次の予定プロパティは、カレンダービューの予定表示を指定します。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">予定カラー</p>
@@ -62,7 +62,7 @@
 <p role="presentation">辞退した予定はグレー表示されます。件名の前には<span class="guibutton"><strong>辞退済み</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.declined"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>アイコンがつきます。件名は線で消されます。</p>
 <p role="presentation">カレンダー設定では、辞退した予定を表示するかどうかを指定できます。</p>
 </li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.6.2.1.6"><p role="presentation">すべてのその他の参加者が辞退した予定は、<span class="guibutton"><strong>すべて辞退</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>アイコンで表示されます。</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.6.2.1.6"><p role="presentation">すべてのその他の参加者が辞退した予定は、<span class="guibutton"><strong>すべて辞退</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>アイコンで表示されます。</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.view.appointments.private"></p>
 <h4 class="title">プライベートの予定の表示</h4>
@@ -89,7 +89,7 @@
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.secret"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span>秘密の予定</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.unconfirmed"><object type="image/svg+xml" data="../../images/question-circle.svg" height="15"></object></span>未確認の予定</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.rejected"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>辞退された予定</p></li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>すべてのその他の参加者が辞退した予定</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>すべてのその他の参加者が辞退した予定</p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.view.appointments"></p>
 <p class="title">関連トピック</p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.html
index 45621a884..da7d56839 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.html
@@ -38,9 +38,6 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.timezones.html">複数のタイムゾーンを表示</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">予定は予定表ビューにどのように表示されますか?</a></p></li>
 </ul>
-<p id="ox.appsuite.user.related.calendar.view"></p>
-<p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">カレンダー</span> フォルダービュー</a></p></li></ul>
 <p id="ox.appsuite.user.parent.calendar.view">親記事:<a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">カレンダー</span></i></a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.timezones.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.timezones.html
index 9297bfdfe..656f7664f 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.timezones.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.timezones.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">予定の表示</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.timezones">
 <div class="titlepage"><div><div><h3 class="title">複数のタイムゾーンを表示</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">既定のタイムゾーンに加えて、お気に入りに追加したタイムゾーンを表示することもできます。既定のタイムゾーンは基本設定で変更できます。</p>
+<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">既定のタイムゾーンに加えて、お気に入りに追加したタイムゾーンを表示することもできます。既定のタイムゾーンは基本設定で変更できます。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.timezones">
 <p class="title">予定表ビューで複数のタイムゾーンを表示する:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.views.html b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.views.html
index e65ebfae6..d9ceb46ad 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.views.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.calendar.view.views.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">予定の表示</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.views">
 <div class="titlepage"><div><div><h3 class="title">異なるビューで予定を表示する</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><a class="indexterm" name="id-1.8.8.7.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">異なるビューで1つのカレンダーまたは複数のカレンダーの予定を表示する方法を説明します:</p>
+<a class="indexterm" name="id-1.8.8.6.2"></a><a class="indexterm" name="id-1.8.8.6.3"></a><a class="indexterm" name="id-1.8.8.6.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">異なるビューで1つのカレンダーまたは複数のカレンダーの予定を表示する方法を説明します:</p>
 <div class="task" id="ox.appsuite.user.task.calendar.view.views">
 <p class="title">予定を表示する:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.create.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.create.html
index 6aaa4873a..aad80105e 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.create.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.create.html
@@ -80,13 +80,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">編集ウィンドウ</a></p></li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">アドレス帳</span> 詳細ビュー</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">新規連絡先の作成</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">連絡先の追加</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">連絡先または連絡先グループを編集する</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.create">親記事:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">アドレス帳</span>構成</a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.detailview.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.detailview.html
index 8868ea64d..7166ceb87 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.detailview.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.detailview.html
@@ -89,15 +89,11 @@
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">アドレス帳</span> リストビュー</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.create.html">連絡先編集ウィンドウ</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">アドレス帳の連絡先を表示する</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.attachments.html">連絡先の添付ファイルの表示、保存</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">連絡先に通話する</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">連絡先の管理</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">連絡先の管理</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.detailview">親記事:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">アドレス帳</span>構成</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.foldertree.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.foldertree.html
index e63bdd0c9..c0a9fca25 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.foldertree.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.foldertree.html
@@ -57,6 +57,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">アドレス帳の連絡先を表示する</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">アドレス帳の追加</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">連絡先の管理</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">フォルダーでデータを管理</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.list.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.list.html
index 37b05b03d..06fbf3efc 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.list.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.list.html
@@ -61,11 +61,8 @@
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.settingsmenu.html"><span class="phrase">アドレス帳</span> 設定メニュー</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">アドレス帳</span> 詳細ビュー</a></p>
-</li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">アドレス帳の連絡先を表示する</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">連絡先の管理</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.list">親記事:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">アドレス帳</span>構成</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.new.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.new.html
index 91525f00e..e89a65dc3 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.new.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.new.html
@@ -47,7 +47,7 @@
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">新規連絡先の作成</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">連絡先の追加</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">新規連絡グループの作成</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">外部アドレス帳の登録</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">パブリックアドレス帳と共有アドレス帳を登録する</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.toolbar.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.toolbar.html
index 2a120fee9..0509a4954 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.toolbar.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.gui.toolbar.html
@@ -56,13 +56,7 @@
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">連絡先または連絡先グループを編集する</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">アドレス帳からのメールの送信</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">予定への出席を連絡先に依頼</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">連絡先の移動またはコピー</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">vCard での連絡先の送信</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">連絡先をエクスポートする</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.print.html">連絡先の印刷</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.delete.html">連絡先の削除</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">連絡先の管理</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.toolbar">親記事:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">アドレス帳</span>構成</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.categories.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.categories.html
new file mode 100644
index 000000000..174e94413
--- /dev/null
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.categories.html
@@ -0,0 +1,85 @@
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>連絡先にカテゴリを使用</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="ユーザ ガイド">
+<link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="連絡先の管理">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="予定への出席を連絡先に依頼">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="連絡先の移動またはコピー">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">戻る</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">次へ</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">アドレス帳</span></h1>
+<h2 class="sr-only">連絡先の管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.contacts.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">連絡先にカテゴリを使用</h3></div></div></div>
+<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><p id="ox.appsuite.user.concept.contacts.manage.categories">フォルダーとは別に連絡先を整理するために、カテゴリを使用できます。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">連絡先にカテゴリで印をつけることができます。</p></li>
+<li class="listitem"><p role="presentation">特定のカテゴリで印をつけられたすべての連絡先を表示できます。</p></li>
+</ul>
+<p>自分のカテゴリを作成、編集、削除できます。<a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a>参照。</p>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories">
+<p class="title">連絡先にカテゴリで印をつける:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">連絡先の選択ツールバーで、<span class="guibutton"><strong>連絡先を編集</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>をクリックします。</p>
+<p role="presentation">連絡先編集ウィンドウが開きます。</p>
+</li>
+<li class="step">
+<p role="presentation">割り当てるには、<span class="guibutton"><strong>カテゴリ</strong></span>の横の<span class="guibutton"><strong>カテゴリを追加</strong></span>をクリックします。カテゴリを選択します。</p>
+<p role="presentation">カテゴリを連絡先から削除するには、カテゴリの隣の<span class="guibutton"><strong>カテゴリを削除</strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> をクリックします。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories.view">
+<p class="title">特定のカテゴリで印をつけられた連絡先を表示する:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">カテゴリで印をつけられた連絡先を選択します。</p></li>
+<li class="step"><p role="presentation">詳細ビューでカテゴリをクリックします。</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>結果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">リストビューにこのカテゴリで印をつけられたすべての連絡先が表示されます。</p></li>
+<li class="listitem"><p role="presentation">前のリストを表示するには、検索フィールドで<span class="guibutton"><strong>検索をキャンセル</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>をクリックします。</p></li>
+</ul>
+          <p>ヒント:検索オプションを使用してカテゴリを検索することで、検索機能を使用することもできます。</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.contacts.manage.categories"></p>
+<p class="title">関連トピック</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">連絡先の検索</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">新規メールにインライン PGP 使用を既定にする</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">予定にカテゴリを使用する</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">タスクにカテゴリを使用する</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.contacts.manage.categories">親記事:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">連絡先の管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.delete.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.delete.html
index 530f358a4..7b6b62747 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.delete.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">連絡先の管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">連絡先の削除</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>警告:</strong></span>削除された連絡先や連絡先グループは削除<span class="phrase"><strong>できません</strong></span>。</p>
+<a class="indexterm" name="id-1.9.17.15.2"></a><a class="indexterm" name="id-1.9.17.15.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>警告:</strong></span>削除された連絡先や連絡先グループは削除<span class="phrase"><strong>できません</strong></span>。</p>
 <p id="ox.appsuite.user.concept.contacts.manage.delete">このアドレス帳からアイテムを削除する権限がある場合、アドレス帳から連絡先または連絡先グループを削除することができます。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">連絡先を<span class="guibutton"><strong>すべてのユーザー</strong></span>アドレス帳から削除することができません。</p></li>
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.delete"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">アドレス帳</span> リストビュー</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.delete">親記事:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">連絡先の管理</a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.export.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.export.html
index e6a61a7b3..5731e0dbb 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.export.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">連絡先の管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.export">
 <div class="titlepage"><div><div><h3 class="title">連絡先をエクスポートする</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">連絡先または連絡先グループをこのような形式にエクスポートすることができます。</p>
+<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><a class="indexterm" name="id-1.9.17.13.4"></a><a class="indexterm" name="id-1.9.17.13.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">連絡先または連絡先グループをこのような形式にエクスポートすることができます。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">vCardこの形式を使用して、連絡先を他のメールアプリケーションと交換することができます。</p></li>
 <li class="listitem"><p role="presentation">CSV 連絡先をこの形式でスプレッドシート形式にエクスポートできます。</p></li>
@@ -71,7 +71,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.export"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html"><span class="phrase">アドレス帳</span> フォルダービュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">アドレス帳</span> リストビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -79,7 +83,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">vCard での連絡先の送信</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">連絡先のインポート</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.9.17.12.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">個人データをダウンロード</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.9.17.13.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">個人データをダウンロード</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.export">親記事:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">連絡先の管理</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.html
index aa1038433..bafc1fa04 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.html
@@ -36,6 +36,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem cap-webmail" id="id-1.9.17.4.1.1"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">アドレス帳からのメールの送信</a></p></li>
 <li class="listitem cap-calendar" id="id-1.9.17.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">予定への出席を連絡先に依頼</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">連絡先にカテゴリを使用</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">連絡先の移動またはコピー</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">vCard での連絡先の送信</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">連絡先のインポート</a></p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.import.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.import.html
index 23829389a..69ab80154 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.import.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">連絡先の管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.import">
 <div class="titlepage"><div><div><h3 class="title">連絡先のインポート</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><a class="indexterm" name="id-1.9.17.11.5"></a><a class="indexterm" name="id-1.9.17.11.6"></a><a class="indexterm" name="id-1.9.17.11.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">以下の形式のファイルから連絡先をインポートできます。</p>
+<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><a class="indexterm" name="id-1.9.17.12.6"></a><a class="indexterm" name="id-1.9.17.12.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">以下の形式のファイルから連絡先をインポートできます。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">vCard注意:</p>
@@ -67,6 +67,9 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.import"></p>
+<p class="title">ユーザ インターフェース</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html"><span class="phrase">アドレス帳</span> フォルダービュー</a></p></li></ul>
+<p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">連絡先をエクスポートする</a></p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.inviteappointment.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
index 8f8984d8f..c34565ced 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="連絡先の管理">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.manage.sendmail.html" title="アドレス帳からのメールの送信">
-<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="連絡先の移動またはコピー">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="連絡先にカテゴリを使用">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">次へ</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">次へ</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -48,7 +48,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.inviteappointment"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">アドレス帳</span> リストビュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">アドレス帳</span> 詳細ビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">新規予定の作成</a></p></li></ul>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.movecopy.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.movecopy.html
index e9666525c..2a0c0f4d8 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.movecopy.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.movecopy.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="連絡先の管理">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="予定への出席を連絡先に依頼">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="連絡先にカテゴリを使用">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html" title="vCard での連絡先の送信">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">次へ</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">連絡先の管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.movecopy">
 <div class="titlepage"><div><div><h3 class="title">連絡先の移動またはコピー</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><a class="indexterm" name="id-1.9.17.9.4"></a><a class="indexterm" name="id-1.9.17.9.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">連絡先または連絡先グループを別のアドレス帳に移動またはコピーすることができます。</p>
+<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><a class="indexterm" name="id-1.9.17.10.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">連絡先または連絡先グループを別のアドレス帳に移動またはコピーすることができます。</p>
 <p id="ox.appsuite.user.hints.contacts.manage.movecopy">注意:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">連絡先または連絡先グループを<span class="guibutton"><strong>すべてのユーザー</strong></span>アドレス帳に移動またはコピーすることができません。</p></li>
@@ -56,7 +56,10 @@
 <p id="ox.appsuite.user.tip.contacts.manage.movecopy">注:フォルダービューからオブジェクトをアドレス帳にドラッグして、選択オブジェクトを移動することもできます。</p>
 <p id="ox.appsuite.user.related.contacts.manage.movecopy"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">アドレス帳</span> リストビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.personal.html">個人用アドレス帳の追加</a></p></li></ul>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.print.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.print.html
index e4a71e1a9..a468b2af4 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.print.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">連絡先の管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.print">
 <div class="titlepage"><div><div><h3 class="title">連絡先の印刷</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">一つの連絡先、または複数の連絡先のデータを印刷できます。異なる印刷のレイアウトが選択できます。</p>
+<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">一つの連絡先、または複数の連絡先のデータを印刷できます。異なる印刷のレイアウトが選択できます。</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.print.list">
 <p class="title">連絡先データを印刷する:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -48,7 +48,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.print"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html"><span class="phrase">アドレス帳</span> フォルダービュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">アドレス帳</span> リストビュー</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.print">親記事:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">連絡先の管理</a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.sendmail.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.sendmail.html
index d7ccaa7e7..5b107d1d3 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.sendmail.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.sendmail.html
@@ -48,7 +48,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendmail"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">アドレス帳</span> リストビュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">アドレス帳</span> 詳細ビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">新規メールの送信</a></p></li></ul>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.sendvcard.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.sendvcard.html
index 381f424de..23476d781 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.sendvcard.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.manage.sendvcard.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">連絡先の管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.sendvcard">
 <div class="titlepage"><div><div><h3 class="title">vCard での連絡先の送信</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">連絡先または連絡先グループをvCard形式の添付ファイルをメールで送信できます。</p>
+<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">連絡先または連絡先グループをvCard形式の添付ファイルをメールで送信できます。</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.sendvcard">
 <p class="title">vCard 形式の添付ファイルとして連絡先を送信する:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,12 +44,15 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendvcard"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">アドレス帳</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">アドレス帳</span> リストビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">連絡先をエクスポートする</a></p></li>
-<li class="listitem cap-webmail" id="id-1.9.17.10.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">新規メールの送信</a></p></li>
+<li class="listitem cap-webmail" id="id-1.9.17.11.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">新規メールの送信</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendvcard">親記事:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">連絡先の管理</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.search.html b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.search.html
index ef26b3e25..6cdabddb0 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.search.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.contacts.search.html
@@ -81,7 +81,7 @@
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">アドレス帳の連絡先を表示する</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">連絡先にカテゴリを使用</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.search">親記事:<a class="xref" href="ox.appsuite.user.chap.contacts.html"><i><span class="phrase">アドレス帳</span></i></a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.accounts.edit.html b/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
index d39591ede..f434b9fdf 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
@@ -82,7 +82,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.addsocial.html">ソーシャルネットワークのポータルウィジェットの追加</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">メールアカウントを追加</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">統合メールの使用</a></p>
-<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択する</a></p>
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">ストレージアカウントを追加する</a></p>
 </li>
 </ul>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html b/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
index f99e7a18f..9ed18774c 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
@@ -64,7 +64,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">統合メールの使用</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択する</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.accounts.functionalmail">親記事:<a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">アカウントの管理</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.categories.html b/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.categories.html
index f37bb0960..b6faebe12 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.categories.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.categories.html
@@ -32,15 +32,15 @@
   <h1 class="sr-only">データの整理と共有</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.categories">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">カテゴリの管理</h2></div></div></div>
-<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">予定、連絡先、タスクを分類できる<a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">カテゴリ</a>の管理方法を説明します。カテゴリには次のプロパティがあります:</p>
+<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">フォルダ構造から独立して、アプリ間でメール、予定、連絡先、タスクを整理できるようにする、<a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">カテゴリ</a>の管理方法を説明します。例えば、特定のプロジェクトや顧客のために独自のカテゴリを使用できます。カテゴリには次のプロパティがあります:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">カテゴリには名前と色があります。</p></li>
 <li class="listitem"><p role="presentation">オブジェクトの検索時、カテゴリを検索条件として使用できます。</p></li>
 <li class="listitem"><p role="presentation">構成によって、特定のカテゴリを既定できます。そのようなカテゴリは、編集も削除もできません。</p></li>
 <li class="listitem"><p role="presentation">自分のカテゴリを作成、編集、削除できます。</p></li>
-<li class="listitem"><p role="presentation">一つまたは複数のカテゴリを予定、連絡先、タスクに割り当てたり、あとで削除したりできます。</p></li>
+<li class="listitem"><p role="presentation">一つまたは複数のカテゴリをメール、予定、連絡先、タスクに割り当てたり、あとで削除したりできます。</p></li>
 </ul>
-<p>注:このようなカテゴリはメールでは使用できません。メールには受信トレイカテゴリがあります。<a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">受信トレイのカテゴリの使い方</a>参照。</p>
+<p>注:メールについては、受信トレイタブも使用できます。特定の受信トレイカテゴリーをメールに割り当てることができます。カテゴリは送信者によります。<a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">受信トレイのカテゴリの使い方</a>参照。</p>
 <p id="ox.appsuite.user.concept.dataorganisation.categories">次のようなオプションの機能があります。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">自分のカテゴリを作成</p></li>
@@ -51,9 +51,15 @@
 <p class="title">カテゴリを管理する:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step help-hide-inline">
+<p role="presentation">メニューバーの右側の<span class="guibutton"><strong>設定</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。<span class="guilabel"><strong>設定</strong></span>ウィンドウが開きます。</p>
+<p role="presentation">左ペインの<span class="guibutton"><strong>基本</strong></span> をクリックします。<span class="guibutton"><strong>詳細設定</strong></span>下の<span class="guibutton"><strong>カテゴリを管理</strong></span> をクリックします。</p>
+<p role="presentation">次のいずれかの方法を使用できます。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">メールを選択します。ツールバーで<span class="guibutton"><strong>カテゴリを追加</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>をクリックします。<span class="guibutton"><strong>カテゴリを管理</strong></span>を選択します。</p></li>
+<li class="listitem">
 <p role="presentation">予定、連絡先、あるいはタスクの編集ウィンドウを開いて、作成または編集します。</p>
 <p role="presentation">割り当てるには、<span class="guibutton"><strong>カテゴリ</strong></span>の横の<span class="guibutton"><strong>カテゴリを追加</strong></span>をクリックします。<span class="guibutton"><strong>カテゴリを管理</strong></span>を選択します。</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><span class="guibutton"><strong>詳細設定</strong></span>下の一般設定の<span class="guibutton"><strong>カテゴリを管理</strong></span>ボタンを使用することもできます。</p></li></ul>
+</li>
+</ul></p>
 <p role="presentation"><span class="guilabel"><strong>カテゴリを管理</strong></span>ウィンドウを開きます。</p>
 </li>
 <li class="step">
@@ -68,21 +74,12 @@
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">新規予定の作成</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">新規連絡先の作成</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">タスクの作成</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">予定の編集</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">連絡先または連絡先グループを編集する</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">タスクの編集</a></p>
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">新規メールにインライン PGP 使用を既定にする</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">予定にカテゴリを使用する</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">連絡先にカテゴリを使用</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">タスクにカテゴリを使用する</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">一般設定を調整</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">予定の検索</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">連絡先の検索</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">タスクの検索</a></p>
-</li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.categories">親記事:<a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>データの整理と共有</i></a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.sharing.share.html b/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.sharing.share.html
index dcd8e2907..0bdf86ecb 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.sharing.share.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.dataorganisation.sharing.share.html
@@ -48,7 +48,7 @@
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">カレンダー</p>
+<p role="presentation">予定表</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>カレンダー</strong></span>のフォルダーは、読み取り権限、または編集権限のある内部ユーザーと共有できます。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>カレンダー</strong></span>フォルダーは共有できません。</p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.content.html b/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.content.html
index e77e850ab..b85c42d03 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.content.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.content.html
@@ -70,6 +70,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html"><span class="phrase">ドライブ</span> フォルダーコンテンツを表示</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">ファイルの内容の表示</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">ファイルと <span class="phrase">ドライブ</span> フォルダーを整理する</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">フォルダーでデータを管理</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">共有データ</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.foldertree.html b/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.foldertree.html
index 3a95c202b..80ef36012 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.foldertree.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.foldertree.html
@@ -67,6 +67,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">ドライブ</span>: フォルダーを作成</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">パブリックおよび共有<span class="phrase">ドライブ</span>フォルダーに登録する</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">ファイルと <span class="phrase">ドライブ</span> フォルダーを整理する</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">フォルダーでデータを管理</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">共有データ</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.toolbar.html b/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.toolbar.html
index 8e80a4766..60366709c 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.toolbar.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.toolbar.html
@@ -67,20 +67,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html"><span class="phrase">ドライブ</span> フォルダーコンテンツを表示</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">ファイルの内容の表示</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.send.html">メールの添付ファイルとしてファイルを送信</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">ファイル名の編集</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">説明を作成または編集</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.move.html">ファイルまたは <span class="phrase">ドライブ</span> フォルダーを移動</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.copy.html">ファイルのコピー</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">PDFとしてファイルを保存</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">PDFとしてファイルを印刷</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.addportal.html">ポータルへのファイルの追加</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.favorite.html">ファイルまたは <span class="phrase">ドライブ</span>フォルダーをお気に入りに追加する</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.delete.html">ファイルまたは <span class="phrase">ドライブ</span> フォルダーを削除する</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.lock.html">ファイルのロックおよびロックの解除</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">バージョンの操作</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">ファイルと <span class="phrase">ドライブ</span> フォルダーを整理する</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">ファイルの暗号化または復号化</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.toolbar">親記事:<a class="xref" href="ox.appsuite.user.sect.drive.gui.html">The <span class="phrase">ドライブ</span> 構成</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.viewer.html b/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.viewer.html
index 18ba2ba60..d2b9d1625 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.viewer.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.drive.gui.viewer.html
@@ -86,13 +86,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">ファイルの内容の表示</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">プレゼンテーションを行う</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">ファイル名の編集</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">説明を作成または編集</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">PDFとしてファイルを保存</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">PDFとしてファイルを印刷</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">バージョンの操作</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">ファイルと <span class="phrase">ドライブ</span> フォルダーを整理する</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">共有データ</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.viewer">親記事:<a class="xref" href="ox.appsuite.user.sect.drive.gui.html">The <span class="phrase">ドライブ</span> 構成</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.accounts.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.accounts.html
index 0a47cbe80..213a0a025 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.accounts.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.accounts.html
@@ -71,7 +71,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">統合メールの使用</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択する</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">返信先アドレスを設定</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.create.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.create.html
index c897bec3b..c5df286cd 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.create.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.create.html
@@ -56,7 +56,7 @@
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>CC</strong></span>、 <span class="guibutton"><strong>BCC</strong></span> ボタン<span class="guibutton"><strong>CC</strong></span> または <span class="guibutton"><strong>BCC</strong></span> 入力フィールドが表示されます。</p></li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>RE</strong></span> ボタン<span class="guibutton"><strong>返信先</strong></span>の入力フィールドが表示されます。</p>
+<p role="presentation"><span class="guibutton"><strong>AW</strong></span>ボタン<span class="guibutton"><strong>返信先</strong></span>の入力フィールドが表示されます。</p>
 <p role="presentation">メールの返信は、この入力フィールドに入力されたメールアドレスに送信されます。</p>
 </li>
 <li class="listitem">
@@ -77,6 +77,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>送信</strong></span>宛先へのメール を送信します。</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.13.5.1.5"><p role="presentation"><span class="guibutton"><strong>後で送信</strong></span>メールを送信する時を選択できるメニューを表示します。</p></li>
 <li class="listitem">
 <p role="presentation">ボタンバー</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -108,17 +109,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">編集ウィンドウ</a></p></li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">新規メールの送信</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">メールの返信</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">メールの転送</a></p>
-<p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">メールの作成時にAI 機能を使用する</a></p>
-<p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">代理としてメールを送信または受信する</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">メールの送信</a></p>
 <p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">暗号化されたメールの送信</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.email.gui.create">親記事:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">メール</span>構成</a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.detailview.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.detailview.html
index 4087be3a8..9e5bb26aa 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.detailview.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.detailview.html
@@ -57,6 +57,7 @@
 <li class="listitem">
 <p role="presentation">構成によって、次の機能の一つが利用できます。</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>カテゴリを設定</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>。カテゴリを割り当てたり、カテゴリを管理するための機能を持つメニューを開きます。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>色を設定</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>。メニューを開き、メールに色付きラベルを割り当てます。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>フラグ</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>。メールにフラグをたてる</p></li>
 </ul>
@@ -74,6 +75,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>送信済み</strong></span>フォルダー内のリンクとしての添付ファイル付きのメールを選択すると、添付ファイルについての情報はメール本文の上に表示されます。</p></li>
+<li class="listitem"><p role="presentation">構成によって:利用可能な場合、割り当てられたカテゴリが表示されます。</p></li>
 <li class="listitem">
 <p role="presentation">メールの本文</p>
 <p role="presentation">過去のメールの引用には、行の最初に印がつけられます。</p>
@@ -87,15 +89,11 @@
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html"><span class="phrase">メール</span> ポップアップ</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">メール編集ウィンドウ</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">メールを表示する</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">メールの返信</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">添付ファイルの表示、保存</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.detailview">親記事:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">メール</span>構成</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.foldertree.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.foldertree.html
index 32b2b18a0..c1f607a9e 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.foldertree.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.foldertree.html
@@ -48,7 +48,9 @@
 </ul>
 <p>構成およびメール設定によって、追加フォルダーを使用可能な場合があります。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">未読メールフォルダー、フラグ付きメッセージフォルダー</p></li>
+<li class="listitem"><p role="presentation">フラグ付きメッセージ用フォルダー</p></li>
+<li class="listitem"><p role="presentation">未読メッセージ用フォルダー</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.7.5.2.3"><p role="presentation">後で送信されるメッセージ用フォルダー</p></li>
 <li class="listitem"><p role="presentation">登録した共有メールフォルダーとパブリックメールフォルダー</p></li>
 <li class="listitem"><p role="presentation">管理者が割り当てた機能するメールアカウントのフォルダー</p></li>
 </ul>
@@ -61,10 +63,10 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">メールを表示する</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">メールフォルダーを追加</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">メール設定</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">機能するメールアカウントを無効または有効にする</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">機能するメールアカウントを無効または有効にする</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">フォルダーでデータを管理</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">共有データ</a></p>
 </li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.html
index a5a5bdbe4..641879be6 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.html
@@ -39,7 +39,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">新規メール ボタン</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">メール</span> フォルダービュー</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">The <span class="phrase">メール</span> タブバー</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">受信カテゴリバー</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html"><span class="phrase">メール</span> ポップアップ</a></p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.list.html
index 385183c2c..94885959b 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.list.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.list.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="メール構成">
-<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="The メール タブバー">
+<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="受信カテゴリバー">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.detailview.html" title="メール 詳細ビュー">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -46,6 +46,7 @@
 <li class="listitem"><p role="presentation">各メールの次の詳細情報が表示されます:差出人、件名、受信日時、サイズ。未読のメールは<span class="guibutton"><strong>未読</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span>で表示されます。</p></li>
 <li class="listitem"><p role="presentation">差出人の名前のヒントは、差出人のメールアドレスに表示されます。</p></li>
 <li class="listitem"><p role="presentation">利用可能な場合、添付ファイルのアイコン、色付きラベルまたはフラグ、<a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">スレッド</a>内のメール数、優先度などの追加情報も表示されます。</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.10.5.1.7"><p role="presentation">利用可能な場合、割り当てられたカテゴリが表示されます。メール設定では、割り当てられたカテゴリをリストビューで表示するかどうかを指定できます。</p></li>
 <li class="listitem"><p role="presentation">暗号化されたメールは暗号化アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.encrypted"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span>表示されます。</p></li>
 <li class="listitem">
 <p role="presentation">休暇通知が有効な場合、通知がリストビューの上に表示されます。</p>
@@ -63,12 +64,9 @@
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html"><span class="phrase">メール</span> 設定メニュー</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">メール設定</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">メール設定</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">メールを表示する</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.list">親記事:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">メール</span>構成</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.new.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.new.html
index b47a0ed34..08aff8aa7 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.new.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.new.html
@@ -47,7 +47,7 @@
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">新規メールの送信</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">メールの送信</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">メールアカウントを追加</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">添付ファイルの表示、保存</a></p>
 </li></ul>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.popup.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.popup.html
index a79bcfad0..f81d79f49 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.popup.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.popup.html
@@ -63,8 +63,7 @@
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">送信者または別の受取人に通話</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">送信者または別の受取人に通話</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">ハロー ビューで連絡先を表示するハロー ビューで連絡先を表示</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.popup">親記事:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">メール</span>構成</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.settingsmenu.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.settingsmenu.html
index 7178b78ef..c44a3f53c 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.settingsmenu.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.settingsmenu.html
@@ -54,7 +54,6 @@
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">メールアカウントを追加</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">添付ファイルの表示、保存</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.tabs.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.tabs.html
index 5a6da98a4..bf1239455 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.tabs.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.tabs.html
@@ -1,7 +1,7 @@
 <html lang="ja">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>The メール タブバー</title>
+<title>受信カテゴリバー</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
@@ -33,21 +33,18 @@
 <h2 class="sr-only">
 <span class="phrase">メール</span>構成</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.tabs">
-<div class="titlepage"><div><div><h3 class="title">The <span class="phrase">メール</span> タブバー</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">受信カテゴリバー</h3></div></div></div>
 <a class="indexterm" name="id-1.7.8.9.2"></a><p id="ox.appsuite.user.concept.email.gui.tabs"><span class="guibutton"><strong>受信トレイ</strong></span>フォルダー内のメールに対する既定受信トレイタブを表示します。これにより、受信メールを差出人で分類されたタブに割り当てることができます。</p>
 <p id="ox.appsuite.user.reference.email.gui.tabs"></p>
 <p class="title">注意:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">構成によって、受信トレイタブが利用できないことがあります。</p></li>
-<li class="listitem"><p role="presentation">受信トレイタブが利用可能であれば、受信トレイタブバーを表示または非表示にすることができます。表示/非表示を切り替えるには、メニューバーの<span class="guibutton"><strong>設定</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>をクリックします。<span class="guibutton"><strong>受信トレイのカテゴリ</strong></span>をクリックします。</p></li>
+<li class="listitem"><p role="presentation">受信トレイのカテゴリが利用可能であれば、受信トレイのカテゴリバーを表示または非表示にすることができます。表示/非表示を切り替えるには、メニューバーの<span class="guibutton"><strong>設定</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>をクリックします。<span class="guibutton"><strong>受信トレイのカテゴリ</strong></span>をクリックします。</p></li>
 <li class="listitem"><p role="presentation">受信トレイタブの数、名前、順番は既定です。構成によって、受信トレイタブの名前を変更したり、無効にすることができます。</p></li>
 </ul>
 <p id="ox.appsuite.user.related.email.gui.tabs"></p>
 <p class="title">関連トピック</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">受信トレイのカテゴリの使い方</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">受信トレイのカテゴリの使い方</a></p></li></ul>
 <p id="ox.appsuite.user.reference.email.gui.tabs.parent">親記事:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">メール</span>構成</a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.toolbar.html
index 2f54fd2ba..18cd607fe 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.toolbar.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.gui.toolbar.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="メール構成">
 <link rel="prev" href="ox.appsuite.user.sect.email.gui.foldertree.html" title="The メール フォルダービュー">
-<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="The メール タブバー">
+<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="受信カテゴリバー">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -43,7 +43,8 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>アーカイブ</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.archive"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span>。選択したメールをアーカイブします。</p></li>
 <li class="listitem"><p role="presentation">選択したメールに<span class="guibutton"><strong>返信</strong></span>およびメールの<span class="guibutton"><strong>転送</strong></span>用アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">構成によって、<span class="guibutton"><strong>AI 統合</strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>。AI機能のついたメニューを開いて、メールの内容を編集します。</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>カテゴリを設定</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>。メニューを表示し、メールをカテゴリに移動できます。このアイコンは、受信トレイタブバーが表示されている場合にのみ利用可能です。</p></li>
+<li class="listitem"><p role="presentation">構成によって、<span class="guibutton"><strong>受信トレイのカテゴリを設定</strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.inboxcategories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>。メールを受信トレイのカテゴリに移動できるメニューを表示します。このアイコンは、受信トレイタブバーが表示されている場合にのみ利用可能です。</p></li>
+<li class="listitem"><p role="presentation">構成によって、<span class="guibutton"><strong>カテゴリを設定</strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>。カテゴリを割り当てたり、カテゴリを管理するための機能を持つメニューを開きます。</p></li>
 <li class="listitem"><p role="presentation">構成によって、<span class="guibutton"><strong>色を設定</strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>。選択したメールに色付きラベルを割り当てるメニューが表示されます。</p></li>
 <li class="listitem"><p role="presentation">構成によって、<span class="guibutton"><strong>フラグ</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>。メールにフラグをたてる</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>移動</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.moveto"><object type="image/svg+xml" data="../../images/folder-symlink.svg" height="15"></object></span>。選択したメールを他のフォルダーに移動します。</p></li>
@@ -55,25 +56,12 @@
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">The <span class="phrase">メール</span> タブバー</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">メールの返信</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">メールの転送</a></p>
 </li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">メールの返信時にAI 機能を使用する</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">メールの移動またはコピー</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">メールを既読、未読にする</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">メールの分類</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">メールのソースの表示</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">メールの下書きの使用</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">メールアラームを作成する</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">ポータルへのメールの追加</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">メールの保存</a></p>
-<p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">PDF としてメールをエクスポート</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">メールの印刷</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">メールの削除</a></p>
-</li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">メールの返信時にAI 機能を使用する</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.toolbar">親記事:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">メール</span>構成</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.addportal.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.addportal.html
index 459b15dc1..c42c47bc3 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.addportal.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.addportal.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">メールの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.addportal">
 <div class="titlepage"><div><div><h3 class="title">ポータルへのメールの追加</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.15.2"></a><a class="indexterm" name="id-1.7.15.15.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">ウィジェットとして、メールをポータルに追加できます。</p>
+<a class="indexterm" name="id-1.7.15.16.2"></a><a class="indexterm" name="id-1.7.15.16.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">ウィジェットとして、メールをポータルに追加できます。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.addportal">
 <p class="title">ポータルにメールを追加する:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,7 +46,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.addportal"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.add.html">ポータルウィジェットの追加</a></p></li></ul>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.archive.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.archive.html
index 552b222a2..82f471306 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.archive.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.archive.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">メールの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.archive">
 <div class="titlepage"><div><div><h3 class="title">メールのアーカイブ</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.20.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">メールをアーカイブするときに、<span class="guibutton"><strong>アーカイブ</strong></span>フォルダーにメールが移動されます。<span class="guibutton"><strong>アーカイブ</strong></span>フォルダーには、年毎にサブフォルダーが作成されます。アーカイブされたメールは、受信した年ごとにサブフォルダーへ保存されます。<span class="guibutton"><strong>アーカイブ</strong></span>フォルダーは、この機能を初めて使用した際に作成されます。次のようなオプションの機能があります。</p>
+<a class="indexterm" name="id-1.7.15.21.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">メールをアーカイブするときに、<span class="guibutton"><strong>アーカイブ</strong></span>フォルダーにメールが移動されます。<span class="guibutton"><strong>アーカイブ</strong></span>フォルダーには、年毎にサブフォルダーが作成されます。アーカイブされたメールは、受信した年ごとにサブフォルダーへ保存されます。<span class="guibutton"><strong>アーカイブ</strong></span>フォルダーは、この機能を初めて使用した際に作成されます。次のようなオプションの機能があります。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">90日を経過したフォルダー内のメールをアーカイブする</p></li>
 <li class="listitem"><p role="presentation">単一のメールをアーカイブする</p></li>
@@ -57,6 +57,13 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.archive"></p>
+<p class="title">ユーザ インターフェース</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">メール</span> フォルダービュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p>
+</li></ul>
+<p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">メールの印刷</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.archive">親記事:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.categories.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.categories.html
new file mode 100644
index 000000000..3eb78c8ef
--- /dev/null
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.categories.html
@@ -0,0 +1,90 @@
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>新規メールにインライン PGP 使用を既定にする</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="ユーザ ガイド">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="メールの管理">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="アドレスの収集">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="メールの分類">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">戻る</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">次へ</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">メール</span></h1>
+<h2 class="sr-only">メールの管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">新規メールにインライン PGP 使用を既定にする</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.categories">フォルダとは別にメールを整理するために、カテゴリを使用できます。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">メールにカテゴリで印をつけることができます。</p></li>
+<li class="listitem"><p role="presentation">特定のカテゴリで印をつけられたすべてのメールを表示できます。</p></li>
+</ul>
+<p>自分のカテゴリを作成、編集、削除できます。<a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a>参照。</p>
+<p id="ox.appsuite.user.tip.email.manage.categories">カテゴリとは別に、受信トレイのカテゴリを使用できます。受信トレイのカテゴリを使って、送信者に関係したメールを整理できます。<a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">受信トレイのカテゴリの使い方</a>参照。</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.mark">
+<p class="title">メールにカテゴリで印をつける:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">1つまたは複数のメールを選択します。</p></li>
+<li class="step">
+<p role="presentation">ツールバーで<span class="guibutton"><strong>カテゴリを設定</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.mark.add"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>をクリックします。カテゴリを選択します。</p>
+<p role="presentation">メールからカテゴリを削除するには、カテゴリをクリックします。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.view">
+<p class="title">特定のカテゴリで印をつけられたメールを表示する:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">カテゴリで印をつけられたメールを選択します。</p></li>
+<li class="step"><p role="presentation">詳細ビューでカテゴリをクリックします。</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>結果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">リストビューにこのカテゴリで印をつけられたすべてのメールが表示されます。</p></li>
+<li class="listitem"><p role="presentation">各メールにたいして、メールを含むフォルダーが表示されます。</p></li>
+<li class="listitem"><p role="presentation">前のリストを表示するには、検索フィールドで<span class="guibutton"><strong>検索をキャンセル</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>をクリックします。</p></li>
+</ul>
+          <p>ヒント:検索オプションを使用してカテゴリを検索することで、検索機能を使用することもできます。</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.categories"></p>
+<p class="title">ユーザ インターフェース</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p>
+</li></ul>
+<p> </p>
+<p class="title">関連トピック</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">メールの検索</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">予定にカテゴリを使用する</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">連絡先にカテゴリを使用</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">タスクにカテゴリを使用する</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.categories">親記事:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.collectaddress.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.collectaddress.html
index 9fbc6ca23..5ee44ba86 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.collectaddress.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.collectaddress.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="メールの管理">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.mark.html" title="メールを既読、未読にする">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="メールの分類">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="新規メールにインライン PGP 使用を既定にする">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.mark.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">次へ</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.categories.html">次へ</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -35,7 +35,7 @@
 <div class="titlepage"><div><div><h3 class="title">アドレスの収集</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.10.2"></a><a class="indexterm" name="id-1.7.15.10.3"></a><p id="ox.appsuite.user.concept.email.manage.collectaddress">次のようなオプションの機能があります。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">メール設定でこの機能を有効にすると、メールの送信時またはメールの表示時に自動的に新規メールアドレスを収集します。</p></li>
+<li class="listitem"><p role="presentation">メールの詳細設定でこの機能を有効にすると、メールの送信時または表示時に新規メールアドレスが自動で収集されます。</p></li>
 <li class="listitem"><p role="presentation">アドレス帳にメールアドレスを手動で追加</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.collectaddress">
@@ -51,7 +51,7 @@
           <p>注:この機能は新規連絡先に対してのみ利用できます。</p>
         </div>
 </div>
-<p role="presentation" class="cap-contacts"><p class="title">関連トピック</p><ul class="itemizedlist" style="list-style-type: none; ">
+<p role="presentation" class="cap-contacts"><p class="title">ユーザ インターフェース</p><ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p></li></ul> <p class="title">関連トピック</p><ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">メール設定</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">新規連絡先の作成</a></p></li>
 </ul></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.delete.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.delete.html
index bdaaba828..d7126bd39 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.delete.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.delete.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="メールの管理">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.archive.html" title="メールのアーカイブ">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="メールフォルダーのクリーンアップ">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.recover.html" title="メールの復元">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.archive.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">次へ</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.recover.html">次へ</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,20 +33,20 @@
 <h2 class="sr-only">メールの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">メールの削除</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.21.2"></a><a class="indexterm" name="id-1.7.15.21.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">次のようなオプションの機能があります。</p>
+<a class="indexterm" name="id-1.7.15.22.2"></a><a class="indexterm" name="id-1.7.15.22.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">次のようなオプションの機能があります。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">メールがごみ箱に移動されるか、消去された時に完全に削除するかを指定</p>
-<p role="presentation">ごみ箱に移動されたメールを復元</p>
+<p role="presentation">メールをごみ箱に移動するか、消去した時に完全に削除するかを指定できます。</p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">ごみ箱に移動されたメールを復元</p></li>
+<li class="listitem"><p role="presentation"><span class="cap-dumpster">完全に削除したメールは14日間は復元できます。この期間が過ぎた後は、</span>完全に削除したメールを復元<span class="phrase"><strong>できません</strong></span>。</p></li>
+</ul>
 </li>
-<li class="listitem"><p role="presentation">個々のメールまたはメールスレッド全体を削除</p></li>
-<li class="listitem"><p role="presentation">メール フォルダーのすべてのメールを削除 </p></li>
-<li class="listitem"><p role="presentation">メールをごみ箱から復元</p></li>
-<li class="listitem"><p role="presentation">ごみ箱からメールを 完全に削除 </p></li>
-<li class="listitem"><p role="presentation">ごみ箱を空にしてごみ箱からメールを完全に削除</p></li>
+<li class="listitem"><p role="presentation">1つのメールまたはスレッド全体を削除することができます。</p></li>
+<li class="listitem"><p role="presentation">メールフォルダーのすべてのメールを削除することができます。</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.delete.setting">
-<p class="title">メールをごみ箱に移動するか、消去した時に完全に削除するかを指定する</p>
+<p class="title">メールをごみ箱に移動するか、消去した時に完全に削除するかを指定する:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.setting"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
@@ -60,21 +60,21 @@
 <li class="listitem"><p role="presentation">メールをごみ箱に移動する場合は、<span class="guibutton"><strong>メールの完全な削除</strong></span>を無効にします。</p></li>
 <li class="listitem">
 <p role="presentation">メールを完全な削除する場合は、<span class="guibutton"><strong>メールの完全な削除</strong></span>を有効にします。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span>完全に削除したメールを元に戻すことは<span class="phrase"><strong>できません</strong></span>。</p>
+<p role="presentation"><span class="phrase"><strong>警告:</strong></span>構成によって、完全に削除したメールは復元<span class="phrase"><strong>できません</strong></span>。</p>
 </li>
 </ul></p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.delete">
-<p class="title">メールを削除する:</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.single">
+<p class="title">1つのメールを削除する:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">1つまたは複数のメールを選択します。</p></li>
 <li class="step">
-<p role="presentation">ツールバーで、<span class="guibutton"><strong>削除</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>をクリックします。</p>
+<p role="presentation">ツールバーで、<span class="guibutton"><strong>削除</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>をクリックします。</p>
 <p role="presentation">または:<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">キーボードの [Del] または [Backspace] キーを押してください。</p></li>
 <li class="listitem"><p role="presentation">メールのコンテキストメニューで、<span class="guibutton"><strong>削除</strong></span>をクリックします。</p></li>
-<li class="listitem"><p role="presentation">一つのメールを選択した場合、詳細ビューの<span class="guibutton"><strong>削除</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>を使用します。</p></li>
+<li class="listitem"><p role="presentation">一つのメールを選択した場合、詳細ビューの<span class="guibutton"><strong>削除</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>を使用します。</p></li>
 </ul></p>
 </li>
 </ol></div>
@@ -82,7 +82,7 @@
           <p>結果:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>メールの完全な削除</strong></span></a>設定が無効な場合:</p>
+<p role="presentation"><span class="guibutton"><strong>メールの完全な削除</strong></span>設定が無効な場合:</p>
 <p role="presentation">ごみ箱 フォルダにメールが移動されます。</p>
 </li>
 <li class="listitem">
@@ -92,17 +92,17 @@
 </ul>  
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptyfolder">
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.emptyfolder">
 <p class="title">フォルダーのすべてのメールを削除する:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">フォルダービューで、削除するメールが保存されているフォルダーを 選択 します。</p></li>
 <li class="step">
 <p role="presentation">次のいずれかの方法を使用します。<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">フォルダー名の隣の<span class="guibutton"><strong>アクション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックします。</p></li>
-<li class="listitem"><p role="presentation">リストの上の<span class="guibutton"><strong>追加アクション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックします。</p></li>
+<li class="listitem"><p role="presentation">フォルダー名の隣の<span class="guibutton"><strong>アクション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックします。</p></li>
+<li class="listitem"><p role="presentation">リストの上の<span class="guibutton"><strong>追加アクション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックします。</p></li>
 </ul></p>
 <p role="presentation"><span class="guibutton"><strong>全てのメッセージを削除する</strong></span>ボタンをクリックします。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span><a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>メールの完全な削除</strong></span></a>設定が有効な場合、削除されたメールは復元できません。</p>
+<p role="presentation"><span class="phrase"><strong>警告:</strong></span><span class="guibutton"><strong>メールの完全な削除</strong></span>設定が有効な場合、構成によって削除されたメールは復元<span class="phrase"><strong>できません</strong></span>。</p>
 </li>
 <li class="step"><p role="presentation">このフォルダーの内容を削除することを確定します。</p></li>
 </ol></div>
@@ -110,7 +110,7 @@
           <p>結果:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>メールの完全な削除</strong></span></a>設定が無効な場合:</p>
+<p role="presentation"><span class="guibutton"><strong>メールの完全な削除</strong></span>設定が無効な場合:</p>
 <p role="presentation">ごみ箱 フォルダにメールが移動されます。</p>
 </li>
 <li class="listitem">
@@ -120,60 +120,22 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
-<p class="title">削除したメールを復元する:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">フォルダービューで、<span class="guibutton"><strong>ゴミ箱</strong></span>フォルダーを開きます。</p></li>
-<li class="step"><p role="presentation">1つまたは複数のメールを選択します。</p></li>
-<li class="step"><p role="presentation">メールのコンテキストメニューで、<span class="guibutton"><strong>移動</strong></span>をクリックします。</p></li>
-<li class="step"><p role="presentation"><span class="guilabel"><strong>移動</strong></span>ウィンドウで、フォルダーを選択します。<span class="guibutton"><strong>移動</strong></span>ボタンをクリックします。</p></li>
-</ol></div>
-<div class="taskrelated">
-          <p>または:</p>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">ごみ箱からすべてのメールを復元するには、リストの上の<span class="guibutton"><strong>オプション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックします。<span class="guibutton"><strong>全てのメッセージを移動する</strong></span>ボタンをクリックします。</p></li>
-<li class="listitem"><p role="presentation">一つのメールを選択した場合、詳細ビューの<span class="guibutton"><strong>追加アクション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>を使用します。<span class="guibutton"><strong>移動</strong></span>をクリックします。</p></li>
-</ul>
-        </div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever">
-<p class="title">メールを完全に削除する:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>警告:</strong></span>完全に削除したメールを元に戻すことは<span class="phrase"><strong>できません</strong></span>。</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">フォルダービューで、<span class="guibutton"><strong>ゴミ箱</strong></span>フォルダーを開きます。</p></li>
-<li class="step"><p role="presentation">1つまたは複数のメールを選択します。</p></li>
-<li class="step">
-<p role="presentation">ツールバーで、<span class="guibutton"><strong>削除</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>をクリックします。</p>
-<p role="presentation">一つのメールを選択している場合、詳細ビューでも<span class="guibutton"><strong>削除</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>をクリックできます。</p>
-</li>
-<li class="step"><p role="presentation">選択したメールの完全削除を確定します。</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptytrash">
-<p class="title">ゴミ箱フォルダーのファイルを完全に削除する:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>警告:</strong></span>完全に削除したメールを元に戻すことは<span class="phrase"><strong>できません</strong></span>。</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">フォルダービューで、<span class="guibutton"><strong>ゴミ箱</strong></span>フォルダーを選択します。</p></li>
-<li class="step">
-<p role="presentation">次のいずれかの方法を使用します。<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>ごみ箱</strong></span>の隣の<span class="guibutton"><strong>追加アクション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックします。</p></li>
-<li class="listitem"><p role="presentation">リストの上の<span class="guibutton"><strong>追加アクション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックします。</p></li>
-</ul></p>
-<p role="presentation"><span class="guibutton"><strong>フォルダーを空にする</strong></span>をクリックします。</p>
-</li>
-<li class="step"><p role="presentation">フォルダーの内容を削除することを確定します。</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.email.manage.delete"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">メール</span> フォルダービュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">メールフォルダーのクリーンアップ</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">メールの復元</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">メールの削除</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.22.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">完全に削除されたメールを復元する</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">メールフォルダーのクリーンアップ</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.email.manage.delete">親記事:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.deleteforever.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.deleteforever.html
new file mode 100644
index 000000000..2b9d00cc6
--- /dev/null
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.deleteforever.html
@@ -0,0 +1,87 @@
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>メールの削除</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="ユーザ ガイド">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="メールの管理">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.recover.html" title="メールの復元">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.undelete.html" title="完全に削除されたメールを復元する">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.recover.html">戻る</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.undelete.html">次へ</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">メール</span></h1>
+<h2 class="sr-only">メールの管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.deleteforever">
+<div class="titlepage"><div><div><h3 class="title">メールの削除</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.24.2"></a><a class="indexterm" name="id-1.7.15.24.3"></a><p id="ox.appsuite.user.concept.email.manage.deleteforever">次のようなオプションの機能があります。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">1つのメールをゴミ箱から完全に削除</p></li>
+<li class="listitem"><p role="presentation">ごみ箱を空にしてごみ箱からメールを完全に削除</p></li>
+</ul>
+<p id="ox.appsuite.user.hint.email.manage.deleteforever.html"><span class="cap-dumpster">完全に削除したメールは14日間は復元できます。この期間が過ぎた後は、</span>完全に削除したメールを復元<span class="phrase"><strong>できません</strong></span>。</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.single">
+<p class="title">1つのメールを完全に削除する:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">フォルダービューで、<span class="guibutton"><strong>ゴミ箱</strong></span>フォルダーを開きます。</p></li>
+<li class="step"><p role="presentation">1つまたは複数のメールを選択します。</p></li>
+<li class="step">
+<p role="presentation">ツールバーで、<span class="guibutton"><strong>削除</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>をクリックします。</p>
+<p role="presentation">一つのメールを選択している場合、詳細ビューでも<span class="guibutton"><strong>削除</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>をクリックできます。</p>
+</li>
+<li class="step"><p role="presentation">選択したメールの完全削除を確定します。</p></li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.emptytrash">
+<p class="title">すべてのメールをゴミ箱から完全に削除する:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">フォルダービューで、<span class="guibutton"><strong>ゴミ箱</strong></span>フォルダーを選択します。</p></li>
+<li class="step">
+<p role="presentation">次のいずれかの方法を使用します。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>ごみ箱</strong></span>の隣の<span class="guibutton"><strong>追加アクション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックします。</p></li>
+<li class="listitem"><p role="presentation">リストの上の<span class="guibutton"><strong>追加アクション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックします。</p></li>
+</ul></p>
+<p role="presentation"><span class="guibutton"><strong>フォルダーを空にする</strong></span>をクリックします。</p>
+</li>
+<li class="step"><p role="presentation">フォルダーの内容を削除することを確定します。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.deleteforever"></p>
+<p class="title">ユーザ インターフェース</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">メール</span> フォルダービュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
+</li></ul>
+<p> </p>
+<p class="title">関連トピック</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">メールの削除</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">メールの復元</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.24.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">完全に削除されたメールを復元する</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">メールフォルダーのクリーンアップ</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.deleteforever">親記事:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.draft.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.draft.html
index b4e412022..4b7aed241 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.draft.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.draft.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">メールの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.draft">
 <div class="titlepage"><div><div><h3 class="title">メールの下書きの使用</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">メール作成中、メールは定期的にメールの下書きとして自動で保存されます。次のようなオプションの機能があります。</p>
+<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">メール作成中、メールは定期的にメールの下書きとして自動で保存されます。次のようなオプションの機能があります。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">メールの下書きを編集、または送信します。</p></li>
 <li class="listitem"><p role="presentation">メールの下書きのコピーを編集、または送信します。</p></li>
@@ -64,7 +64,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.draft"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">メール</span> フォルダービュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.expungefolder.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.expungefolder.html
index 03051fb3b..ad14f68e0 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.expungefolder.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.expungefolder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="メールの管理">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="メールの削除">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.undelete.html" title="完全に削除されたメールを復元する">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.unifiedmail.html" title="統合メールの使用">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.undelete.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">次へ</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">メールの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.expungefolder">
 <div class="titlepage"><div><div><h3 class="title">メールフォルダーのクリーンアップ</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.22.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">設定によっては、Apple メール、MS Outlook、Mozilla Thunderbird などのメールクライアントから削除したメールは、それらのクライアントからサインアウトした後でないと、削除されない場合があります。それまでは、グループウェアにはメールにバツが表示されます。これらのメールを削除するには、メールフォルダーのクリーンアップを行います。</p>
+<a class="indexterm" name="id-1.7.15.26.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">設定によっては、Apple メール、MS Outlook、Mozilla Thunderbird などのメールクライアントから削除したメールは、それらのクライアントからサインアウトした後でないと、削除されない場合があります。それまでは、グループウェアにはメールにバツが表示されます。これらのメールを削除するには、メールフォルダーのクリーンアップを行います。</p>
 <p id="ox.appsuite.user.hint.email.manage.expungefolder">注:構成によって、メールを表示しないように、この機能が利用できません。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.expunge">
 <p class="title">メールフォルダーをクリーンアップする:</p>
@@ -43,6 +43,9 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.expungefolder"></p>
+<p class="title">ユーザ インターフェース</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">メール</span> フォルダービュー</a></p></li></ul>
+<p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">メールの削除</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.expungefolder">親記事:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.html
index d3a06429f..d9d0c37cf 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.html
@@ -38,17 +38,21 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">メールの移動またはコピー</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">メールを既読、未読にする</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">アドレスの収集</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">新規メールにインライン PGP 使用を既定にする</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">メールの分類</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">メールのソースの表示</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">メールの下書きの使用</a></p></li>
-<li class="listitem cap-tasks" id="id-1.7.15.4.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">メールアラームを作成する</a></p></li>
+<li class="listitem cap-tasks" id="id-1.7.15.4.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">メールアラームを作成する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">ポータルへのメールの追加</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">メールの保存</a></p></li>
-<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">PDF としてメールをエクスポート</a></p></li>
+<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">PDF としてメールをエクスポート</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">メールのインポート</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">メールの印刷</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">メールのアーカイブ</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">メールの削除</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">メールの復元</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">メールの削除</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.4.1.19"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">完全に削除されたメールを復元する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">メールフォルダーのクリーンアップ</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">統合メールの使用</a></p></li>
 </ul>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.import.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.import.html
index c161d8055..6e8331ab4 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.import.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">メールの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.import">
 <div class="titlepage"><div><div><h3 class="title">メールのインポート</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><p id="ox.appsuite.user.concept.email.manage.import">EML フォーマットのメールはインポートできます。</p>
+<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.import">EML フォーマットのメールはインポートできます。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.import">
 <p class="title">メールをインポートする:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -42,6 +42,12 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.import"></p>
+<p class="title">ユーザ インターフェース</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">メール</span> フォルダービュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p>
+</li></ul>
+<p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">メールの保存</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.import">親記事:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.inboxcategories.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.inboxcategories.html
index 0b66a11a2..138772ed2 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.inboxcategories.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.inboxcategories.html
@@ -39,7 +39,7 @@
 <li class="listitem"><p role="presentation">受信トレイのカテゴリに受信メールを割り当て</p></li>
 <li class="listitem"><p role="presentation">受信トレイのカテゴリ表示を編集</p></li>
 </ul>
-<p role="presentation" class="feat-io-ox-core-categories">注:ここで説明されている受信トレイのカテゴリはメールにのみ使用できます。構成によって、予定、連絡先、タスクの別々のカテゴリを使用できます。<a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a>参照。</p>
+<p role="presentation" class="feat-io-ox-core-categories">注:ここで説明されている受信トレイのカテゴリはメールにのみ使用できます。構成によって、メール、予定、連絡先、タスクの別々のカテゴリを使用できます。<a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">新規メールにインライン PGP 使用を既定にする</a>参照。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.inboxcategories.activate">
 <p class="title">受信トレイタブを無効化または有効化する:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -47,7 +47,7 @@
 <p role="presentation">受信トレイタブを有効化するには、メニューバーの<span class="guibutton"><strong>設定</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.activate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>をクリックします。<span class="guibutton"><strong>受信トレイのカテゴリ</strong></span>をクリックします。</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">メール設定の<span class="guibutton"><strong>既読</strong></span> 下の<span class="guibutton"><strong>受信トレイの構成</strong></span>ボタンを使用することもできます。</p></li></ul>
 <p role="presentation"><span class="guilabel"><strong>カテゴリを構成</strong></span>ウィンドウが開きます。利用可能な受信トレイのカテゴリが表示されます。<span class="guibutton"><strong>カテゴリを有効にする</strong></span>をクリックします。</p>
-<p role="presentation">メニューバーの右下にタブバーが表示されます。</p>
+<p role="presentation">メニューバーの下に受信トレイのカテゴリバーが表示されます。</p>
 </li>
 <li class="step">
 <p role="presentation">受信トレイタブを無効にするには、メニューバーの<span class="guibutton"><strong>設定</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.deactivate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>をクリックします。<span class="guibutton"><strong>受信トレイのカテゴリ</strong></span>をクリックします。</p>
@@ -63,7 +63,7 @@
 <p role="presentation">受信トレイのカテゴリにまだ割り当てられていないメールが<span class="guibutton"><strong>一般</strong></span>タブに表示されます。</p>
 </li>
 <li class="step">
-<p role="presentation">リストビューからメールをタブバーのタブにドラッグして、ドロップします。</p>
+<p role="presentation">メールをリストビューから受信トレイのカテゴリバーのカテゴリにドラッグして、ドロップします。</p>
 <p role="presentation">メールを選択することもできます。ツールバーで<span class="guibutton"><strong>カテゴリを設定</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>をクリックします。メニューで、タブを選択します。</p>
 </li>
 <li class="step"><p role="presentation">処理を終了するには、次のいずれかを行ってください。<ul class="itemizedlist" style="list-style-type: disc; ">
@@ -77,14 +77,14 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>受信トレイのカテゴリ</strong></span>をクリックします。</p>
-<p role="presentation">カテゴリバーの<span class="guibutton"><strong>カテゴリの設定</strong></span> アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックしてもかまいません。</p>
+<p role="presentation">受信トレイカテゴリバーの<span class="guibutton"><strong>カテゴリの設定</strong></span> アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックしてもかまいません。</p>
 <p role="presentation"><span class="guilabel"><strong>カテゴリを構成</strong></span>ウィンドウが開きます。</p>
 </li>
 <li class="step">
 <p role="presentation">受信トレイのカテゴリを有効化または無効化するには、そのチェックボックスを有効化または無効化します。</p>
 <p role="presentation">受信トレイのカテゴリ名を変更するには、そのテキストを編集します。</p>
 <p role="presentation">注:カテゴリの編集ができない場合があります。</p>
-<p role="presentation">カテゴリバーを非表示にするには、<span class="guibutton"><strong>カテゴリを無効</strong></span>をクリックします。</p>
+<p role="presentation">受信トレイのカテゴリバーを非表示にするには、<span class="guibutton"><strong>カテゴリを無効</strong></span>をクリックします。</p>
 </li>
 <li class="step"><p role="presentation"><span class="guibutton"><strong>保存</strong></span>をクリックします。</p></li>
 </ol></div>
@@ -93,14 +93,11 @@
 <p class="title">ユーザ インターフェース</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html"><span class="phrase">メール</span> 設定メニュー</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">The <span class="phrase">メール</span> タブバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">受信カテゴリバー</a></p>
 </li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">メール設定</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">メールを表示する</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">メール設定</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.inboxcategories">親記事:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.label.html
index 79e8a97c4..4d2b6f4fe 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.label.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.label.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="メールの管理">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="アドレスの収集">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="新規メールにインライン PGP 使用を既定にする">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.source.html" title="メールのソースの表示">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.categories.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.source.html">次へ</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">メールの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.label">
 <div class="titlepage"><div><div><h3 class="title">メールの分類</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.label">構成によって、メールの分類するための複数のオプションの一つを使用できます。</p>
+<a class="indexterm" name="id-1.7.15.12.2"></a><a class="indexterm" name="id-1.7.15.12.3"></a><p id="ox.appsuite.user.concept.email.manage.label">構成によって、メールの分類するための複数のオプションの一つを使用できます。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">色付きラベル</p></li>
 <li class="listitem"><p role="presentation">フラグ</p></li>
@@ -64,7 +64,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.label"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.mark.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.mark.html
index 898f3855e..8bc28db8d 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.mark.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.mark.html
@@ -57,7 +57,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.mark"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">メールを表示する</a></p></li></ul>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.movecopy.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.movecopy.html
index df2733fbf..608424b95 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.movecopy.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.movecopy.html
@@ -62,7 +62,11 @@
 </ul>
 <p id="ox.appsuite.user.related.email.manage.movecopy"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.pdfexport.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.pdfexport.html
index 905b88bc3..ccc51a801 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.pdfexport.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.pdfexport.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">メールの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.pdfexport">
 <div class="titlepage"><div><div><h3 class="title">PDF としてメールをエクスポート</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.17.2"></a><a class="indexterm" name="id-1.7.15.17.3"></a><a class="indexterm" name="id-1.7.15.17.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">注:構成によって、この機能は利用できない可能性があります。</p>
+<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><a class="indexterm" name="id-1.7.15.18.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">注:構成によって、この機能は利用できない可能性があります。</p>
 <p id="ox.appsuite.user.concept.email.manage.pdfexport">メールと添付ファイルを docx 形式でエクスポートできます。PDFファイルが作成されると、指定された<span class="phrase">ドライブ</span> フォルダーに保存されます。データ量によって、ダウンロードに多少時間がかかることがあります。処理が終了するとすぐに通知を受信します。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.pdfexport">
 <p class="title">PDF としてメールをエクスポートする:</p>
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.pdfexport"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">メールの保存</a></p></li></ul>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.print.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.print.html
index 496714c5e..6f7716f40 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.print.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">メールの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.print">
 <div class="titlepage"><div><div><h3 class="title">メールの印刷</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.print">一通のメールまたは複数のメールの内容を印刷できます。</p>
+<a class="indexterm" name="id-1.7.15.20.2"></a><a class="indexterm" name="id-1.7.15.20.3"></a><p id="ox.appsuite.user.concept.email.manage.print">一通のメールまたは複数のメールの内容を印刷できます。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.print">
 <p class="title">メールの内容を印刷する:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.print"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">メールのアーカイブ</a></p></li></ul>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.recover.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.recover.html
new file mode 100644
index 000000000..71b9b3bdb
--- /dev/null
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.recover.html
@@ -0,0 +1,92 @@
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>メールの復元</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="ユーザ ガイド">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="メールの管理">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="メールの削除">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="メールの削除">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">戻る</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">次へ</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">メール</span></h1>
+<h2 class="sr-only">メールの管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.recover">
+<div class="titlepage"><div><div><h3 class="title">メールの復元</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.recover">次のようなオプションの機能があります。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">1つのメールをゴミ箱から復元</p></li>
+<li class="listitem"><p role="presentation">すべてのメールをゴミ箱から復元</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.single">
+<p class="title">1つのメールをゴミ箱から復元する:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">フォルダービューで、<span class="guibutton"><strong>ゴミ箱</strong></span>フォルダーを開きます。</p></li>
+<li class="step">
+<p role="presentation">1つまたは複数のメールを選択します。</p>
+<p role="presentation">メールのコンテキストメニューで、<span class="guibutton"><strong>移動</strong></span>をクリックします。</p>
+</li>
+<li class="step"><p role="presentation"><span class="guilabel"><strong>移動</strong></span>ウィンドウで、フォルダーを選択します。<span class="guibutton"><strong>移動</strong></span> をクリックします。</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>または:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">ドラッグアンドドロップを使用して、メールをゴミ箱からフォルダービューのフォルダーに移動します。</p></li>
+<li class="listitem"><p role="presentation">一つのメールを選択した場合、詳細ビューの<span class="guibutton"><strong>追加アクション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.single.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>を使用します。<span class="guibutton"><strong>移動</strong></span>をクリックします。</p></li>
+</ul>
+        </div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.all">
+<p class="title">すべてのメールをゴミ箱から復元する:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">フォルダービューで、<span class="guibutton"><strong>ゴミ箱</strong></span>フォルダーを選択します。</p></li>
+<li class="step">
+<p role="presentation">次のいずれかの方法を使用します。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>ごみ箱</strong></span>の隣の<span class="guibutton"><strong>追加アクション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックします。</p></li>
+<li class="listitem"><p role="presentation">リストの上の<span class="guibutton"><strong>追加アクション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックします。</p></li>
+</ul></p>
+<p role="presentation"><span class="guibutton"><strong>全てのメッセージを移動する</strong></span>ボタンをクリックします。</p>
+</li>
+<li class="step"><p role="presentation"><span class="guilabel"><strong>移動</strong></span>ウィンドウで、フォルダーを選択します。<span class="guibutton"><strong>すべて移動</strong></span>をクリックします。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.recover"></p>
+<p class="title">ユーザ インターフェース</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">メール</span> フォルダービュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
+</li></ul>
+<p> </p>
+<p class="title">関連トピック</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">メールの削除</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">メールの削除</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.23.7.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">完全に削除されたメールを復元する</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">メールフォルダーのクリーンアップ</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.recover">親記事:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.reminder.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.reminder.html
index 35a289126..5f684ebb7 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.reminder.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.reminder.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">メールの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.reminder">
 <div class="titlepage"><div><div><h3 class="title">メールアラームを作成する</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">メールにアラームを設定できます。この機能を使用すると、指定した終了日時にアラームを通知するタスクを作成できます。</p>
+<a class="indexterm" name="id-1.7.15.15.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">メールにアラームを設定できます。この機能を使用すると、指定した終了日時にアラームを通知するタスクを作成できます。</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.email.manage.reminder">
 <p class="title">メールアラームを作成する:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -47,7 +47,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.reminder"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">タスクの作成</a></p></li></ul>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.save.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.save.html
index 09884f62d..e018eca9a 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.save.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.save.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">メールの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.save">
 <div class="titlepage"><div><div><h3 class="title">メールの保存</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.16.2"></a><p id="ox.appsuite.user.concept.email.manage.save">メールは、テキストファイルとして保存できます。このテキストファイルの拡張子は eml になります。複数のメールを選択すると、メールごとにemlファイルが作成されます。emlファイルはzipアーカイブで保存されます。</p>
+<a class="indexterm" name="id-1.7.15.17.2"></a><p id="ox.appsuite.user.concept.email.manage.save">メールは、テキストファイルとして保存できます。このテキストファイルの拡張子は eml になります。複数のメールを選択すると、メールごとにemlファイルが作成されます。emlファイルはzipアーカイブで保存されます。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.save">
 <p class="title">メールを保存する:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,7 +44,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.save"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -52,7 +55,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">メールのインポート</a></p>
 <p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">PDF としてメールをエクスポート</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.7.15.16.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">個人データをダウンロード</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.7.15.17.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">個人データをダウンロード</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.save">親記事:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.source.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.source.html
index 767e31283..bf6394b2e 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.source.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.source.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">メールの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.source">
 <div class="titlepage"><div><div><h3 class="title">メールのソースの表示</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.12.2"></a><p id="ox.appsuite.user.concept.email.manage.source">メールのソースには、すべてのメールヘッダ情報が含まれています。</p>
+<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.source">メールのソースには、すべてのメールヘッダ情報が含まれています。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.source">
 <p class="title">メールのソースを表示する:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,7 +46,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.source"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">メール</span>ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.undelete.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.undelete.html
new file mode 100644
index 000000000..952b69511
--- /dev/null
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.undelete.html
@@ -0,0 +1,70 @@
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>完全に削除されたメールを復元する</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="ユーザ ガイド">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="メールの管理">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="メールの削除">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="メールフォルダーのクリーンアップ">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">戻る</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">次へ</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">メール</span></h1>
+<h2 class="sr-only">メールの管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.undelete">
+<div class="titlepage"><div><div><h3 class="title">完全に削除されたメールを復元する</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.25.2"></a><a class="indexterm" name="id-1.7.15.25.3"></a><p id="ox.appsuite.user.concept.email.manage.undelete.html">完全に削除したメールは14日間は復元できます。この期間が過ぎた後は、完全に削除したメールを復元できません。</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
+<p class="title">完全に削除したメールを復元する:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">フォルダービューで、<span class="guibutton"><strong>ゴミ箱</strong></span>フォルダーを選択します。</p></li>
+<li class="step">
+<p role="presentation"><span class="guibutton"><strong>ごみ箱</strong></span>の隣の<span class="guibutton"><strong>追加アクション</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>をクリックします。</p>
+<p role="presentation"><span class="guibutton"><strong>削除済みの項目を復元</strong></span>をクリックします。</p>
+</li>
+<li class="step">
+<p role="presentation"><span class="guilabel"><strong>削除済みの項目を復元</strong></span>ウィンドウで復元したいメールを選択します。</p>
+<p role="presentation"><span class="guibutton"><strong>選択した項目を移動</strong></span>をクリックします。</p>
+</li>
+<li class="step">
+<p role="presentation"><span class="guilabel"><strong>移動</strong></span>ウィンドウで、復元されたメールを含むフォルダーを指定します。</p>
+<p role="presentation"><span class="guibutton"><strong>移動</strong></span>をクリックします。</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.undelete"></p>
+<p class="title">ユーザ インターフェース</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">メール</span> フォルダービュー</a></p></li></ul>
+<p> </p>
+<p class="title">関連トピック</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">メールの削除</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">メールの復元</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">メールの削除</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">メールフォルダーのクリーンアップ</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.undelete">親記事:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">メールの管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.unifiedmail.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.unifiedmail.html
index daad86878..c92acb7e0 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.unifiedmail.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.manage.unifiedmail.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">メールの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.unifiedmail">
 <div class="titlepage"><div><div><h3 class="title">統合メールの使用</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">統合メールを使用すると、複数のメールアカウントのメールを1つのフォルダーに集約して表示できます。この機能を利用すると、複数のメールアカウントの受信トレイを素早く確認できます。統合メールには、次のような特徴があります。</p>
+<a class="indexterm" name="id-1.7.15.27.2"></a><a class="indexterm" name="id-1.7.15.27.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">統合メールを使用すると、複数のメールアカウントのメールを1つのフォルダーに集約して表示できます。この機能を利用すると、複数のメールアカウントの受信トレイを素早く確認できます。統合メールには、次のような特徴があります。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">メールアカウント受信トレイに加えて、<span class="guibutton"><strong>統合メール</strong></span>フォルダーにもアカウントのメールビューが表示されます。ただし、実際のメールは1つだけになります。</p></li>
 <li class="listitem"><p role="presentation">受信トレイのサブフォルダーのメールは、<span class="guibutton"><strong>統合メール</strong></span>フォルダーには表示されません。</p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.openai.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.openai.html
index f187e210d..f7bead4a0 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.openai.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.openai.html
@@ -37,7 +37,7 @@
 <li class="listitem"><p role="presentation">既存のメールの内容を編集する、または返信用のテキスト案を作成する</p></li>
 <li class="listitem"><p role="presentation">新しいメールを送信するためのテキスト案を作成する</p></li>
 </ul>
-<p>注:AI 統合を使用すると、各メールの内容はMicrosoft Azure OpenAI Serviceに送信されます。</p>
+<p>注:AI 統合を使用すると、各メールの内容はOpenAI Serviceに送信されます。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">AI 機能を初めて使用する場合、このデータの送信に同意するダイアログボックスが表示されます。AI 機能は、データの送信に同意した後でのみ使用することができます。</p></li>
 <li class="listitem"><p role="presentation">データ送信の同意はいつでも変更することができます。その場合、メール設定の <span class="guibutton"><strong>AI 統合</strong></span> 下の<span class="guibutton"><strong>同意を変更</strong></span>をクリックします。</p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.search.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.search.html
index daf0dbe47..7223697d2 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.search.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.search.html
@@ -93,7 +93,10 @@
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">メールを表示する</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">メールの分類</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">メールの分類</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">新規メールにインライン PGP 使用を既定にする</a></p>
+</li>
 </ul>
 <p id="ox.appsuite.user.parent.email.search">親記事:<a class="xref" href="ox.appsuite.user.chap.email.html"><i><span class="phrase">メール</span></i></a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attachmentexisting.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attachmentexisting.html
index ec0555ac5..0da376cfc 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attachmentexisting.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attachmentexisting.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.email.send.html" title="メールの送信">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="添付ファイルの追加">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="リンクとして添付ファイルを送信する">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="添付ファイルを追加">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="リンクとして添付ファイルを送信する:">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -58,8 +58,8 @@
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルの追加</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">リンクとして添付ファイルを送信する</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルを追加</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">リンクとして添付ファイルを送信する:</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.send..attachmentexisting">親記事:<a class="xref" href="ox.appsuite.user.sect.email.send.html">メールの送信</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attachmentlink.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attachmentlink.html
index 86470f272..ba79e26b2 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attachmentlink.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attachmentlink.html
@@ -1,7 +1,7 @@
 <html lang="ja">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>リンクとして添付ファイルを送信する</title>
+<title>リンクとして添付ファイルを送信する:</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">メール</span></h1>
 <h2 class="sr-only">メールの送信</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentlink">
-<div class="titlepage"><div><div><h3 class="title">リンクとして添付ファイルを送信する</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">リンクとして添付ファイルを送信する:</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.10.2"></a><p id="ox.appsuite.user.concept.email.send.attachmentlink">この機能によって大きな添付ファイルをメールで送信できます。こういう風に使います:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">添付ファイルは<span class="phrase">ドライブ</span>アプリケーション内の<span class="guibutton"><strong>ドライブメール</strong></span>下の新規フォルダーにアップロードされます。そのフォルダー名はメールの件名になります。そのフォルダをパブリックリンクを使って共有されます。</p></li>
@@ -71,7 +71,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">構成によって、リンクとして送信できる添付ファイルの最大ファイルサイズがある場合があります。</p></li>
 <li class="listitem">
-<p role="presentation">リストビューでは、<span class="guibutton"><strong>送信済み</strong></span>フォルダーのメールにはアイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachmentlink.hint"><object type="image/svg+xml" data="../../images/cloud-download-fill.svg" height="15"></object></span>で印がつけられます。メールを表示するとき、次の情報はメール本文の上に表示されます。</p>
+<p role="presentation">リストビューでは、<span class="guibutton"><strong>送信済み</strong></span>フォルダーのメールにはアイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachmentlink.hint"><object type="image/svg+xml" data="../../images/cloud-download-fill.svg" height="15"></object></span>印がつけられます。メールを表示するとき、次の情報はメール本文の上に表示されます。</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">添付ファイルの入っているフォルダーへのリンク</p></li>
 <li class="listitem"><p role="presentation">利用期限とパスワードについての情報</p></li>
@@ -88,7 +88,7 @@
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルの追加</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルを追加</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">既存メールから添付ファイルを追加</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.send.attachmentlink">親記事:<a class="xref" href="ox.appsuite.user.sect.email.send.html">メールの送信</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attachments.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attachments.html
index 2e1e31dfe..e0d6e05d8 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attachments.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attachments.html
@@ -1,7 +1,7 @@
 <html lang="ja">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>添付ファイルの追加</title>
+<title>添付ファイルを追加</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">メール</span></h1>
 <h2 class="sr-only">メールの送信</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachments">
-<div class="titlepage"><div><div><h3 class="title">添付ファイルの追加</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">添付ファイルを追加</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.8.2"></a><a class="indexterm" name="id-1.7.11.8.3"></a><p id="ox.appsuite.user.concept.emal.add.attachments">構成によって、コンピューターに保存されたファイル、または <span class="phrase">ドライブ</span>アプリケーションに保存されたファイルを添付できます。</p>
 <div class="task" id="ox.appsuite.user.task.email.send.attachments">
 <p class="title">メール編集ウィンドウで添付ファイルを追加する:</p>
@@ -62,7 +62,7 @@
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">既存メールから添付ファイルを追加</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">リンクとして添付ファイルを送信する</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">リンクとして添付ファイルを送信する:</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.send.attachments">親記事:<a class="xref" href="ox.appsuite.user.sect.email.send.html">メールの送信</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attendees.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attendees.html
index 746ab1caf..a9dd71ea5 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attendees.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.attendees.html
@@ -47,14 +47,14 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.send.attendees"></p>
-<p class="title">関連トピック</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
+<p class="title">ユーザ インターフェース</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">カレンダー</span> ポップアップ</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">カレンダー</span> ツールバー</a></p>
-</li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">新規メールの送信</a></p></li>
-</ul>
+</li></ul>
+<p> </p>
+<p class="title">関連トピック</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">新規メールの送信</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.send.attendees">親記事:<a class="xref" href="ox.appsuite.user.sect.email.send.html">メールの送信</a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.html
index d7b9e3ede..7a6363b06 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.html
@@ -35,11 +35,11 @@
 <p id="ox.appsuite.user.orientation.email.send">メールの送信の仕方とメール内容のカスタマイズ機能について学ぶ:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">新規メールの送信</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択する</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">返信先アドレスを設定</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルの追加</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルを追加</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">既存メールから添付ファイルを追加</a></p></li>
-<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">リンクとして添付ファイルを送信する</a></p></li>
+<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">リンクとして添付ファイルを送信する:</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.11.2.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">テンプレートの使用</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">署名を使用</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">メールの返信</a></p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.new.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.new.html
index 4c34b14f1..4207770ac 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.new.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.email.send.html" title="メールの送信">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="メールの送信">
-<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="差出人のメールアドレスを選択する">
+<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="差出人のメールアドレスを選択">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -88,34 +88,23 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">新規メール ボタン</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">メール編集ウィンドウ</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">従属アクション:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">アドレス帳から連絡先またはリソースを自動で追加する</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">アドレスディレクトリから連絡先またはリソースを自動で追加する</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択する</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">差出人のメールアドレスを選択</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">返信先アドレスを設定</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルの追加</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">添付ファイルを追加</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">既存メールから添付ファイルを追加</a></p>
-<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">リンクとして添付ファイルを送信する</a></p>
+<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">リンクとして添付ファイルを送信する:</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">テンプレートの使用</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">署名を使用</a></p>
 </li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">メールの返信</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">メールの転送</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">メールの自動転送</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">予定の参加者へのメールの送信</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">休暇通知の自動送信</a></p>
-<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">暗号化されたメールの送信</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">メール設定</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">vCard での連絡先の送信</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">アドレス帳からのメールの送信</a></p>
-</li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">メールの作成時にAI 機能を使用する</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">メールの作成時にAI 機能を使用する</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">メール設定</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.send.new">親記事:<a class="xref" href="ox.appsuite.user.sect.email.send.html">メールの送信</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.replyto.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.replyto.html
index c3ba6b0ad..eb39449f3 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.replyto.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.replyto.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.email.send.html" title="メールの送信">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="差出人のメールアドレスを選択する">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="添付ファイルの追加">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="差出人のメールアドレスを選択">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="添付ファイルを追加">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -38,11 +38,11 @@
 <p class="title">メール編集ウィンドウで返信アドレスを選択する</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">メール編集ウィンドウで、差出人アドレスの隣にある<span class="guibutton"><strong>RE</strong></span>をクリックします。<span class="guibutton"><strong>返信先</strong></span>入力フィールドが表示されます。</p>
+<p role="presentation">メール編集ウィンドウで、差出人アドレスの隣にある<span class="guibutton"><strong>Re</strong></span>をクリックします。<span class="guibutton"><strong>返信先</strong></span>入力フィールドが表示されます。</p>
 <p role="presentation">主なメールアカウントの編集しているときに既定の返信アドレスを指定した場合、<span class="guibutton"><strong>返信先</strong></span>入力フィールドが自動で表示されます。入力フィールドには既定の返信先アドレスを含みます。</p>
 </li>
 <li class="step">
-<p role="presentation"><span class="guibutton"><strong>返信先</strong></span>には、メールを返信を送信したいメールアドレスを入力します。<ul class="itemizedlist" style="list-style-type: disc; ">
+<p role="presentation"><span class="guibutton"><strong>返信先</strong></span>には、メールの返信を送信したいメールアドレスを入力します。<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">受取人を入力しているときに、受取人の候補が表示されます。候補を選択するには、その候補をクリックしてください。</p></li>
 <li class="listitem"><p role="presentation">アドレス帳から連絡先を選ぶには、入力フィールドの右側にある<span class="guibutton"><strong>連絡先の選択</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.replyto.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span>をクリックしてください。</p></li>
 </ul></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.sender.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.sender.html
index 426bc2c54..785444acf 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.sender.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.sender.html
@@ -1,7 +1,7 @@
 <html lang="ja">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>差出人のメールアドレスを選択する</title>
+<title>差出人のメールアドレスを選択</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">メール</span></h1>
 <h2 class="sr-only">メールの送信</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.sender">
-<div class="titlepage"><div><div><h3 class="title">差出人のメールアドレスを選択する</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">差出人のメールアドレスを選択</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.6.2"></a><p id="ox.appsuite.user.concept.email.send.sender">メールを送信する場合、メール編集ウィンドウで受取人に表示される差出人アドレスを設定できます。</p>
 <div class="task" id="ox.appsuite.user.task.email.send.sender">
 <p class="title">メール編集ウィンドウで差出人アドレスを選択する</p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.templates.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.templates.html
index 4458ec14e..eb7861622 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.templates.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.send.templates.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.email.send.html" title="メールの送信">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="リンクとして添付ファイルを送信する">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="リンクとして添付ファイルを送信する:">
 <link rel="next" href="ox.appsuite.user.sect.email.send.signatures.html" title="署名を使用">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.settings.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.settings.html
index 8b110445c..d11ce9c45 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.settings.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.settings.html
@@ -50,8 +50,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.composereply">作成&返信</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.20.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">テンプレート</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.rules">ルール</a></p></li>
-<li class="listitem feat-zoom" id="id-1.7.20.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">AI 統合</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.7.20.5.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">詳細設定</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">AI 統合</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">詳細設定</a></p></li>
 </ul>
 <p>詳細は、次のページを参照してください。<a class="xref" href="ox.appsuite.user.sect.settings.search.html">設定を検索する</a></p>
 <p id="ox.appsuite.user.reference.email.settings.reading"></p>
@@ -63,8 +63,9 @@
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.list"><b>連絡先の写真、チェックボックス、簡易. </b>リストビューに連絡先画像またはチェックボックスを表示するか、あるいはそれら要素のなにも表示しないかを指定します。</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.preview"><b>テキストプレビューを表示. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.2.1.2"></a>メールコンテンツの最初の言葉をメールリストビューに表示するかどうかを指定します。</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>常にすべての日時を表示. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>メールリストビューに受信日だけでなく、受信時間も表示するかどうかを指定します。</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>メッセージのサイズを表示. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>メッセージのサイズをメールリストビューに表示するかどうかを指定します。</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.20.6.2.1.2.1.3.1.3"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>カテゴリを表示. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>メールに割り当てられたカテゴリがメールのリストビューに表示されるかどうかを指定します。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>常にすべての日時を表示. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>メールリストビューに受信日だけでなく、受信時間も表示するかどうかを指定します。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>メッセージのサイズを表示. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.5.1.2"></a>メッセージのサイズをメールリストビューに表示するかどうかを指定します。</p></li>
 </ul>
 </li>
 <li class="listitem">
@@ -145,7 +146,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>開封確認メッセージの要求を表示. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>受信したメールに開封確認メッセージの要求があった場合、返送する開封確認メッセージを表示するかどうかを指定できます。</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>削除済みのメールを完全に削除. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>削除されたメールを完全に削除するか、ゴミ箱フォルダーに入れるかを指定します。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span>完全に削除したメール メッセージを元に戻すことはできません。</p>
+<p role="presentation"><span class="phrase"><strong>警告:</strong></span>構成によって、完全に削除したメールは復元<span class="bold">できません</span>。</p>
 <p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">メールの削除</a></p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.selectrecent"><b>起動時に最新のメッセージを自動で選択. </b><a class="indexterm" name="id-1.7.20.12.2.1.4.1.2"></a>アプリケーションの起動時に最新のメッセージを自動で選択するかどうかを指定します。</p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.email.view.html b/help/l10n/ja_JP/ox.appsuite.user.sect.email.view.html
index 137d456b0..357020402 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.email.view.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.email.view.html
@@ -77,11 +77,10 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">メール</span> リストビュー</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">メール</span> 詳細ビュー</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">受信トレイのカテゴリの使い方</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">添付ファイルの表示、保存</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">メールのソースの表示</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">メールを既読、未読にする</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.createencrypted.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.createencrypted.html
index 1fafbe6ab..95f907049 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.createencrypted.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.createencrypted.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office ドキュメントの暗号化">
-<link rel="prev" href="ox.appsuite.user.sect.guard.documents.html" title="Office ドキュメントの暗号化">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office ドキュメントを暗号化">
+<link rel="prev" href="ox.appsuite.user.sect.guard.documents.html" title="Office ドキュメントを暗号化">
 <link rel="next" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html" title="選択したドキュメントを暗号化形式に保存します。">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">
 <span class="phrase">Guard</span>を使ってデータの暗号化</h1>
-<h2 class="sr-only">Office ドキュメントの暗号化</h2>
+<h2 class="sr-only">Office ドキュメントを暗号化</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.createencrypted">
 <div class="titlepage"><div><div><h3 class="title">新しい暗号化ドキュメントの作成</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.8.2"></a><a class="indexterm" name="id-1.14.10.8.3"></a><a class="indexterm" name="id-1.14.10.8.4"></a><p id="ox.appsuite.user.concept.guard.documents.createencrypted">新規ドキュメントの作成時に、暗号化されて保存されるドキュメントの作成オプションがあります。次のようなオプションの機能があります。</p>
@@ -75,7 +75,7 @@
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">ファイルの暗号化または復号化</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.guard.documents.createencrypted">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントの暗号化</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.createencrypted">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントを暗号化</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.html
index 474a5bdfa..2f59126a3 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.html
@@ -1,7 +1,7 @@
 <html lang="ja">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Office ドキュメントの暗号化</title>
+<title>Office ドキュメントを暗号化</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
@@ -32,7 +32,7 @@
   <h1 class="sr-only">
 <span class="phrase">Guard</span>を使ってデータの暗号化</h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.documents">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Office ドキュメントの暗号化</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Office ドキュメントを暗号化</h2></div></div></div>
 <a class="indexterm" name="id-1.14.10.2"></a><a class="indexterm" name="id-1.14.10.3"></a><a class="indexterm" name="id-1.14.10.4"></a><a class="indexterm" name="id-1.14.10.5"></a><p id="ox.appsuite.user.concept.guard.documents">次のようなオプションの機能があります。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.createencrypted.html">新しい暗号化ドキュメントの作成</a></p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.open.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.open.html
index 62937eebb..0c1cbe24c 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.open.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.open.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office ドキュメントの暗号化">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office ドキュメントを暗号化">
 <link rel="prev" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html" title="選択したドキュメントを暗号化形式に保存します。">
 <link rel="next" href="ox.appsuite.user.sect.guard.logout.html" title="Guardからのログアウト">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">
 <span class="phrase">Guard</span>を使ってデータの暗号化</h1>
-<h2 class="sr-only">Office ドキュメントの暗号化</h2>
+<h2 class="sr-only">Office ドキュメントを暗号化</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.open">
 <div class="titlepage"><div><div><h3 class="title">暗号化されたドキュメントを表示する</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.10.2"></a><a class="indexterm" name="id-1.14.10.10.3"></a><p id="ox.appsuite.user.concept.guard.documents.open">暗号化されたドキュメントを表示して、以下のことができます。</p>
@@ -66,7 +66,7 @@
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">ファイルの暗号化または復号化</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.guard.documents.open">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントの暗号化</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.open">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントを暗号化</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.saveencrypted.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.saveencrypted.html
index bc5c311a1..0634112e7 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.saveencrypted.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.documents.saveencrypted.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office ドキュメントの暗号化">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office ドキュメントを暗号化">
 <link rel="prev" href="ox.appsuite.user.sect.guard.documents.createencrypted.html" title="新しい暗号化ドキュメントの作成">
 <link rel="next" href="ox.appsuite.user.sect.guard.documents.open.html" title="暗号化されたドキュメントを表示する">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">
 <span class="phrase">Guard</span>を使ってデータの暗号化</h1>
-<h2 class="sr-only">Office ドキュメントの暗号化</h2>
+<h2 class="sr-only">Office ドキュメントを暗号化</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.saveencrypted">
 <div class="titlepage"><div><div><h3 class="title">選択したドキュメントを暗号化形式に保存します。</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.9.2"></a><a class="indexterm" name="id-1.14.10.9.3"></a><p id="ox.appsuite.user.concept.guard.documents.saveencrypted">テキストドキュメント、スプレッドシートまたはプレゼンテーションを表示されている時、このドキュメントを暗号化形式で保存できます。</p>
@@ -59,7 +59,7 @@
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">ファイルの暗号化または復号化</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.guard.documents.saveencrypted">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントの暗号化</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.saveencrypted">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office ドキュメントを暗号化</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.drive.decrypt.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.drive.decrypt.html
index 1c050a667..0aaebba7e 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.drive.decrypt.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.drive.decrypt.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.guard.drive.html" title="ファイルの暗号化または復号化">
 <link rel="prev" href="ox.appsuite.user.sect.guard.drive.download.html" title="暗号化ファイルのダウンロード">
-<link rel="next" href="ox.appsuite.user.sect.guard.documents.html" title="Office ドキュメントの暗号化">
+<link rel="next" href="ox.appsuite.user.sect.guard.documents.html" title="Office ドキュメントを暗号化">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.email.send.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.email.send.html
index 2e9dc950b..4410d5d03 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.email.send.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.email.send.html
@@ -49,7 +49,7 @@
 <p role="presentation">アプリケーションランチャーで、<span class="guibutton"><strong>設定</strong></span> をクリックすることもできます。</p>
 <p role="presentation"><span class="guilabel"><strong>設定</strong></span>ウィンドウが開きます。</p>
 </li>
-<li class="step"><p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。</p></li>
+<li class="step"><p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>S/MIME</strong></span> をクリックします。</p></li>
 <li class="step">
 <p role="presentation"><span class="guibutton"><strong>S/MIMEを有効化</strong></span> を有効にします。</p>
 <p role="presentation">S/MIME暗号化が既定として設定されている場合、<span class="guibutton"><strong>既定</strong></span>下の<span class="guibutton"><strong>署名および暗号化にS/MIMEの使用を既定にする</strong></span>を有効にします。</p>
@@ -75,7 +75,7 @@
 <li class="listitem"><p role="presentation">メールの受取人が暗号化された返信を送るようにするには、公開鍵を添付ファイルで送ります。自分の公開鍵を添付ファイルとして送信できます。そのためには、<span class="guibutton"><strong>公開鍵を添付を有効にします。</strong></span></p></li>
 <li class="listitem">
 <p role="presentation">PGPを使用する場合、次のオプションが適用されます:</p>
-<p role="presentation"><span class="guibutton"><strong>詳細設定を表示</strong></span>が<span class="phrase">Guard</span>設定で有効な場合、PGP形式を使用できます。</p>
+<p role="presentation"><span class="guibutton"><strong>メール作成時に詳細設定を表示</strong></span>オプションが <span class="guibutton"><strong>詳細</strong></span>下の<span class="phrase">Guard</span>設定で有効な場合、PGP形式を設定できます。</p>
 <p role="presentation">既定では、暗号化されたメールは<span class="guibutton"><strong>Mime</strong></span>形式で送信されます。古いメールクライアントによってはインライン PGP しかサポートしていません。受取人がそのようなクライアントを使用する場合は<span class="guibutton"><strong>インライン</strong></span>を有効にします。</p>
 <p role="presentation">注:<span class="guibutton"><strong>インライン</strong></span>を使用する場合、HTML形式のメールを送信することはできません。
 </p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.html
index 2ea3657ae..d2a0cb438 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Guardを使ってデータの暗号化">
-<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="パスワード管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="パスワードリセット機能を削除する">
 <link rel="next" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="自分のPGP鍵を管理する">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">次へ</a></li>
@@ -44,9 +44,17 @@
 <p id="ox.appsuite.user.possibilities.guard.keys">次のようなオプションの機能があります。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">自分のPGP鍵を管理する</a></p></li>
-<li class="listitem cap-smime" id="id-1.14.13.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">自分のS/MIME鍵を管理する</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">公開鍵を管理する</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">受取人のPGP鍵を管理する</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">自分のS/MIME鍵を管理する</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">受取人のS/MIME鍵を管理する</a></p></li>
 </ul>
+<p id="ox.appsuite.user.related.guard.keys"></p>
+<p class="title">関連トピック</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> 設定</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.keys">親記事:<a class="xref" href="ox.appsuite.user.chap.guard.html"><i><span class="phrase">Guard</span>を使ってデータの暗号化</i></a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.pgppublickeys.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
index 39846f13c..5decaa716 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
@@ -1,13 +1,13 @@
 <html lang="ja">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>公開鍵を管理する</title>
+<title>受取人のPGP鍵を管理する</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="鍵管理">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="自分のS/MIME鍵を管理する">
-<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Guard 設定">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="自分のPGP鍵を管理する">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="自分のS/MIME鍵を管理する">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">次へ</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">次へ</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,55 +33,36 @@
 <span class="phrase">Guard</span>を使ってデータの暗号化</h1>
 <h2 class="sr-only">鍵管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.pgppublickeys">
-<div class="titlepage"><div><div><h3 class="title">公開鍵を管理する</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys"><span class="phrase"><span class="guilabel"><strong>Guard セキュリティ設定</strong></span></span>ページで、次のことができます:</p>
+<div class="titlepage"><div><div><h3 class="title">受取人のPGP鍵を管理する</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.8.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">次のようなオプションの機能があります。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">公開鍵を表示</p></li>
+<li class="listitem"><p role="presentation">公開鍵を表示または削除</p></li>
 <li class="listitem"><p role="presentation">公開鍵をアップロード</p></li>
-<li class="listitem"><p role="presentation">自分の公開鍵を削除</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.guard.pgppublickeys">
-<p class="title">鍵管理機能を使用する:</p>
+<p class="title">受取人のPGP鍵を表示する:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
-<p role="presentation">アプリケーションランチャーで、<span class="guibutton"><strong>設定</strong></span> をクリックすることもできます。</p>
-<p role="presentation"><span class="guilabel"><strong>設定</strong></span>ウィンドウが開きます。</p>
+<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
+<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>受取人のPGP鍵</strong></span>をクリックします。</p>
+<p role="presentation">受取人の公開PGP鍵が表示されます。</p>
 </li>
 <li class="step">
-<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。</p>
-<p role="presentation"><span class="phrase"><span class="guilabel"><strong>Guard セキュリティ設定</strong></span></span> ページが表示されます。</p>
-</li>
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>詳細設定を表示</strong></span>を有効にします。</p>
-<p role="presentation">鍵管理機能が表示されます。</p>
+<p role="presentation">鍵の詳細を表示するには、鍵 IDをクリックします。</p>
+<p role="presentation">鍵を削除するには、鍵の隣にある<span class="guibutton"><strong>削除</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>をクリックします。</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.display">
-<p class="title">公開鍵を表示する方法:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
+<p class="title">受取人の公開鍵のアップロードする:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation"><span class="guibutton"><strong>宛先の公開鍵</strong></span>をクリックします。<span class="guilabel"><strong>公開鍵</strong></span>ウィンドウが開きます。</p>
-<p role="presentation">あなたまたは他のユーザと共有している公開鍵が表示されます。ユーザの公開鍵がこのリストに表示されている場合、このユーザに暗号化したメールを送信することができ、また、このユーザから送られた署名つきメールを確認することができます。</p>
-</li>
-<li class="step">
-<p role="presentation">鍵の詳細を表示するには、鍵の隣にある<span class="guibutton"><strong>詳細</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span>をクリックします。<span class="guilabel"><strong>公開鍵の詳細</strong></span>ウィンドウが開きます。</p>
-<p role="presentation"><span class="guibutton"><strong>鍵を共有</strong></span>を有効にすると、公開鍵を共有できます。他のユーザはお使いの共有鍵を参照したり、ダウンロードできません。公開鍵はグループウェアのユーザのみが使用できます。</p>
+<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
+<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>受取人のPGP鍵</strong></span>をクリックします。</p>
 </li>
+<li class="step"><p role="presentation"><span class="guibutton"><strong>受取人の鍵をアップロード</strong></span>をクリックします。公開鍵を含むファイルを選択してください。</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
-<p class="title"><span class="guilabel"><strong>公開鍵</strong></span>ウィンドウの受取人の公開鍵をアップロードする方法:</p>
-<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation"><span class="guilabel"><strong> PGP 公開鍵リスト</strong></span>の隣にある<span class="guibutton"><strong>追加</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.upload.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span>をクリックします。公開鍵を含むファイルを選択してください。</p></li></ul></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.delete">
-<p class="title"><span class="guilabel"><strong>公開鍵</strong></span>ウィンドウで公開鍵を削除する方法:</p>
-<div class="procedure"><ul class="procedure"><li class="step">
-<p role="presentation">公開鍵の隣にある <span class="guibutton"><strong>削除</strong></span> アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>をクリックします。</p>
-<p role="presentation">公開鍵の削除を確定します。</p>
-</li></ul></div>
-</div>
 <p id="ox.appsuite.user.related.guard.keys.pgppublickeys"></p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.smimepublickeys.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
new file mode 100644
index 000000000..d2b91a6c3
--- /dev/null
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
@@ -0,0 +1,76 @@
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>受取人のS/MIME鍵を管理する</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="ユーザ ガイド">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="鍵管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="自分のS/MIME鍵を管理する">
+<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Guard 設定">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">戻る</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">次へ</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+<span class="phrase">Guard</span>を使ってデータの暗号化</h1>
+<h2 class="sr-only">鍵管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.keys.smimepublickeys">
+<div class="titlepage"><div><div><h3 class="title">受取人のS/MIME鍵を管理する</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.10.2"></a><p id="ox.appsuite.user.concept.guard.keys.smimepublickeys">次のようなオプションの機能があります。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">公開鍵を表示</p></li>
+<li class="listitem"><p role="presentation">公開鍵をアップロード</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.smimepublickeys">
+<p class="title">受取人のSMIME鍵の表示する:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
+<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>S/MIME受取人</strong></span> をクリックします。</p>
+</li>
+<li class="step">
+<p role="presentation"><span class="guibutton"><strong>証明書を検索</strong></span>にメールアドレスを入力します。<span class="guibutton"><strong>検索</strong></span>クリックします。</p>
+<p role="presentation">証明書が見つかると、証明書データが表示されます。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.guard.keys.smimepublickeys.upload">
+<p class="title">受取人の公開鍵のアップロードする:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
+<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>S/MIME受取人</strong></span> をクリックします。</p>
+</li>
+<li class="step"><p role="presentation"><span class="guibutton"><strong>受取人証明書をアップロード</strong></span>をクリックします。公開鍵を含むファイルを選択してください。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.keys.smimepublickeys"></p>
+<p class="title">関連トピック</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">自分のPGP鍵を管理する</a></p>
+<p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">自分のS/MIME鍵を管理する</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a></p>
+</li></ul>
+<p id="ox.appsuite.user.parent.guard.keys.smimepublickeys">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
index 810eceafd..e29e85069 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="鍵管理">
 <link rel="prev" href="ox.appsuite.user.sect.guard.keys.html" title="鍵管理">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="自分のS/MIME鍵を管理する">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="受取人のPGP鍵を管理する">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">次へ</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">次へ</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,129 +34,103 @@
 <h2 class="sr-only">鍵管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yourpgpkeys">
 <div class="titlepage"><div><div><h3 class="title">自分のPGP鍵を管理する</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.5.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys"><span class="phrase"><span class="guilabel"><strong>Guard セキュリティ設定</strong></span></span>    ページで、次のことができます:</p>
+<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">次のようなオプションの機能があります。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">新規PGP鍵の追加</p></li>
 <li class="listitem"><p role="presentation">自分のPGP鍵を表示する、詳細を表示する</p></li>
-<li class="listitem">
-<p role="presentation">新規PGP鍵の追加</p>
-<p role="presentation">複数の鍵を所有している場合、どの鍵を現在の鍵にするか指定できます。現在の鍵はデータの暗号化に使用されます。</p>
-</li>
-<li class="listitem">
-<p role="presentation">ユーザIDの追加</p>
-<p role="presentation">追加のユーザIDを鍵に追加すると、鍵を複数のメール アカウントに使用できます。</p>
-</li>
-<li class="listitem"><p role="presentation">鍵をダウンロード</p></li>
-<li class="listitem"><p role="presentation">鍵を削除する</p></li>
+<li class="listitem"><p role="presentation">じぶんのPGP鍵を管理する:最新にする、IDを編集、無効、ダウンロード、削除</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys">
-<p class="title">PGP鍵管理機能を使用する:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.add">
+<p class="title">新規PGP鍵の追加する:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
-<p role="presentation">アプリケーションランチャーで、<span class="guibutton"><strong>設定</strong></span> をクリックすることもできます。</p>
-<p role="presentation"><span class="guilabel"><strong>設定</strong></span>ウィンドウが開きます。</p>
+<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.addkey"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
+<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>ご利用のPGP鍵</strong></span>をクリックします。</p>
 </li>
 <li class="step">
-<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。</p>
-<p role="presentation"><span class="phrase"><span class="guilabel"><strong>Guard セキュリティ設定</strong></span></span> ページが表示されます。</p>
+<p role="presentation">次のようなオプションの機能があります。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">新しい鍵ペアを作成する場合は、<span class="guibutton"><strong>新しい鍵を作成する</strong></span>をクリックします。<span class="phrase"><span class="guilabel"><strong>Guardセキュリティ鍵作成</strong></span></span> ウィンドウが開きます。</p>
+<p role="presentation">新しい鍵用のパスワードを入力します。パスワードを確認してください。</p>
+<p role="presentation">新しい鍵にはマスター鍵と該当するサブ鍵があります。</p>
 </li>
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>詳細設定を表示</strong></span>を有効にします。</p>
-<p role="presentation">鍵管理機能が表示されます。</p>
+<li class="listitem">
+<p role="presentation">既存の秘密鍵の追加には、<span class="guibutton"><strong>秘密鍵をアップロードする</strong></span>をクリックします。秘密鍵を含むファイルを選択してください。<span class="guilabel"><strong>秘密鍵のアップロード</strong></span>ウィンドウが開きます。</p>
+<p role="presentation">新しい鍵のアップロードには、<span class="phrase">Guard</span>セキュリティパスワードを入力してください。新しい鍵用の新しいパスワードを入力します。</p>
+</li>
+<li class="listitem"><p role="presentation">既存の公開鍵の追加には、<span class="guibutton"><strong>公開鍵をアップロードする</strong></span>をクリックします。公開鍵を含むファイルを選択してください。</p></li>
+</ul></p>
+<p role="presentation">新しい鍵はあなたの鍵リストの一番上に入力されます。新しい鍵が現在の鍵になります。</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.display">
-<p class="title">自分のPGP鍵を表示、または鍵を現在のPGP鍵にする方法:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.display">
+<p class="title">既存のPGP鍵を表示する:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation"><span class="guibutton"><strong>鍵</strong></span>下の<span class="guilabel"><strong>あなたの鍵</strong></span>をクリックします。</p>
-<p role="presentation" class="cap-smime">構成によって、<span class="guilabel"><strong>変更する鍵の種類を選択</strong></span>が表示されます。<span class="guibutton"><strong>PGP</strong></span>を選択します。</p>
-<p role="presentation"><span class="guilabel"><strong>あなたの鍵</strong></span>ウィンドウが開きます。</p>
-<p role="presentation"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">自分のPGP鍵が表示されます。各PGP鍵にはマスター鍵とサブ鍵があります。<ul class="itemizedlist" style="list-style-type: circle; ">
+<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
+<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>ご利用のPGP鍵</strong></span>をクリックします。</p>
+<p role="presentation">自分のPGP鍵が表示されます。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">各PGP鍵にはマスター鍵とサブ鍵があります。<ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">特に、マスター鍵はメールの署名に使用されます。</p></li>
 <li class="listitem"><p role="presentation">サブ鍵は、暗号化および復号化に使用されます。</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">目的によって、<span class="phrase">Guard</span>は自動でマスター鍵かサブ鍵を使用します。</p></li>
 </ul></p>
 </li>
-<li class="step"><p role="presentation">あなたの鍵リストに複数の鍵がある場合、現在の鍵を指定することができます。それには、主な鍵の横の<span class="guibutton"><strong>現在</strong></span>のチェックボックスを有効にします。この後、現在の鍵が暗号化に使用されます。</p></li>
-<li class="step"><p role="presentation">鍵の詳細を表示するには、鍵の隣にある<span class="guibutton"><strong>詳細</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span>をクリックします。<span class="guilabel"><strong>鍵の詳細</strong></span>ウィンドウが開きます。鍵の署名を見るには、<span class="guibutton"><strong>署名</strong></span>をクリックします。</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addkey">
-<p class="title"><span class="guilabel"><strong>あなたの鍵</strong></span>ウィンドウで新しいPGP鍵を追加する方法:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> <span class="guibutton"><strong>自分の鍵一覧</strong></span>横の<span class="guibutton"><strong>ユーザー鍵を追加</strong></span>アイコンをクリックします。<span class="guilabel"><strong>鍵を追加</strong></span>ウィンドウが表示されます。</p></li>
 <li class="step">
-<p role="presentation">次のようなオプションの機能があります。<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-<p role="presentation">秘密鍵の追加には、<span class="guibutton"><strong>秘密鍵をアップロードする</strong></span>をクリックします。秘密鍵を含むファイルを選択してください。<span class="guilabel"><strong>秘密鍵のアップロード</strong></span>ウィンドウが開きます。</p>
-<p role="presentation">新しい鍵のアップロードには、<span class="phrase">Guard</span>セキュリティパスワードを入力してください。新しい鍵用の新しいパスワードを入力します。</p>
-</li>
-<li class="listitem"><p role="presentation">公開鍵の追加の場合、<span class="guibutton"><strong>公開鍵のみを追加する</strong></span>をクリックします。公開鍵を含むファイルを選択してください。</p></li>
-<li class="listitem">
-<p role="presentation">新しい鍵ペアを作成する場合は、<span class="guibutton"><strong>新しい鍵を作成する</strong></span>をクリックします。<span class="phrase"><span class="guilabel"><strong>Guardセキュリティ鍵作成</strong></span></span> ウィンドウが開きます。</p>
-<p role="presentation">新しい鍵用のパスワードを入力します。パスワードを確認してください。</p>
-<p role="presentation">新しい鍵にはマスター鍵と該当するサブ鍵があります。</p>
-</li>
-</ul></p>
-<p role="presentation">新しい鍵はあなたの鍵リストの一番上に入力されます。新しい鍵が現在の鍵になります。</p>
+<p role="presentation">鍵の詳細を表示するには、マスター鍵の隣にある<span class="guibutton"><strong>鍵を管理</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>をクリックします。<span class="guilabel"><strong>鍵の詳細</strong></span>ウィンドウが開きます。</p>
+<p role="presentation">鍵の署名を見るには、<span class="guibutton"><strong>署名</strong></span>をクリックします。</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addaccount">
-<p class="title"><span class="guilabel"><strong>あなたの鍵</strong></span>ウィンドウで追加のユーザIDを追加する方法:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.manage">
+<p class="title">既存のPGP鍵を管理する:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">鍵の隣にある<span class="guibutton"><strong>IDを編集</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addaccount.edit"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>をクリックします。<span class="guilabel"><strong>ユーザID追加</strong></span>ウィンドウが開きます。</p></li>
 <li class="step">
+<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
+<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>ご利用のPGP鍵</strong></span>をクリックします。</p>
+<p role="presentation">自分のPGP鍵が表示されます。</p>
+</li>
+<li class="step"><p role="presentation">マスター鍵の隣にある<span class="guibutton"><strong>鍵を管理</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>をクリックします。次の機能を使います:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">あなたの鍵リストに複数の鍵がある場合、現在の鍵を指定することができます。これには、<span class="guibutton"><strong>最新の印をつける</strong></span>をクリックします。この後、現在の鍵が暗号化に使用されます。</p></li>
+<li class="listitem">
+<p role="presentation">別のメールアカウントの鍵を使用したい場合は、<span class="guibutton"><strong>IDを編集</strong></span>をクリックします。<span class="guilabel"><strong>ユーザID追加</strong></span>ウィンドウが開きます。</p>
 <p role="presentation">ユーザID名を入力します。この鍵に使用したいメールアドレスを入力します。</p>
 <p role="presentation">鍵のパスワードを入力してください。</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.download">
-<p class="title"><span class="guilabel"><strong>あなたの鍵</strong></span>ウィンドウで鍵をダウンロードする方法:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">鍵の隣にある<span class="guibutton"><strong>ダウンロード</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span>をクリックします。</p></li>
-<li class="step">
+<li class="listitem">
+<p role="presentation">秘密鍵をダウンロードするには、<span class="guibutton"><strong>ダウンロード</strong></span>をクリックします。</p>
 <p role="presentation">秘密鍵のみをダウンロードするか、公開鍵のみをダウンロードするか、どちらもダウンロードするかを指定します。</p>
 <p role="presentation"><span class="phrase"><strong>注意:</strong></span>あなたの秘密鍵は暗号化された形式でダウンロードされます。しかし、秘密鍵は公開でアクセスできるシステムにダウンロードすべきではありません。</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.delete">
-<p class="title"><span class="guilabel"><strong>あなたの鍵</strong></span>ウィンドウで鍵を削除する方法:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>警告:</strong></span>秘密鍵を削除すると、この鍵で暗号化されたオブジェクトを復号化することはできません。迷っている場合は、鍵を削除せず、無効にしてください。無効になった鍵は暗号化に使用できません。しかし、この鍵で暗号化されたオブジェクトは復号化できます。</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">鍵の隣にある <span class="guibutton"><strong>削除</strong></span> アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>をクリックします。<span class="guilabel"><strong>秘密鍵の削除</strong></span>ウィンドウが開きます。</p></li>
-<li class="step"><p role="presentation">次のようなオプションの機能があります。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">秘密鍵を無効、または削除するには、<span class="guibutton"><strong>削除</strong></span>をクリックします。<span class="guilabel"><strong>秘密鍵の削除</strong></span>ウィンドウが開きます。注意:<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">鍵を無効にすると、使用できません。しかし、この鍵で暗号化されたオブジェクトは復号化できます。そのため、鍵を削除するよりは無効化することをお勧めします。</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>警告:</strong></span>秘密鍵を削除すると、この鍵で暗号化されたオブジェクトを復号化することはできません。</p></li>
+</ul> <p role="presentation">次のようなオプションの機能があります。</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">秘密鍵を無効にするには、<span class="guibutton"><strong>無効</strong></span>をクリックします。</p>
-<p role="presentation">鍵を無効にすると、使用できません。しかし、この鍵で暗号化されたオブジェクトは復号化できます。そのため、鍵を削除するよりは無効化することをお勧めします。</p>
 <p role="presentation">秘密鍵用のパスワードを入力します。必要であれば、鍵を無効にする理由を選択します。</p>
 <p role="presentation"><span class="guibutton"><strong>無効</strong></span>をクリックします。</p>
+<p role="presentation">メニューで、<span class="guibutton"><strong>無効</strong></span> をクリックすることもできます。</p>
 </li>
 <li class="listitem">
 <p role="presentation">秘密鍵を削除するには、<span class="guibutton"><strong>削除</strong></span>をクリックします。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span>秘密鍵を削除すると、この鍵で暗号化されたオブジェクトを復号化することはできません。</p>
 <p role="presentation">秘密鍵用のパスワードを入力します。</p>
 <p role="presentation"><span class="guibutton"><strong>削除</strong></span> ボタンをクリックします。</p>
 </li>
 </ul>マスター鍵を削除すると、対応するサブ鍵も削除されます。</p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yourpgpkeys"></p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">公開鍵を管理する</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">受取人のPGP鍵を管理する</a></p>
 <p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">自分のS/MIME鍵を管理する</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.keys.yourpgpkeys">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yourpgpkeys">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
index 2bf7c94e4..15cc75a7e 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="鍵管理">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="自分のPGP鍵を管理する">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="公開鍵を管理する">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="受取人のPGP鍵を管理する">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="受取人のS/MIME鍵を管理する">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">次へ</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">次へ</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,46 +34,27 @@
 <h2 class="sr-only">鍵管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yoursmimekeys">
 <div class="titlepage"><div><div><h3 class="title">自分のS/MIME鍵を管理する</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.6.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys"><span class="phrase"><span class="guilabel"><strong>Guard セキュリティ設定</strong></span></span>    ページで、次のことができます:</p>
+<a class="indexterm" name="id-1.14.13.9.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">次のようなオプションの機能があります。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">新規S/MIME鍵の追加</p>
 <p role="presentation">複数の鍵を所有している場合、どの鍵を現在の鍵にするか指定できます。現在の鍵はデータの暗号化に使用されます。</p>
 </li>
 <li class="listitem"><p role="presentation">自分のS/MIME鍵を表示する、詳細を表示する</p></li>
-<li class="listitem"><p role="presentation">鍵をダウンロード</p></li>
-<li class="listitem"><p role="presentation">鍵を削除する</p></li>
+<li class="listitem"><p role="presentation">じぶんのS/MIME鍵を管理する:最新にする、IDを編集、無効、ダウンロード、削除</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys">
-<p class="title">S/MIME鍵管理機能を使用する:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.add">
+<p class="title">新規S/MIME鍵の追加する方法:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
-<p role="presentation">アプリケーションランチャーで、<span class="guibutton"><strong>設定</strong></span> をクリックすることもできます。</p>
-<p role="presentation"><span class="guilabel"><strong>設定</strong></span>ウィンドウが開きます。</p>
-</li>
-<li class="step">
-<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。</p>
-<p role="presentation"><span class="phrase"><span class="guilabel"><strong>Guard セキュリティ設定</strong></span></span> ページが表示されます。</p>
-</li>
-<li class="step">
+<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>S/MIME</strong></span> をクリックします。</p>
 <p role="presentation"><span class="guibutton"><strong>S/MIMEを有効化</strong></span> を有効にします。</p>
-<p role="presentation"><span class="guibutton"><strong>詳細設定を表示</strong></span>を有効にします。</p>
-<p role="presentation">鍵管理機能が表示されます。</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.addkey">
-<p class="title">新規S/MIME鍵の追加する方法:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>鍵</strong></span>下の<span class="guibutton"><strong>あなたの鍵</strong></span>をクリックします。<span class="guilabel"><strong>変更する鍵の種類を選択</strong></span>ウィンドウが表示されます。</p>
-<p role="presentation"><span class="guibutton"><strong>S/MIME</strong></span>を選択します。<span class="guilabel"><strong>あなたの証明書</strong></span>ウィンドウが表示されます:</p>
 </li>
-<li class="step"><p role="presentation"><span class="guilabel"><strong>あなたの鍵リスト</strong></span>の隣にある<span class="guibutton"><strong>追加</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span>をクリックします。<span class="guilabel"><strong>S/MIME 鍵をアップロード</strong></span>ウィンドウが表示されます。</p></li>
 <li class="step">
+<p role="presentation"><span class="guibutton"><strong>プライベート証明書をアップロード</strong></span>をクリックします。<span class="guilabel"><strong>S/MIME 鍵をアップロード</strong></span>ウィンドウが表示されます。</p>
 <p role="presentation">次のパスワードを入力します:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">新しい鍵のアップロードには、<span class="phrase">Guard</span>セキュリティパスワードを入力してください。新しい鍵用の新しいパスワードを入力します。</p></li>
+<li class="listitem"><p role="presentation">お使いの新規鍵アップロード用<span class="phrase">Guard</span>セキュリティパスワード</p></li>
 <li class="listitem">
 <p role="presentation">メールの暗号化用新規パスワード</p>
 <p role="presentation">新しいパスワードを確定</p>
@@ -85,58 +66,61 @@
 </ol></div>
 </div>
 <div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.display">
-<p class="title">自分のS/MIME鍵を表示、または鍵を現在のS/MIME鍵にする:</p>
+<p class="title">自分のS/MIME鍵を表示する:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation"><span class="guibutton"><strong>鍵</strong></span>下の<span class="guilabel"><strong>あなたの鍵</strong></span>をクリックします。<span class="guilabel"><strong>変更する鍵の種類を選択</strong></span>ウィンドウが表示されます。</p>
-<p role="presentation"><span class="guibutton"><strong>S/MIME</strong></span>を選択します。</p>
-<p role="presentation"><span class="guilabel"><strong>あなたの証明書</strong></span>ウィンドウが表示されます:自分のS/MIME鍵が表示されます。</p>
+<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
+<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>S/MIME</strong></span> をクリックします。</p>
+<p role="presentation"><span class="guibutton"><strong>S/MIMEを有効化</strong></span> を有効にします。</p>
+</li>
+<li class="step">
+<p role="presentation">鍵の詳細を表示するには、鍵の隣にある<span class="guibutton"><strong>鍵を管理</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>をクリックします。<span class="guilabel"><strong>鍵の詳細</strong></span>ウィンドウが開きます。</p>
+<p role="presentation">鍵の署名を見るには、<span class="guibutton"><strong>署名</strong></span>をクリックします。</p>
 </li>
-<li class="step"><p role="presentation">あなたの鍵リストに複数の鍵がある場合、現在の鍵を指定することができます。それには、主な鍵の横の<span class="guibutton"><strong>現在</strong></span>のチェックボックスを有効にします。この後、現在の鍵が暗号化に使用されます。</p></li>
-<li class="step"><p role="presentation">鍵の詳細を表示するには、鍵の隣にある<span class="guibutton"><strong>詳細</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span>をクリックします。<span class="guilabel"><strong>鍵の詳細</strong></span>ウィンドウが開きます。鍵の署名を見るには、<span class="guibutton"><strong>署名</strong></span>をクリックします。</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.download">
-<p class="title"><span class="guilabel"><strong>あなたの鍵</strong></span>ウィンドウで鍵をダウンロードする方法:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.manage">
+<p class="title">既存のS/MIME鍵を管理する:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">鍵の隣にある<span class="guibutton"><strong>ダウンロード</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span>をクリックします。</p></li>
 <li class="step">
+<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
+<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>S/MIME</strong></span> をクリックします。</p>
+<p role="presentation"><span class="guibutton"><strong>S/MIMEを有効化</strong></span> を有効にします。</p>
+</li>
+<li class="step"><p role="presentation">鍵の隣にある<span class="guibutton"><strong>鍵を管理</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>をクリックします。次の機能を使います:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">あなたの鍵リストに複数の鍵がある場合、現在の鍵を指定することができます。これには、<span class="guibutton"><strong>最新の印をつける</strong></span>をクリックします。この後、現在の鍵が暗号化に使用されます。</p></li>
+<li class="listitem">
+<p role="presentation">秘密鍵をダウンロードするには、<span class="guibutton"><strong>ダウンロード</strong></span>をクリックします。</p>
 <p role="presentation">秘密鍵のみをダウンロードするか、公開鍵のみをダウンロードするか、どちらもダウンロードするかを指定します。</p>
 <p role="presentation"><span class="phrase"><strong>注意:</strong></span>あなたの秘密鍵は暗号化された形式でダウンロードされます。しかし、秘密鍵は公開でアクセスできるシステムにダウンロードすべきではありません。</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.delete">
-<p class="title"><span class="guilabel"><strong>あなたの鍵</strong></span>ウィンドウで鍵を削除する方法:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>警告:</strong></span>秘密鍵を削除すると、この鍵で暗号化されたオブジェクトを復号化することはできません。迷っている場合は、鍵を削除せず、無効にしてください。無効になった鍵は暗号化に使用できません。しかし、この鍵で暗号化されたオブジェクトは復号化できます。</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">鍵の隣にある <span class="guibutton"><strong>削除</strong></span> アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>をクリックします。<span class="guilabel"><strong>秘密鍵の削除</strong></span>ウィンドウが開きます。</p></li>
-<li class="step"><p role="presentation">次のようなオプションの機能があります。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">秘密鍵を無効、または削除するには、<span class="guibutton"><strong>削除</strong></span>をクリックします。<span class="guilabel"><strong>秘密鍵の削除</strong></span>ウィンドウが開きます。注意:<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">鍵を無効にすると、使用できません。しかし、この鍵で暗号化されたオブジェクトは復号化できます。そのため、鍵を削除するよりは無効化することをお勧めします。</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>警告:</strong></span>秘密鍵を削除すると、この鍵で暗号化されたオブジェクトを復号化することはできません。</p></li>
+</ul> <p role="presentation">次のようなオプションの機能があります。</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">秘密鍵を無効にするには、<span class="guibutton"><strong>無効</strong></span>をクリックします。</p>
-<p role="presentation">鍵を無効にすると、使用できません。しかし、この鍵で暗号化されたオブジェクトは復号化できます。そのため、鍵を削除するよりは無効化することをお勧めします。</p>
 <p role="presentation">秘密鍵用のパスワードを入力します。必要であれば、鍵を無効にする理由を選択します。</p>
 <p role="presentation"><span class="guibutton"><strong>無効</strong></span>をクリックします。</p>
+<p role="presentation">メニューで、<span class="guibutton"><strong>無効</strong></span> をクリックすることもできます。</p>
 </li>
 <li class="listitem">
 <p role="presentation">秘密鍵を削除するには、<span class="guibutton"><strong>削除</strong></span>をクリックします。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span>秘密鍵を削除すると、この鍵で暗号化されたオブジェクトを復号化することはできません。</p>
 <p role="presentation">秘密鍵用のパスワードを入力します。</p>
 <p role="presentation"><span class="guibutton"><strong>削除</strong></span> ボタンをクリックします。</p>
 </li>
 </ul></p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yoursmimekeys"></p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">自分のPGP鍵を管理する</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">公開鍵を管理する</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">受取人のPGP鍵を管理する</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.keys.yoursmimekeys">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yoursmimekeys">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.change.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.change.html
new file mode 100644
index 000000000..fe8f96524
--- /dev/null
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.change.html
@@ -0,0 +1,66 @@
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>パスワードの変更</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="ユーザ ガイド">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="パスワード管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="パスワード管理">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.reset.html" title="パスワードのリセット">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">戻る</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.reset.html">次へ</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+<span class="phrase">Guard</span>を使ってデータの暗号化</h1>
+<h2 class="sr-only">パスワード管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.change">
+<div class="titlepage"><div><div><h3 class="title">パスワードの変更</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.6.2"></a><a class="indexterm" name="id-1.14.12.6.3"></a><p role="presentation" class="cap-smime">構成によって、暗号化のためにPGPの代わりにS/MIMEも使用できます。PGPとS/MIMEには、別のパスワードを使用します。</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.change">
+<p class="title"><span class="phrase">Guard</span>パスワードの変更方法:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.change"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
+<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>パスワード管理(PGP)</strong></span><span class="cap-smime">または<span class="guibutton"><strong>パスワード管理(S/MIME)</strong></span></span>をクリックします。</p>
+</li>
+<li class="step">
+<p role="presentation"><span class="guibutton"><strong>変更前のパスワード</strong></span>フィールドで、データの暗号化に以前使用したパスワードを入力します。</p>
+<p role="presentation"><span class="guibutton"><strong>新規パスワード</strong></span>フィールドで、データの暗号化にこれから使用したいパスワードを入力します。</p>
+<p role="presentation">新規パスワードを<span class="guibutton"><strong>新規パスワードを確定</strong></span>フィールドに入力します。</p>
+</li>
+<li class="step"><p role="presentation"><span class="guibutton"><strong>パスワードを変更</strong></span> をクリックします。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.change"></p>
+<p class="title">関連トピック</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">パスワードのリセット</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">パスワードリセット機能を削除する</a></p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.password.change">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.deleterecovery.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.deleterecovery.html
new file mode 100644
index 000000000..7ebbea663
--- /dev/null
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.deleterecovery.html
@@ -0,0 +1,65 @@
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>パスワードリセット機能を削除する</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="ユーザ ガイド">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="パスワード管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.reset.html" title="パスワードのリセット">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="鍵管理">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.reset.html">戻る</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">次へ</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+<span class="phrase">Guard</span>を使ってデータの暗号化</h1>
+<h2 class="sr-only">パスワード管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.deleterecovery">
+<div class="titlepage"><div><div><h3 class="title">パスワードリセット機能を削除する</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.8.2"></a><p id="ox.appsuite.user.concept.guard.password.deleterecovery">必要に応じてパスワードをリセットできるようにするには、パスワードを暗号化バージョンでサーバーに保存してください。パスワードをサーバーに保存したくない場合は、パスワードの回復を削除できます。</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
+<p class="title">パスワードをリセットするための機能の削除方法:</p>
+<div class="taskprerequisites">
+          <p><span class="phrase"><strong>警告:</strong></span>パスワードのリセット機能を削除すると、パスワードをリセットすることができません。その後パスワードを忘れた場合は、暗号化されたメールやファイルを復号化することができません。</p>
+        </div>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.remove"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
+<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>詳細</strong></span> をクリックします。</p>
+</li>
+<li class="step"><p role="presentation"><span class="guibutton"><strong>リセットオプション</strong></span>下の<span class="guibutton"><strong>パスワード復元を削除</strong></span>をクリックします。<span class="guilabel"><strong>復元の削除</strong></span>ウィンドウが開きます。</p></li>
+<li class="step"><p role="presentation"><span class="guibutton"><strong>削除</strong></span> ボタンをクリックします。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.deleterecovery"></p>
+<p class="title">関連トピック</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">パスワードの変更</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">パスワードのリセット</a></p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.password.deleterecovery">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.html
index d270e37c1..dfc82bf81 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Guardを使ってデータの暗号化">
 <link rel="prev" href="ox.appsuite.user.sect.guard.logout.html" title="Guardからのログアウト">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="鍵管理">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.change.html" title="パスワードの変更">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.logout.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">次へ</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.change.html">次へ</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,97 +33,19 @@
 <span class="phrase">Guard</span>を使ってデータの暗号化</h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.password">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">パスワード管理</h2></div></div></div>
-<a class="indexterm" name="id-1.14.12.2"></a><a class="indexterm" name="id-1.14.12.3"></a><a class="indexterm" name="id-1.14.12.4"></a><a class="indexterm" name="id-1.14.12.5"></a><a class="indexterm" name="id-1.14.12.6"></a><p id="ox.appsuite.user.concept.guard.password">次のようなオプションの機能があります。</p>
+<a class="indexterm" name="id-1.14.12.2"></a><p id="ox.appsuite.user.concept.guard.password">次のようなオプションの機能があります。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><span class="phrase">Guard</span>セキュリティパスワードを変更します。</p></li>
-<li class="listitem"><p role="presentation"><span class="phrase">Guard</span>セキュリティパスワードを失った場合、<span class="phrase">Guard</span> セキュリティパスワードをリセットして、仮の<span class="phrase">Guard</span>セキュリティパスワードを要求できます。</p></li>
-<li class="listitem"><p role="presentation">メールアドレスを指定してパスワードをリセットする</p></li>
-<li class="listitem"><p role="presentation">必要に応じてパスワードをリセットできるようにするには、パスワードを暗号化バージョンでサーバーに保存してください。パスワードをサーバーに保存したくない場合は、パスワードの回復を削除できます。</p></li>
-<li class="listitem cap-smime" id="id-1.14.12.7.1.5"><p role="presentation">構成によって、暗号化のためにPGPの代わりにS/MIMEも使用できます。この場合、PGPとS/MINEで別々のパスワードが使用されます。</p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">パスワードの変更</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">パスワードのリセット</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">パスワードリセット機能を削除する</a></p></li>
 </ul>
 <p>注:構成によって、これらの機能が使用できない場合があります。</p>
-<div class="task help-hide-inline" id="ox.appsuite.user.task.guard.password">
-<p class="title">パスワード管理機能を開く:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
-<p role="presentation">アプリケーションランチャーで、<span class="guibutton"><strong>設定</strong></span> をクリックすることもできます。</p>
-<p role="presentation"><span class="guilabel"><strong>設定</strong></span>ウィンドウが開きます。</p>
-</li>
-<li class="step">
-<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。</p>
-<p role="presentation"><span class="phrase"><span class="guilabel"><strong>Guard セキュリティ設定</strong></span></span> ページが表示されます。</p>
-<p role="presentation">パスワード管理機能が表示されます。</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.change">
-<p class="title"><span class="phrase">Guard</span>パスワードの変更方法:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>パスワードを変更</strong></span> をクリックします。</p>
-<p role="presentation" class="cap-smime">構成によって、<span class="guilabel"><strong>変更する鍵の種類を選択</strong></span>が表示されます。パスワードを再設定する暗号化タイプによって、<span class="guibutton"><strong>PGP</strong></span>または<span class="guibutton"><strong>S/MIME</strong></span>を選択します。<span class="guilabel"><strong>パスワードのリセット</strong></span>ウィンドウが表示されます。</p>
-</li>
-<li class="step">
-<p role="presentation"><span class="phrase"><span class="guibutton"><strong>現在のGuard セキュリティ パスワードの入力</strong></span></span> フィールドで、 それまでデータに暗号化に使用していたパスワードを入力します。
-</p>
-<p role="presentation"><span class="phrase"><span class="guibutton"><strong>新規 Guard セキュリティ パスワードの入力</strong></span></span> フィールドにこれからデータの暗号化に使用したいパスワードを入力します。 </p>
-<p role="presentation"><span class="phrase"><span class="guibutton"><strong>新しいGuardセキュリティパスワードを確認</strong></span></span>フィールドに再度入力してパスワードを確認します。</p>
-</li>
-<li class="step"><p role="presentation"><span class="guibutton"><strong>変更</strong></span>をクリックします。</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.reset">
-<p class="title"><span class="phrase">Guard</span>パスワードのリセット方法:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>パスワードをリセット</strong></span>をクリックします。</p>
-<p role="presentation" class="cap-smime">構成によって、<span class="guilabel"><strong>変更する鍵の種類を選択</strong></span>が表示されます。パスワードを再設定する暗号化タイプによって、<span class="guibutton"><strong>PGP</strong></span>または<span class="guibutton"><strong>S/MIME</strong></span>を選択します。<span class="guilabel"><strong>パスワードのリセット</strong></span>ウィンドウが表示されます。</p>
-<p role="presentation"><span class="guibutton"><strong>リセット</strong></span>をクリックします。</p>
-</li>
-<li class="step">
-<p role="presentation">二番目のメール アドレスに新しいパスワードが送信されます。</p>
-<p role="presentation">二番目のメール アドレスが入力されていない場合、新しいパスワードが既定のメール アドレスに送信されます。</p>
-<p role="presentation">この新しいパスワードが今後使用できる<span class="phrase">Guard</span>セキュリティ パスワードになります。すぐにこのパスワードを<a class="link" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.task.guard.settings">変更</a>してください。</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.secondarymail">
-<p class="title">パスワードをリセットするための二番目のメールアドレスの変更方法:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>リセット用メールアドレスの設定</strong></span>をクリックします。</p>
-<p role="presentation" class="cap-smime">構成によって、<span class="guilabel"><strong>変更する鍵の種類を選択</strong></span>が表示されます。パスワードを再設定する暗号化タイプによって、<span class="guibutton"><strong>PGP</strong></span>または<span class="guibutton"><strong>S/MIME</strong></span>を選択します。<span class="guilabel"><strong>二番目のメールアドレス</strong></span>ウィンドウが開きます。</p>
-</li>
-<li class="step">
-<p role="presentation"><span class="phrase"><span class="guibutton"><strong>現在のGuard セキュリティ パスワードの入力</strong></span></span> フィールドで、 それまでデータに暗号化に使用していたパスワードを入力します。
-</p>
-<p role="presentation"><span class="guibutton"><strong>新しい二番目のメール アドレスを入力</strong></span>フィールドで、<span class="phrase">Guard</span>セキュリティ パスワードをリセットするための一時パスワードを受信するメール アドレスを入力します。</p>
-<p role="presentation"><span class="guibutton"><strong>メールアドレスの確認</strong></span>でメールアドレスを再入力します。</p>
-<p role="presentation"><span class="guibutton"><strong>メールアドレスの変更</strong></span>をクリックします。</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
-<p class="title">パスワードをリセットするための機能の削除方法:</p>
-<div class="taskprerequisites">
-        <p><span class="phrase"><strong>警告:</strong></span>パスワードのリセット機能を削除すると、パスワードをリセットすることができません。その後パスワードを忘れた場合は、暗号化されたメールやファイルを復号化することができません。</p>
-      </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>詳細設定を表示</strong></span>を有効にします。</p>
-<p role="presentation"><span class="guibutton"><strong>パスワード復元を削除</strong></span>をクリックします。<span class="guilabel"><strong>復元の削除</strong></span>ウィンドウが開きます。</p>
-</li>
-<li class="step"><p role="presentation"><span class="guibutton"><strong>削除</strong></span> ボタンをクリックします。</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.guard.password"></p>
 <p class="title">関連トピック</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">自分のPGP鍵を管理する</a></p>
-<p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">自分のS/MIME鍵を管理する</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">公開鍵を管理する</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> 設定</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.guard.password">親記事:<a class="xref" href="ox.appsuite.user.chap.guard.html"><i><span class="phrase">Guard</span>を使ってデータの暗号化</i></a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.reset.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.reset.html
new file mode 100644
index 000000000..62892fe00
--- /dev/null
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.password.reset.html
@@ -0,0 +1,82 @@
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>パスワードのリセット</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="ユーザ ガイド">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="パスワード管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.change.html" title="パスワードの変更">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="パスワードリセット機能を削除する">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.change.html">戻る</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">次へ</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+<span class="phrase">Guard</span>を使ってデータの暗号化</h1>
+<h2 class="sr-only">パスワード管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.reset">
+<div class="titlepage"><div><div><h3 class="title">パスワードのリセット</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.7.2"></a><a class="indexterm" name="id-1.14.12.7.3"></a><p id="ox.appsuite.user.concept.guard.password.reset">次のようなオプションの機能があります。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><span class="phrase">Guard</span> パスワードを失った場合、<span class="phrase">Guard</span>パスワードをリセットして、仮の<span class="phrase">Guard</span>パスワードを要求できます。</p></li>
+<li class="listitem"><p role="presentation">パスワードリセット用のメールアドレスを指定できます。</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.password.reset">
+<p class="title"><span class="phrase">Guard</span>パスワードのリセット方法:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">メニューバーで、<span class="guibutton"><strong>設定 </strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.reset"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> をクリックします。<span class="guibutton"><strong>すべての設定</strong></span>をクリックします。</p>
+<p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。右ペインの<span class="guibutton"><strong>パスワード管理(PGP)</strong></span><span class="cap-smime">または<span class="guibutton"><strong>パスワード管理(S/MIME)</strong></span></span>をクリックします。</p>
+</li>
+<li class="step">
+<p role="presentation">仮のパスワードが送信される二番目のメールアドレスを設定するには、<span class="guibutton"><strong>リセット用メールアドレスの設定</strong></span>をクリックします。<span class="guilabel"><strong>二番目のメールアドレス</strong></span>ウィンドウが開きます。</p>
+<p role="presentation">現在のパスワードを入力します。パスワードのリセット用に使用したいメールアドレスを入力します。</p>
+</li>
+<li class="step">
+<p role="presentation"><span class="guibutton"><strong>パスワードをリセット</strong></span>をクリックします。<span class="guilabel"><strong>パスワードのリセット</strong></span>ウィンドウが表示されます。</p>
+<p role="presentation"><span class="guibutton"><strong>リセット</strong></span>をクリックします。</p>
+</li>
+</ol></div>
+<div class="taskrelated">
+          <p>結果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">二番目のメール アドレスに新しいパスワードが送信されます。</p>
+<p role="presentation">二番目のメール アドレスが入力されていない場合、新しいパスワードが既定のメール アドレスに送信されます。</p>
+</li>
+<li class="listitem"><p role="presentation">この新しいパスワードが今後使用できる<span class="phrase">Guard</span>セキュリティ パスワードになります。このパスワードは、すぐに変更 してください。</p></li>
+</ul>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.reset"></p>
+<p class="title">関連トピック</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">パスワードの変更</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">パスワードリセット機能を削除する</a></p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.password.reset">親記事:<a class="xref" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.settings.html b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.settings.html
index 9eb740beb..fce9da12b 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.guard.settings.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.guard.settings.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Guardを使ってデータの暗号化">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="公開鍵を管理する">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="受取人のS/MIME鍵を管理する">
 <link rel="next" href="ox.appsuite.user.index.html" title="索引">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.index.html">次へ</a></li>
@@ -44,67 +44,119 @@
 </li>
 <li class="step"><p role="presentation">左ペインの <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> をクリックします。</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p><span class="phrase"><span class="guilabel"><strong>Guard セキュリティ設定</strong></span></span> ページが表示されます。</p>
-      </div>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings">次の設定が利用できます:</p>
+<p id="ox.appsuite.user.reference.guard.settings">構成によって、次の設定が利用できます。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.default"><span class="phrase">Guard</span> 既定の設定</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.pgppasswords">パスワード管理 (PGP)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.smimepasswords">パスワード管理 (S/MIME)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yourpgpkeys">自分のPGP鍵</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientpgpkeys">受取人 PGP 鍵</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yoursmime">S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientsmime">S/MIME 受取人</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.advanced">詳細</a></p></li>
+</ul>
+<p>詳細は、次のページを参照してください。<a class="xref" href="ox.appsuite.user.sect.settings.search.html">設定を検索する</a></p>
 <p id="ox.appsuite.user.reference.guard.settings.default"></p>
-<h3 class="title">既定の設定</h3>
+<h3 class="title">
+<span class="phrase">Guard</span> 既定の設定</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.encrypt"><b>メールの作成時に暗号化を既定にする. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>新規メールを既定で暗号化するかどうかを指定する。</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.sign"><b>送信メールへの署名の追加を既定にする. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>新規メールを既定で暗号化するかどうかを指定する。</p></li>
-<li class="listitem cap-smime" id="id-1.14.14.7.2.1.3">
-<p id="ox.appsuite.user.task.guard.settings.default.smime"><b>既定は署名と暗号化にS/MIMEを使用. </b><a class="indexterm" name="id-1.14.14.7.2.1.3.1.2"></a></p>
-<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p role="presentation">S/MIME を既定で署名および暗号化に使用するかどうかを指定します。</p></li></ul>
-</li>
 <li class="listitem">
-<p id="ox.appsuite.user.task.guard.settings.default.inline"><b>新規メールにインライン PGP 使用を既定にする. </b><a class="indexterm" name="id-1.14.14.7.2.1.4.1.2"></a>注:このオプションは<span class="guibutton"><strong>詳細設定</strong></span>チェックボックスが有効な場合にのみ有効です。</p>
+<p id="ox.appsuite.user.reference.guard.settings.default.create"><b>オプションを作成. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">PGP /インラインを既定で暗号化メールに使用するかどうかを指定します。</p></li>
-<li class="listitem"><p role="presentation">受取人のメールクライエントが PGP サポートされていない場合はこの設定だけを使用してください。インライン PGPで受取人はメッセージを復号化できます。</p></li>
-<li class="listitem"><p role="presentation">この場合はHTML形式のメールを送信することはできません。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.encrypt"><b>メールの作成時に暗号化を既定にする. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.1.1.2"></a>新規メールを既定で暗号化するかどうかを指定する。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.sign"><b>送信メールへの署名の追加を既定にする. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.2.1.2"></a>新規メールを既定で暗号化するかどうかを指定する。</p></li>
+<li class="listitem cap-smime" id="id-1.14.14.7.2.1.1.1.3.1.3">
+<p id="ox.appsuite.user.task.guard.settings.default.create.smime"><b>既定は署名と暗号化にS/MIMEを使用. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.3.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: square; "><li class="listitem"><p role="presentation">S/MIME を既定で署名および暗号化に使用するかどうかを指定します。</p></li></ul>
+</li>
 </ul>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>既定のパスワードを記憶. </b><a class="indexterm" name="id-1.14.14.7.2.1.5.1.2"></a><span class="phrase">Guard</span> の既定の時間範囲を指定して、パスワードを記憶します。お使いの<span class="phrase">Guard</span>パスワードを聞かれた時にこの既定のパスワードを変更できます。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>既定のパスワードを記憶. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a><span class="phrase">Guard</span> の既定の時間範囲を指定して、パスワードを記憶します。お使いの<span class="phrase">Guard</span>パスワードを聞かれた時にこの既定のパスワードを変更できます。</p></li>
 </ul>
-<p id="ox.appsuite.user.reference.guard.settings.password"></p>
-<h3 class="title">パスワード管理</h3>
+<p id="ox.appsuite.user.reference.guard.settings.pgppasswords"></p>
+<h3 class="title">パスワード管理 (PGP)</h3>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">パスワードの変更またはリセット機能があります。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">PGPパスワードの変更またはリセット機能があります。</p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a></p></li>
 </ul>
-<div id="ox.appsuite.user.reference.guard.settings.smime" class="cap-smime">
-<p id="ox.appsuite.user.reference.guard.settings.smime"></p>
+<div id="ox.appsuite.user.reference.guard.settings.smimepasswords" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.smimepasswords"></p>
+<h3 class="title">パスワード管理 (S/MIME)</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">S/MIMEパスワードの変更またはリセット機能があります。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.guard.password.html">パスワード管理</a></p></li>
+</ul>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.yourpgpkeys"></p>
+<h3 class="title">自分のPGP鍵</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">自分のPGP鍵の管理機能があります。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">自分のPGP鍵を管理する</a></p></li>
+</ul>
+<p id="ox.appsuite.user.reference.guard.settings.recipientpgpkeys"></p>
+<h3 class="title">受取人 PGP 鍵</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">受取人からのPGP鍵の管理機能があります。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">受取人のPGP鍵を管理する</a></p></li>
+</ul>
+<div id="ox.appsuite.user.reference.guard.settings.yoursmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.yoursmime"></p>
 <h3 class="title">S/MIME</h3>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.smime.enable"><b>S/MIMEを有効化. </b><a class="indexterm" name="id-1.14.14.9.2.1.1.1.2"></a>S/MIME暗号化でメールを送受信できるかどうかを指定します。</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">S/MIMEタイプ暗号化の管理機能があります。</p>
+<p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p>
+</li></ul>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings.extended"></p>
+<div id="ox.appsuite.user.reference.guard.settings.recipientsmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.recipientsmime"></p>
+<h3 class="title">S/MIME 受取人</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">S/MIMEタイプ受取人証明書の表示および追加機能があります。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p></li>
+</ul>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.advanced"></p>
 <h3 class="title">詳細</h3>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<p id="ox.appsuite.user.reference.guard.settings.extended.advanced"><b>詳細設定. </b><a class="indexterm" name="id-1.14.14.10.2.1.1.1.2"></a><span class="guibutton"><strong>詳細設定を表示</strong></span>を有効にすると、次の設定と機能が使用できます。</p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
+<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>メールキャッシュ</strong></span></p>
-<p role="presentation">別のメールの表示時または別のグループアプリケーションへの変更時に、復号化したメールを読み取り可能な形式でブラウザのキャッシュに保存するかどうかを指定します。</p>
-<p role="presentation">ブラウザのキャッシュから復号化したメールを削除するには、<span class="guibutton"><strong>メールを復号化されたままにしない</strong></span>を有効にします。</p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.email"><b>メール作成の詳細設定を表示. </b></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<a class="indexterm" name="id-1.14.14.14.2.1.1.1.2.1.1.1"></a><p role="presentation">このオプションが有効な場合、暗号化されたメールの送信時に追加オプションを使用できます。</p>
+<p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">暗号化されたメールの送信</a></p>
+</li></ul>
 </li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>鍵</strong></span>セクション</p>
-<p role="presentation">自分の鍵、公開鍵またはAutocrypt鍵を管理する</p>
-<p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">鍵管理</a></p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.inline"><b>新規メールにインライン PGP 使用を既定にする. </b><a class="indexterm" name="id-1.14.14.14.2.1.2.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">PGP /インラインを既定で暗号化メールに使用するかどうかを指定します。</p></li>
+<li class="listitem"><p role="presentation">受取人のメールクライエントが PGP サポートされていない場合はこの設定だけを使用してください。インライン PGPで受取人はメッセージを復号化できます。</p></li>
+<li class="listitem"><p role="presentation">この場合はHTML形式のメールを送信することはできません。</p></li>
+</ul>
 </li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Autocrypt</strong></span>セクション</p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.autocrypt"><b>Autocrypt 設定. </b><a class="indexterm" name="id-1.14.14.14.2.1.3.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
 <p role="presentation">受信メールのAutocryptの使用を設定します。Autocrypt鍵を別のクライアントに転送できます。</p>
 <p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">Autocryptを使ってメールのやり取りを暗号化する</a></p>
+</li></ul>
 </li>
 <li class="listitem">
-<p role="presentation">暗号化されたメールを送信するときに、追加オプションがあります。</p>
-<p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">暗号化されたメールの送信</a></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.cache"><b>メールキャッシュ. </b><a class="indexterm" name="id-1.14.14.14.2.1.4.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation">別のメールの表示時または別のグループアプリケーションへの変更時に、復号化したメールを読み取り可能な形式でブラウザのキャッシュに保存するかどうかを指定します。</p>
+<p role="presentation">ブラウザのキャッシュから復号化したメールを削除するには、<span class="guibutton"><strong>メールを復号化されたままにしない</strong></span>を有効にします。</p>
+</li></ul>
 </li>
-</ul>
+<li class="listitem">
+<p id="ox.appsuite.user.task.guard.settings.advanced.reset"><b>オプションをリセット. </b><a class="indexterm" name="id-1.14.14.14.2.1.5.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation"><span class="guibutton"><strong>パスワード復元を削除</strong></span>失われたパスワードを復元する機能を削除します。</p>
+<p role="presentation"><span class="phrase"><strong>警告:</strong></span>パスワードのリセット機能を削除すると、パスワードをリセットすることができません。その後パスワードを忘れた場合は、暗号化されたメールやファイルを復号化することができません。</p>
+<p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">パスワードリセット機能を削除する</a></p>
 </li></ul>
+</li>
+</ul>
 <p id="ox.appsuite.user.parent.guard.settings">親記事:<a class="xref" href="ox.appsuite.user.chap.guard.html"><i><span class="phrase">Guard</span>を使ってデータの暗号化</i></a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.settings.commonsettings.html b/help/l10n/ja_JP/ox.appsuite.user.sect.settings.commonsettings.html
index 1fd515d95..e4f071d7f 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.settings.commonsettings.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.settings.commonsettings.html
@@ -124,7 +124,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a></p></li></ul>
 </li>
 <li class="listitem cap-deputy" id="id-1.4.6.11.2.1.3">
-<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>代理を管理する. </b></p>
+<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>代理人を管理. </b></p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">詳細は、 を参照してください。<a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">代理を管理する</a></p></li></ul>
 </li>
 <li class="listitem">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.settings.notificationarea.html b/help/l10n/ja_JP/ox.appsuite.user.sect.settings.notificationarea.html
index ce8fc57c0..8dff044a2 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.settings.notificationarea.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.settings.notificationarea.html
@@ -64,7 +64,7 @@
 <p role="presentation" class="feat-io-ox-core-managedResources">管理リソースへの予約リクエストを受け取ると、次の機能を使用できます:<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">リソースカレンダーで予約リクエストを表示するには、日付をクリックします。</p></li>
 <li class="listitem"><p role="presentation">予約リクエストを承諾または拒否するには、それぞれのボタンをクリックします。</p></li>
-</ul></p>
+</ul> </p>
 <p role="presentation">期限が過ぎたタスクがある場合、次の機能が使えます。<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">ポップアップで詳細を表示するには、アラームをクリックします。</p></li>
 <li class="listitem"><p role="presentation">タスクを編集するには、ポップアップの機能を使用します。</p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.settings.notifications.html b/help/l10n/ja_JP/ox.appsuite.user.sect.settings.notifications.html
index 290736eb0..28b1510de 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.settings.notifications.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.settings.notifications.html
@@ -58,7 +58,7 @@
 <p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications"></p>
 <h3 class="title">デスクトップ通知</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>show desktop notifications. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>グループウェアがバックグランドにある場合に受信メールのデスクトップ通知を受信するかどうかを指定します。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>デスクトップ通知を表示. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>グループウェアがバックグランドにある場合に受信メールのデスクトップ通知を受信するかどうかを指定します。</p></li>
 <li class="listitem">
 <p role="presentation">ブラウザの設定によって、<span class="guibutton"><strong>今ブラウザの権限を管理する</strong></span>ボタンが表示されます。ボタンをクリックします。ブラウザが通知を受信するかどうかを聞きます。この権限を付与します。</p>
 <p role="presentation">注:ブラウザによっては、上記の設定を有効にするためにブラウザ設定で通知を受け取れるようにしなければならない可能性があります。これに関する情報については、ブラウザのヘルプページを参照ください。</p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.settings.search.html b/help/l10n/ja_JP/ox.appsuite.user.sect.settings.search.html
index 5ed979570..bae0cb8df 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.settings.search.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.settings.search.html
@@ -65,6 +65,7 @@
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">予定表の設定</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">アドレス帳の設定</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">ドライブ</span> 設定</a></p>
+<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> 設定</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.settings.search">親記事:<a class="xref" href="ox.appsuite.user.chap.settings.html"><i>カスタム設定</i></a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.detailview.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.detailview.html
index 6b77144d9..206be07a8 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.detailview.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.detailview.html
@@ -79,14 +79,11 @@
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">タスク</span> リストビュー</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.create.html">編集ウィンドウ</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">タスクの表示</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">タスクの添付ファイルの表示、保存</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">タスクの参加者に通話する</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">タスクの管理</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">ハロー ビューで連絡先を表示するハロー ビューで連絡先を表示</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.gui.detailview">親記事:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">タスク</span> 構成</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.foldertree.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.foldertree.html
index 146a7a8c7..2daad9992 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.foldertree.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.foldertree.html
@@ -54,6 +54,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">タスクの表示</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">タスクリストを追加する</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">タスクの管理</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">フォルダーでデータを管理</a></p>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.list.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.list.html
index 2f14f11d9..76b45476c 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.list.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.list.html
@@ -51,17 +51,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.list.html">リストビュー</a></p></li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.settingsmenu.html"><span class="phrase">タスク</span> 設定メニュー</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.detailview.html"><span class="phrase">タスク</span> 詳細ビュー</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">タスクの表示</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">タスクの添付ファイルの表示、保存</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">タスクの管理</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.list">親記事:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">タスク</span> 構成</a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.settingsmenu.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
index 799540b3f..7484b3d80 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
@@ -48,10 +48,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.menubar.html">メニュー バー</a></p></li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">タスク</span> リストビュー</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">パブリックタスクリストと共有タスクリストを登録する</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">パブリックタスクリストと共有タスクリストを登録する</a></p></li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.settingsmenu">親記事:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">タスク</span> 構成</a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.toolbar.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.toolbar.html
index 405d52f7c..74f2ed2ec 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.toolbar.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.gui.toolbar.html
@@ -52,13 +52,7 @@
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">タスクの編集</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">タスクの終了日時の変更</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">タスクに完了の印を付ける</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">別のフォルダーへのタスクの移動</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">タスクのステータスの変更</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">タスクのエクスポート</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.print.html">タスクの印刷</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.delete.html">タスクの削除</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">タスクの管理</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.toolbar">親記事:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">タスク</span> 構成</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.categories.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.categories.html
new file mode 100644
index 000000000..97ef34e60
--- /dev/null
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.categories.html
@@ -0,0 +1,85 @@
+<html lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>タスクにカテゴリを使用する</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="ユーザ ガイド">
+<link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="タスクの管理">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="タスクの終了日時の変更">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="別のフォルダーへのタスクの移動">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">戻る</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">次へ</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">タスク</span></h1>
+<h2 class="sr-only">タスクの管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.tasks.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">タスクにカテゴリを使用する</h3></div></div></div>
+<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.categories">フォルダとは別にタスクを整理するために、カテゴリを使用できます。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">タスクにカテゴリで印をつけることができます。</p></li>
+<li class="listitem"><p role="presentation">特定のカテゴリで印をつけられたすべてのタスクを表示できます。</p></li>
+</ul>
+<p>自分のカテゴリを作成、編集、削除できます。<a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a>参照。</p>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories">
+<p class="title">タスクにカテゴリで印をつける:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">タスクを選択します。ツールバーで、<span class="guibutton"><strong>連絡先を編集</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.mark.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>をクリックします。</p>
+<p role="presentation">タスク編集ウィンドウが開きます。</p>
+</li>
+<li class="step">
+<p role="presentation">割り当てるには、<span class="guibutton"><strong>カテゴリ</strong></span>の横の<span class="guibutton"><strong>カテゴリを追加</strong></span>をクリックします。カテゴリを選択します。</p>
+<p role="presentation">カテゴリをタスクから削除するには、カテゴリの隣の<span class="guibutton"><strong>カテゴリを削除</strong></span> アイコン <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> をクリックします。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories.view">
+<p class="title">特定のカテゴリで印をつけられたタスクを表示する:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">カテゴリで印をつけられたタスクを選択します。</p></li>
+<li class="step"><p role="presentation">詳細ビューでカテゴリをクリックします。</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>結果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">リストビューにこのカテゴリで印をつけられたすべてのタスクが表示されます。</p></li>
+<li class="listitem"><p role="presentation">前のリストを表示するには、検索フィールドで<span class="guibutton"><strong>検索をキャンセル</strong></span>アイコン<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>をクリックします。</p></li>
+</ul>
+          <p>ヒント:検索オプションを使用してカテゴリを検索することで、検索機能を使用することもできます。</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.tasks.manage.categories"></p>
+<p class="title">関連トピック</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">タスクの検索</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">新規メールにインライン PGP 使用を既定にする</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">予定にカテゴリを使用する</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">連絡先にカテゴリを使用</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.tasks.manage.categories">親記事:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">タスクの管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.changeduedate.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.changeduedate.html
index 38f4de9c4..2a6c33b81 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.changeduedate.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.changeduedate.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="タスクの管理">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="タスクに完了の印を付ける">
-<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="別のフォルダーへのタスクの移動">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="タスクにカテゴリを使用する">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">次へ</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">次へ</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -43,7 +43,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changeduedate"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">タスク</span> リストビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.changestatus.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.changestatus.html
index 6dd631287..c1b27e688 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.changestatus.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.changestatus.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">タスクの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.changestatus">
 <div class="titlepage"><div><div><h3 class="title">タスクのステータスの変更</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.10.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">タスクの参加者である場合、このタスクの確認をあとで変更できます。他のタスクの参加者に表示されるコメントを追加することができます。</p>
+<a class="indexterm" name="id-1.10.15.11.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">タスクの参加者である場合、このタスクの確認をあとで変更できます。他のタスクの参加者に表示されるコメントを追加することができます。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.changestatus">
 <p class="title">確認を変更する:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,7 +44,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changestatus"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">タスク</span> リストビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.delete.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.delete.html
index 2fe4c498f..8a071744d 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.delete.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">タスクの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">タスクの削除</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>警告:</strong></span>削除したファイルを復元することは<span class="phrase"><strong>できません</strong></span>。</p>
+<a class="indexterm" name="id-1.10.15.15.2"></a><a class="indexterm" name="id-1.10.15.15.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>警告:</strong></span>削除したファイルを復元することは<span class="phrase"><strong>できません</strong></span>。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.delete">
 <p class="title">タスクを削除する:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,7 +44,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.delete"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">タスク</span> リストビュー</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.manage.delete">親記事:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">タスクの管理</a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.export.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.export.html
index e9c10954b..e9466aea5 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.export.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">タスクの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.export">
 <div class="titlepage"><div><div><h3 class="title">タスクのエクスポート</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">タスクを iCal 形式でエクスポートできます。この形式を使用して、タスクを他の予定表アプリケーションと交換することができます。一つのタスクまたはすべてのタスクをフォルダーからエクスポートできます。</p>
+<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><a class="indexterm" name="id-1.10.15.13.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">タスクを iCal 形式でエクスポートできます。この形式を使用して、タスクを他の予定表アプリケーションと交換することができます。一つのタスクまたはすべてのタスクをフォルダーからエクスポートできます。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.export.selected">
 <p class="title">一つのタスクをエクスポートする:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -58,12 +58,16 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.export"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html"><span class="phrase">タスク</span> フォルダービュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">タスク</span> リストビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">タスクをインポート</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.10.15.12.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">個人データをダウンロード</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.10.15.13.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">個人データをダウンロード</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.manage.export">親記事:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">タスクの管理</a></p>
 </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.html
index 683afb5f8..9f4d7edde 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.html
@@ -36,6 +36,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">タスクに完了の印を付ける</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">タスクの終了日時の変更</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">タスクにカテゴリを使用する</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">別のフォルダーへのタスクの移動</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">タスクのステータスの変更</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">タスクをインポート</a></p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.import.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.import.html
index 09de1ae5a..233ec7257 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.import.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">タスクの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.import">
 <div class="titlepage"><div><div><h3 class="title">タスクをインポート</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.11.2"></a><a class="indexterm" name="id-1.10.15.11.3"></a><a class="indexterm" name="id-1.10.15.11.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">iCal形式のファイルからタスクをインポートできます。</p>
+<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">iCal形式のファイルからタスクをインポートできます。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.import">
 <p class="title">iCalファイルからタスクをインポートする:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -50,6 +50,9 @@
         </div>
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.import"></p>
+<p class="title">ユーザ インターフェース</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html"><span class="phrase">タスク</span> フォルダービュー</a></p></li></ul>
+<p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">タスクのエクスポート</a></p></li>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.markasdone.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.markasdone.html
index d7f5ed381..cc6d7dc90 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.markasdone.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.markasdone.html
@@ -46,7 +46,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.markasdone"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">タスク</span> リストビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.move.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.move.html
index 1f3372f3d..a12bf45e9 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.move.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.move.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="ユーザ ガイド">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="タスクの管理">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="タスクの終了日時の変更">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="タスクにカテゴリを使用する">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.changestatus.html" title="タスクのステータスの変更">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律上の通知">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">ナビゲーションを表示</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">戻る</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">戻る</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">ホーム</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目次</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">次へ</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">タスクの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.move">
 <div class="titlepage"><div><div><h3 class="title">別のフォルダーへのタスクの移動</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">タスクを別のフォルダーへ移動できます。</p>
+<a class="indexterm" name="id-1.10.15.10.2"></a><a class="indexterm" name="id-1.10.15.10.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">タスクを別のフォルダーへ移動できます。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.move">
 <p class="title">タスクを他のフォルダーに移動する:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,7 +46,11 @@
 <p id="ox.appsuite.user.tip.tasks.manage.move">ヒント:フォルダービューからオブジェクトをフォルダーにドラッグして、選択オブジェクトを移動することもできます。</p>
 <p id="ox.appsuite.user.related.tasks.manage.move"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html"><span class="phrase">タスク</span> フォルダービュー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">タスク</span> リストビュー</a></p>
+</li></ul>
 <p> </p>
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">個人用タスクリストを追加する</a></p></li></ul>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.print.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.print.html
index bd378ab6a..3bcb6ea5c 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.print.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">タスクの管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.print">
 <div class="titlepage"><div><div><h3 class="title">タスクの印刷</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">一つのタスク、または複数のタスクのデータを印刷できます。</p>
+<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">一つのタスク、または複数のタスクのデータを印刷できます。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.print.data">
 <p class="title">タスクデータを印刷する:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -45,7 +45,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.print"></p>
 <p class="title">ユーザ インターフェース</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">タスク</span> ツールバー</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">タスク</span> リストビュー</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.manage.print">親記事:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">タスクの管理</a></p>
 </div>
           </div>
diff --git a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.search.html b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.search.html
index 7bfbdeb21..05c40fd74 100644
--- a/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.search.html
+++ b/help/l10n/ja_JP/ox.appsuite.user.sect.tasks.search.html
@@ -81,7 +81,7 @@
 <p class="title">関連トピック</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">タスクの表示</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">カテゴリの管理</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">タスクにカテゴリを使用する</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.search">親記事:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">タスクの管理</a></p>
 </div>
diff --git a/help/l10n/nl_NL/bk01-toc.html b/help/l10n/nl_NL/bk01-toc.html
index 8393be759..78f9e0977 100644
--- a/help/l10n/nl_NL/bk01-toc.html
+++ b/help/l10n/nl_NL/bk01-toc.html
@@ -64,7 +64,7 @@
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.commonsettings.html">Algemene instellingen aanpassen</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a></li>
 <li class="sect1 feat-io-ox-core-countdown"><a href="ox.appsuite.user.sect.settings.countdown.html">Aftellen gebruiken voor afspraken</a></li>
-<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">Gebruik het meldingengebied</a></li>
+<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">gebruik het meldingengebied</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.personaldata.html">Persoonlijke Contactgegevens wijzigen</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.wizard.html">Gebruik een Wizard om Lokale Apps te Configureren</a></li>
 <li class="sect1 cap-switchboard"><a href="ox.appsuite.user.sect.settings.presencestatus.html">De presentiestatus instellen</a></li>
@@ -134,7 +134,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.new.html">De Nieuwe e-mail knop</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.foldertree.html">Het <span class="phrase">E-mail</span> mappenoverzicht</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">De <span class="phrase">E-mail</span> tabbladenbalk</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">De Postvak IN-categorieën balk</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.popup.html">De <span class="phrase">E-mail</span> pop-up</a></li>
@@ -144,13 +144,13 @@
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.view.html">E-mailberichten bekijken</a></li>
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.attachments.html">Tonen of opslaan van e-mailbijlagen</a></li>
 <li class="sect1 cap-webmail">
-<a href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a><ul>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">Een afzenderadres selecteren</a></li>
+<a href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a><ul>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">selecteer een verzendadres</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.replyto.html">Antwoordadres instellen</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">Bijlagen toevoegen</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">bijlagen toevoegen</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Bijlagen toevoegen uit bestaande e-mailberichten</a></li>
-<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">Bijlagen versturen als link</a></li>
+<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">bijlagen verzenden als link</a></li>
 <li class="sect2 feat-io-ox-core-templates"><a href="ox.appsuite.user.sect.email.send.templates.html">Sjablonen gebruiken</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.signatures.html">Ondertekeningen gebruiken</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.reply.html">Beantwoorden van e-mailberichten</a></li>
@@ -174,6 +174,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.movecopy.html">Verplaatsen of kopiëren van e-mailberichten</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.mark.html">Markeren van e-mailberichten als gelezen of ongelezen</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.collectaddress.html">Adressen verzamelen</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">PGP inline standaard ingesteld voor nieuwe berichten</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.label.html">E-mailberichten Categoriseren</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.source.html">E-mailbron weergeven</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.draft.html">Concept e-mailberichten gebruiken</a></li>
@@ -185,6 +186,9 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.print.html">E-mailberichten Afdrukken</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.archive.html">E-mailberichten Archiveren</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.delete.html">E-mailberichten verwijderen</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.recover.html">E-mailberichten herstellen</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-mailberichten verwijderen</a></li>
+<li class="sect2 cap-dumpster"><a href="ox.appsuite.user.sect.email.manage.undelete.html">Verwijderde e-mailberichten herstellen</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-mailmappen opschonen</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Verzamelde Mail gebruiken</a></li>
 </ul>
@@ -238,7 +242,7 @@
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.attachments.html">Tonen of opslaan van afspraakbijlagen</a></li>
 <li class="sect1 cap-calendar">
-<a href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a><ul>
+<a href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a><ul>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.create.html">Nieuwe afspraken maken</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.datepicker.html">De datumkiezer gebruiken</a></li>
 <li class="sect2 cap-calendar cap-switchboard"><a href="ox.appsuite.user.sect.calendar.add.call.html">Audio-/videovergaderingen plannen</a></li>
@@ -252,7 +256,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">Deelnemers uitnodigen voor een nieuwe afspraak</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.recipients.html">E-mailontvangers uitnodigen van voor een nieuwe afspraak</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Het creëren van een nieuwe afspraak uit een iCal-bijlage</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">conflicten oplossen</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Conflicten oplossen</a></li>
 </ul>
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.invitation.html">Beantwoorden van Afspraakuitnodigingen</a></li>
@@ -269,10 +273,11 @@
 </li>
 <li class="sect1 cap-calendar">
 <a href="ox.appsuite.user.sect.calendar.manage.html">Beheren van Afspraken</a><ul>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Wijzigen van de afspraakstatus</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Afspraakstatus wijzigen</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Afspraakherinneringen aanpassen</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Wijzig de organisator</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.timezones.html">Favoriete tijdzones beheren</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">Categorieën gebruiken voor afspraken</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.colors.html">Agendakleuren gebruiken</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.move.html">Afspraken verplaatsen naar een andere agenda</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.import.html">Afspraken importeren</a></li>
@@ -360,6 +365,7 @@
 <a href="ox.appsuite.user.sect.contacts.manage.html">Contacten beheren</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Versturen van e-mailberichten vanuit uit een adresboek</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Uitnodigen van contacten voor een afspraak</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">Categorieën gebruiken voor contacten</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Verplaatsen of kopiëren van contacten</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Versturen van contactgegevens als vCard</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.import.html">Importeren van contacten</a></li>
@@ -413,6 +419,7 @@
 <a href="ox.appsuite.user.sect.tasks.manage.html">Taken beheren</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Taken markeren als voltooid</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">De vervaldatum van de taak veranderen</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">Categorieën gebruiken voor taken</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.move.html">Taken verplaatsen naar een andere map</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Taakbevestigingen aanpassen</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.import.html">Importeren van taken</a></li>
@@ -515,7 +522,7 @@
 </ul>
 </li>
 <li class="sect1 cap-deputy">
-<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vertegenwoordigers beheren</a><ul>
+<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">beheer vertegenwoordigers</a><ul>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.add.html">vertegenwoordigers toevoegen</a></li>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">vertegenwoordigers bekijken, bewerken, verwijderen</a></li>
 </ul>
@@ -577,19 +584,26 @@
 </ul>
 </li>
 <li class="sect1 cap-guard">
-<a href="ox.appsuite.user.sect.guard.documents.html">Office-documenten coderen</a><ul>
+<a href="ox.appsuite.user.sect.guard.documents.html">Officedocumenten Coderen</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.createencrypted.html">Nieuwe gecodeerde bestanden aanmaken</a></li>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Geselecteerde documenten opslaan in een gecodeerd formaat</a></li>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.open.html">Gecodeerde documenten openen</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.logout.html">Afmelden uit <span class="phrase">Guard</span></a></li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a></li>
+<li class="sect1 cap-guard">
+<a href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a><ul>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.change.html">Het wachtwoord wijzigen</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.reset.html">Herstel het wachtwoord</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.deleterecovery.html">De wachtwoordherstelfunctie verwijderen</a></li>
+</ul>
+</li>
 <li class="sect1 cap-guard">
 <a href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Eigen PGP sleutels beheren</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">PGP sleutels van ontvangers beheren</a></li>
 <li class="sect2 cap-smime"><a href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Eigen S/MIME sleutels beheren</a></li>
-<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Publieke sleutels beheren</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">S/MIME sleutels van ontvangers beheren</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Instellingen</a></li>
diff --git a/help/l10n/nl_NL/index.html b/help/l10n/nl_NL/index.html
index faa389ead..df9b4a708 100644
--- a/help/l10n/nl_NL/index.html
+++ b/help/l10n/nl_NL/index.html
@@ -34,7 +34,7 @@
 </h3></div></div>
 <div><p class="copyright">Copyright ©  OX Software GmbH </p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">Juridische kennisgeving</a></div>
-<div><p class="pubdate">dinsdag, 21. november 2023 Version 8.19.0 </p></div>
+<div><p class="pubdate">donderdag, 21. december 2023 Version 8.20.0 </p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">Overzicht van Helponderwerpen</h2>
@@ -84,7 +84,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Aftellen gebruiken voor afspraken</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Gebruik het meldingengebied</a>
+                <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">gebruik het meldingengebied</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Gebruik een Wizard om Lokale Apps te Configureren</a>
@@ -97,6 +97,19 @@
               </p></li>
 </ul>
 </li>
+<li class="listitem" id="ox.appsuite.user.startpage.toc.keyboard" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.chap.keyboard.html"><i>Toetsenbordinvoer</i></a>
+            </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.navigation.html">De toetsenbordnavigatie gebruiken</a>
+              </p></li>
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.shortkeys.html">Sneltoetsen gebruiken</a>
+              </p></li>
+</ul>
+</li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.portal" style="list-style-type: none">
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.chap.portal.html"><i>
@@ -135,12 +148,12 @@
                 <a class="xref" href="ox.appsuite.user.sect.email.view.html">E-mailberichten bekijken</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a>
+                <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a>
               </p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.5.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.6.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.openai.html">De AI integratie gebruiken</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.5.1.6"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.call.html">De verzender of een andere ontvanger bellen</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -155,13 +168,13 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.search.html">Zoeken naar E-mailberichten</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.5.1.11"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.11"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.deputy.html">E-mails verzenden of ontvangen als plaatsvervanger</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.accounts.html">E-mailaccounts toevoegen</a>
               </p></li>
-<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.5.1.13"><p role="presentation">
+<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
               </p></li>
 </ul>
@@ -183,7 +196,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Tonen van Afspraken</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a>
+                <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Beantwoorden van Afspraakuitnodigingen</a>
@@ -191,7 +204,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Afspraken bewerken</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.7"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Afspraakdeelnemers bellen</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -200,25 +213,25 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Beheren van Afspraken</a>
               </p></li>
-<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.6.1.10"><p role="presentation">
+<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.7.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Bronagenda's gebruiken</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Zoeken naar Afspraken</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.12"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.7.1.12"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Afspraken maken, bewerken of beheren als plaatsvervanger</a>
               </p></li>
-<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation">
+<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.7.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">Groepen gebruiken</a>
               </p></li>
-<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.6.1.14"><p role="presentation">
+<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">Bronnen gebruiken</a>
               </p></li>
-<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.6.1.15"><p role="presentation">
+<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.7.1.15"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">Beheerde bronnen gebruiken</a>
               </p></li>
-<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.6.1.16"><p role="presentation">
+<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.7.1.16"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
               </p></li>
 </ul>
@@ -242,7 +255,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatisch contacten of bronnen toevoegen vanuit een adresboek</a>
               </p></li>
-<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.7.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.8.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatisch contacten of bronnen toevoegen vanuit de adreslijst</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -254,7 +267,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Contacten of Distributielijsten bewerken</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.9"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.8.1.9"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Contactpersonen bellen</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -269,7 +282,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Zoeken naar Contacten</a>
               </p></li>
-<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation">
+<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.8.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Adresboek Instellingen</a>
               </p></li>
 </ul>
@@ -344,7 +357,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Cloudopslag accounts toevoegen</a>
               </p></li>
-<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.9.1.10"><p role="presentation">
+<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.10.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Bestanden</span> Instellingen</a>
               </p></li>
 </ul>
@@ -357,19 +370,19 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gegevens Beheren met Mappen</a>
               </p></li>
-<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.10.1.3"><p role="presentation">
+<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.11.1.3"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Gegevens Delen</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.10.1.4"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vertegenwoordigers beheren</a>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.11.1.4"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">beheer vertegenwoordigers</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Accounts Beheren</a>
               </p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.10.1.6"><p role="presentation">
+<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.11.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>
               </p></li>
-<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.10.1.7"><p role="presentation">
+<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.11.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Persoonlijke Gegevens Downloaden</a>
               </p></li>
 </ul>
@@ -388,7 +401,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.sessions.html">Tonen of afmelden van actieve clients</a>
               </p></li>
-<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.11.1.5"><p role="presentation">
+<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.12.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multifactor-Authenticatie</a>
               </p></li>
 </ul>
@@ -411,7 +424,7 @@
                 <a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Bestanden Coderen of Decoderen</a>
               </p></li>
 <li class="listitem"><p role="presentation">
-                <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office-documenten coderen</a>
+                <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Officedocumenten Coderen</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.guard.logout.html">Afmelden uit <span class="phrase">Guard</span></a>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.chap.calendar.html b/help/l10n/nl_NL/ox.appsuite.user.chap.calendar.html
index 90f19d5eb..ce65030ff 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.chap.calendar.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.chap.calendar.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="index.html" title="Gebruikershandleiding">
-<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="E-mailinstellingen">
+<link rel="prev" href="ox.appsuite.user.sect.email.mailfilter.apply.html" title="Een regel toepassen op bestaande e-mailberichten">
 <link rel="next" href="ox.appsuite.user.sect.calendar.gui.html" title="De Agenda Componenten">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.mailfilter.apply.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.gui.html">Volgende</a></li>
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">De <span class="phrase">Agenda</span> Componenten</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Tonen van Afspraken</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.attachments.html">Tonen of opslaan van afspraakbijlagen</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Beantwoorden van Afspraakuitnodigingen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Afspraken bewerken</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.8.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Afspraakdeelnemers bellen</a></p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/nl_NL/ox.appsuite.user.chap.dataorganisation.html
index d9a69bdb6..a6f514928 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.chap.dataorganisation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="index.html" title="Gebruikershandleiding">
-<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="Instellen van WebDAV onder Windows">
+<link rel="prev" href="ox.appsuite.user.sect.drive.settings.html" title="Bestanden Instellingen">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.folder.html" title="Gegevens Beheren met Mappen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.settings.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.folder.html">Volgende</a></li>
@@ -35,7 +35,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gegevens Beheren met Mappen</a></p></li>
 <li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.12.2.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Gegevens Delen</a></p></li>
-<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vertegenwoordigers beheren</a></p></li>
+<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">beheer vertegenwoordigers</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Accounts Beheren</a></p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.12.2.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a></p></li>
 <li class="listitem cap-dataexport" id="id-1.12.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Persoonlijke Gegevens Downloaden</a></p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.chap.drive.html b/help/l10n/nl_NL/ox.appsuite.user.chap.drive.html
index 22aa8de81..b472ec23d 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.chap.drive.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="index.html" title="Gebruikershandleiding">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.search.html" title="Zoeken naar Taken">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.delete.html" title="Taken verwijderen">
 <link rel="next" href="ox.appsuite.user.sect.drive.gui.html" title="De Bestanden Componenten">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.search.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.delete.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.drive.gui.html">Volgende</a></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.chap.email.html b/help/l10n/nl_NL/ox.appsuite.user.chap.email.html
index af9983827..32b9ee43f 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.chap.email.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.chap.email.html
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html">De <span class="phrase">E-mail</span> Componenten</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-mailberichten bekijken</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Tonen of opslaan van e-mailbijlagen</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">De AI integratie gebruiken</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.7.7.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">De verzender of een andere ontvanger bellen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">E-mailmappen toevoegen</a></p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.chap.guard.html b/help/l10n/nl_NL/ox.appsuite.user.chap.guard.html
index fc6266704..547fe7637 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.chap.guard.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="index.html" title="Gebruikershandleiding">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="Controle methode beheren">
+<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="Automatisch afmelden">
 <link rel="next" href="ox.appsuite.user.sect.guard.setup.html" title="Instellen van Guard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.autologout.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.setup.html">Volgende</a></li>
@@ -45,7 +45,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.html">E-mailconversaties Coderen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">E-mailconversaties Coderen met Autocrypt</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Bestanden Coderen of Decoderen</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office-documenten coderen</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Officedocumenten Coderen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.logout.html">Afmelden uit <span class="phrase">Guard</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a></p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.chap.security.html b/help/l10n/nl_NL/ox.appsuite.user.chap.security.html
index ed014482a..a225873b3 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.chap.security.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.chap.security.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="index.html" title="Gebruikershandleiding">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="Tonen, bewerken en verwijderen van accounts">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="Persoonlijke Gegevens Downloaden">
 <link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="Tonen of afmelden van actieve clients">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">Volgende</a></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.chap.settings.html b/help/l10n/nl_NL/ox.appsuite.user.chap.settings.html
index f055c37f0..e21b90458 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.chap.settings.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.chap.settings.html
@@ -37,7 +37,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Algemene instellingen aanpassen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Aftellen gebruiken voor afspraken</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Gebruik het meldingengebied</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">gebruik het meldingengebied</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.personaldata.html">Persoonlijke Contactgegevens wijzigen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Gebruik een Wizard om Lokale Apps te Configureren</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.4.3.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">De presentiestatus instellen</a></p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.chap.tasks.html b/help/l10n/nl_NL/ox.appsuite.user.chap.tasks.html
index b63a0abf3..2730412db 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.chap.tasks.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.chap.tasks.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="index.html" title="Gebruikershandleiding">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="Adresboek Instellingen">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.delete.html" title="Contacten verwijderen">
 <link rel="next" href="ox.appsuite.user.sect.tasks.gui.html" title="De Taken Componenten">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.settings.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.delete.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.gui.html">Volgende</a></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.index.html b/help/l10n/nl_NL/ox.appsuite.user.index.html
index 57af98cf2..d62a6f1c2 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.index.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="index.html" title="Gebruikershandleiding">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="GuardInstellingen">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="S/MIME sleutels van ontvangers beheren">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -21,7 +21,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.settings.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 </ul></div>
@@ -56,7 +56,7 @@
 </dt>
 <dt class="cap-portal">berichten uit sociale netwerken, <a class="indexterm" href="ox.appsuite.user.sect.portal.customize.add.html">Portaal widgets toevoegen</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">E-mailmappen, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Abonneren op gedeelde of persoonlijke e-mailmappen</a>
+<dt class="cap-share_links cap-share_mail_attachments">e-mailmappen, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Abonneren op gedeelde of persoonlijke e-mailmappen</a>
 </dt>
 <dt class="cap-calendar_google">Google agenda, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Abonneren op Google agenda's</a>
 </dt>
@@ -121,7 +121,7 @@
 </dt>
 <dt class="cap-contacts">lijstoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.list.html">De  Adresboek lijst</a>
 </dt>
-<dt class="cap-contacts">mappenoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">Het Adresboek mappenoverzicht</a>
+<dt class="cap-contacts">Mappenoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">Het Adresboek mappenoverzicht</a>
 </dt>
 <dt class="cap-contacts">navigatiebalk, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.navbar.html">De Adresboek navigatiebalk</a>
 </dt>
@@ -140,7 +140,7 @@
 <dd><dl>
 <dt class="cap-contacts">koppel postadressen met een kaartendienst, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Adresboek Instellingen</a>
 </dt>
-<dt class="cap-contacts">namen, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Adresboek Instellingen</a>
+<dt class="cap-contacts">Namen, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Adresboek Instellingen</a>
 </dt>
 <dt class="cap-contacts">standaard map, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Adresboek Instellingen</a>
 </dt>
@@ -171,7 +171,7 @@
 </dt>
 <dt class="cap-infostore">documenten, tekstbestanden, afbeeldingen, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Bestanden afdrukken als PDF</a>
 </dt>
-<dt class="cap-webmail">e-mailbericht, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">E-mailberichten Afdrukken</a>
+<dt class="cap-webmail">e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">E-mailberichten Afdrukken</a>
 </dt>
 <dt class="cap-calendar">lijst van afspraken, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.print.html">Afdrukken van afspraken</a>
 </dt>
@@ -186,7 +186,7 @@
 </dt>
 <dt class="cap-calendar">afdrukken, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.print.html">Afdrukken van afspraken</a>
 </dt>
-<dt class="cap-calendar">afspraakstatus wijzigen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Wijzigen van de afspraakstatus</a>
+<dt class="cap-calendar">afspraakstatus wijzigen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Afspraakstatus wijzigen</a>
 </dt>
 <dt class="feat-io-ox-core-resourceCalendars">afspraken maken met behulp van de bronkalender, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Afspraken maken met behulp van de bronkalender</a>
 </dt>
@@ -202,13 +202,13 @@
 </dt>
 <dt class="cap-calendar">bijlagen opslaan, <a class="indexterm" href="ox.appsuite.user.sect.calendar.attachments.html">Tonen of opslaan van afspraakbijlagen</a>
 </dt>
-<dt class="cap-calendar">Bijlagen toevoegen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Bijlagen toevoegen</a>
+<dt class="cap-calendar">bijlagen toevoegen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Bijlagen toevoegen</a>
 </dt>
 <dt class="cap-calendar">bijlagen tonen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.attachments.html">Tonen of opslaan van afspraakbijlagen</a>
 </dt>
-<dt class="cap-calendar">conflicten oplossen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">conflicten oplossen</a>
+<dt class="cap-calendar">conflicten oplossen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Conflicten oplossen</a>
 </dt>
-<dt class="cap-calendar">Deelnemers uitnodigen voor een nieuwe afspraak, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Deelnemers uitnodigen voor een nieuwe afspraak</a>
+<dt class="cap-calendar">deelnemers uitnodigen voor een nieuwe afspraak, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Deelnemers uitnodigen voor een nieuwe afspraak</a>
 </dt>
 <dt class="cap-calendar">een vervolg-afspraak maken, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.followup.html">Een vervolgafspraak maken</a>
 </dt>
@@ -220,11 +220,13 @@
 </dt>
 <dt class="">gebruik aftellen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Aftellen gebruiken voor afspraken</a>
 </dt>
+<dt class="feat-io-ox-core-categories">gebruik categorieën, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Categorieën gebruiken voor afspraken</a>
+</dt>
 <dt class="cap-calendar">gebruik de datumkiezer, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.datepicker.html">De datumkiezer gebruiken</a>
 </dt>
 <dt class="cap-calendar">gebruik het planningsoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Het planningsoverzicht gebruiken</a>
 </dt>
-<dt class="cap-calendar">Importeren, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Afspraken importeren</a>
+<dt class="cap-calendar">importeren, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Afspraken importeren</a>
 </dt>
 <dt class="cap-calendar">kleuren, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.appointments.html">Hoe worden afspraken getoond in het agendaoverzicht? </a>
 </dt>
@@ -284,11 +286,11 @@
   </a>
 </dt>
 <dd><dl>
-<dt class="cap-calendar">abonneer op iCal agenda's, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Abonneren op externe agenda's vanuit een iCal url</a>
+<dt class="cap-calendar_google">abonneer op Google agenda's, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Abonneren op Google agenda's</a>
 </dt>
-<dt class="cap-calendar_google">Abonneren op Google agenda's, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Abonneren op Google agenda's</a>
+<dt class="cap-calendar">abonneer op iCal agenda's, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Abonneren op externe agenda's vanuit een iCal url</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Afspraken maken met behulp van de bronkalender, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Afspraken maken met behulp van de bronkalender</a>
+<dt class="feat-io-ox-core-resourceCalendars">afspraken maken met behulp van de bronkalender, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Afspraken maken met behulp van de bronkalender</a>
 </dt>
 <dt class="cap-calendar">agenda's toevoegen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Agenda's toevoegen</a>
 </dt>
@@ -304,19 +306,23 @@
 </dt>
 <dt class="cap-calendar">datumkiezer, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">De datumkiezer</a>
 </dt>
+<dt class="cap-share_links cap-share_mail_attachments">deel, zie delen, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Gegevens Delen</a>
+</dt>
 <dt class="cap-calendar">detailoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.detailview.html">Het Agenda detailoverzicht</a>
 </dt>
+<dt class="feat-io-ox-core-categories">gebruik categorieën, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Categorieën gebruiken voor afspraken</a>
+</dt>
 <dt class="cap-calendar">gebruik het planningsoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Het planningsoverzicht gebruiken</a>
 </dt>
 <dt class="cap-calendar">het Instellingen menu, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">Het Agenda instellingenmenu</a>
 </dt>
-<dt class="cap-calendar">Importeren, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importeren van agenda's vanuit bestanden</a>
+<dt class="cap-calendar">importeren, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importeren van agenda's vanuit bestanden</a>
 </dt>
 <dt class="cap-calendar">instellingen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
-<dt class="cap-calendar">Lijstoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">Het Agenda lijstoverzicht</a>
+<dt class="cap-calendar">lijstoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">Het Agenda lijstoverzicht</a>
 </dt>
-<dt class="cap-calendar">mappenoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Het Agenda mappenoverzicht</a>
+<dt class="cap-calendar">Mappenoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Het Agenda mappenoverzicht</a>
 </dt>
 <dt class="cap-calendar">minikalender, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">De minikalender</a>
 </dt>
@@ -333,18 +339,15 @@
 <dt class="cap-calendar">werkbalk, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">De Agenda werkbalk</a>
 </dt>
 </dl></dd>
-<dt class="cap-share_links cap-share_mail_attachments">agenda</dt>
-<dd><dl><dt class="cap-share_links cap-share_mail_attachments">deel, zie delen, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Gegevens Delen</a>
-</dt></dl></dd>
 <dt class="">Agendainstellingen</dt>
 <dd><dl>
 <dt class="cap-calendar">abonneren op gedeelde agenda's, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
-<dt class="cap-calendar">Afspraakherinneringen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
+<dt class="cap-calendar">afspraakherinneringen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
 <dt class="cap-calendar">automatisch e-mailberichten met aanpassingen in afspraken verwerken in uw agenda, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
-<dt class="">automatisch uitnodigingsberichten verwijderen als de afspraak is geaccepteerd of afgewezen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
+<dt class="">Automatisch uitnodigingsberichten verwijderen als de afspraak is geaccepteerd of afgewezen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
 </dt>
 <dt class="cap-calendar">beschikbaar/bezet zichtbaarheid, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
@@ -354,15 +357,15 @@
 </dt>
 <dt class="cap-portal">geavanceerde instellingen, <a class="indexterm" href="ox.appsuite.user.sect.portal.settings.html">Portaalinstellingen</a>, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Adresboek Instellingen</a>
 </dt>
-<dt class="cap-calendar">gebruik de kleur van de eerste categorie voor afspraken, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
+<dt class="cap-calendar">gebruik de eerste categoriekleur voor afspraken, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
 <dt class="cap-calendar">Jitsi-vergaderingen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
 <dt class="cap-calendar">Markeer alle dagafspraken automatisch als "beschikbaar", <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
-<dt class="">ontvang een e-mailmelding voor u als organisator als een deelnemer accepteert of weigert, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
+<dt class="">Ontvang een e-mailkennisgeving voor u als deelnemer als andere deelnemers accepteren of weigeren, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
 </dt>
-<dt class="">Ontvang een e-mailmeldingen voor u als deelnemer als andere deelnemers accepteren of weigeren, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
+<dt class="">Ontvang een e-mailkennisgeving voor u als organisator als een deelnemer accepteert of weigert, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
 </dt>
 <dt class="">ontvang meldingen als een afspraak waar u deelnemer van bent wordt aangemaakt, aangepast of wordt verwijderd, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
 </dt>
@@ -370,15 +373,15 @@
 </dt>
 <dt class="cap-calendar">timescale, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
-<dt class="cap-calendar">Toon afgewezen afspraken, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
+<dt class="cap-calendar">toon afgewezen afspraken, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
-<dt class="cap-calendar">toon herinnering voor afspraken uit het verleden, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
+<dt class="cap-calendar">toon herinneringen voor afspraken uit het verleden, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
 <dt class="cap-calendar">verjaardagskalender weergeven, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
 <dt class="cap-calendar">werktijd, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
-<dt class="cap-calendar">Werkweek, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
+<dt class="cap-calendar">werkweek, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
 <dt class="cap-calendar">Zoomvergaderingen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
@@ -690,7 +693,7 @@
 <dd><dl>
 <dt class="cap-infostore">bestanden toevoegen, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Bestanden Instellingen</a>
 </dt>
-<dt class="cap-infostore">diapresentatie voor afbeeldingen, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Bestanden Instellingen</a>
+<dt class="cap-infostore">Diapresentatie voor afbeeldingen, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Bestanden Instellingen</a>
 </dt>
 <dt class="cap-infostore">verborgen bestanden en mappen tonen, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Bestanden Instellingen</a>
 </dt>
@@ -715,7 +718,7 @@
 </dt>
 <dt class="cap-multifactor">multifactor-authenticatie, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.html">Multifactor-Authenticatie</a>
 </dt>
-<dt class="cap-guard">Officedocumenten coderen, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office-documenten coderen</a>
+<dt class="cap-guard">Officedocumenten coderen, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Officedocumenten Coderen</a>
 </dt>
 <dt class="">Tonen of afmelden van actieve clients, <a class="indexterm" href="ox.appsuite.user.sect.security.sessions.html">Tonen of afmelden van actieve clients</a>
 </dt>
@@ -745,7 +748,7 @@
 <dd><dl>
 <dt class="cap-contacts">contact, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.attachments.html">Bijlagen toevoegen</a>
 </dt>
-<dt class="cap-webmail">e-mailbericht, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Bijlagen toevoegen</a>
+<dt class="cap-webmail">e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">bijlagen toevoegen</a>
 </dt>
 <dt class="cap-webmail">uit bestaande e-mailberichten, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Bijlagen toevoegen uit bestaande e-mailberichten</a>
 </dt>
@@ -780,7 +783,7 @@
 <dd><dl>
 <dt class="feat-io-ox-core-resourceCalendars">aanmaken, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Een bronagenda en bronagendagroepen aanmaken</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Bronagenda's toevoegen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Een bronagenda en bronagendagroepen aanmaken</a>
+<dt class="feat-io-ox-core-resourceCalendars">bronagenda's toevoegen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Een bronagenda en bronagendagroepen aanmaken</a>
 </dt>
 </dl></dd>
 </dl>
@@ -788,9 +791,20 @@
 <div class="indexdiv">
 <h3>C</h3>
 <dl>
-<dt class="feat-io-ox-core-categories">Categorieën</dt>
-<dd><dl><dt class="feat-io-ox-core-categories">Beheren, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>
+<dt class="feat-io-ox-core-categories">categorieën</dt>
+<dd><dl><dt class="feat-io-ox-core-categories">gebruik voor e-mailberichten, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">PGP inline standaard ingesteld voor nieuwe berichten</a>
 </dt></dl></dd>
+<dt class="feat-io-ox-core-categories">Categorieën</dt>
+<dd><dl>
+<dt class="feat-io-ox-core-categories">Beheren, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>
+</dt>
+<dt class="feat-io-ox-core-categories">gebruik voor afspraken, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Categorieën gebruiken voor afspraken</a>
+</dt>
+<dt class="feat-io-ox-core-categories">gebruik voor taken, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Categorieën gebruiken voor taken</a>
+</dt>
+<dt class="feat-io-ox-core-categories">voor contacten gebruiken, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Categorieën gebruiken voor contacten</a>
+</dt>
+</dl></dd>
 <dt class="cap-infostore">Cloudopslag</dt>
 <dd><dl><dt class="cap-infostore">toon cloudopslag accounts toevoegen, <a class="indexterm" href="ox.appsuite.user.sect.drive.accounts.html">Cloudopslag accounts toevoegen</a>
 </dt></dl></dd>
@@ -810,7 +824,7 @@
 </dt>
 <dt class="cap-guard">nieuwe gecodeerde bestanden aanmaken, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.upload.html">Veilig uploaden van bestanden door het gebruik van codering</a>
 </dt>
-<dt class="cap-guard">Officedocumenten coderen, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office-documenten coderen</a>
+<dt class="cap-guard">Officedocumenten coderen, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Officedocumenten Coderen</a>
 </dt>
 </dl></dd>
 <dt class="cap-contacts">Contacten</dt>
@@ -851,6 +865,8 @@
 </dt>
 <dt class="cap-contacts">exporteren, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.export.html">Contacten exporteren</a>
 </dt>
+<dt class="feat-io-ox-core-categories">gebruik categorieën, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Categorieën gebruiken voor contacten</a>
+</dt>
 <dt class="cap-contacts">importeren in CSV-formaat, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importeren van contacten</a>
 </dt>
 <dt class="cap-contacts">importeren van de vCard-indeling, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importeren van contacten</a>
@@ -945,8 +961,6 @@
 <dt class="cap-share_links cap-share_mail_attachments">verwijder, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.remove.html">Gedeelde elementen verwijderen</a>
 </dt>
 </dl></dd>
-<dt class="">Desktopmeldingen weergeven, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
-</dt>
 <dt class="">detailoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.detailview.html">Het  detailoverzicht</a>
 </dt>
 <dt class="cap-contacts">Distributielijst</dt>
@@ -995,7 +1009,7 @@
 </dt>
 <dt class="cap-webmail">lijstoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.list.html">Het E-mail lijstoverzicht</a>
 </dt>
-<dt class="cap-webmail">mappenoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">Het E-mail mappenoverzicht</a>
+<dt class="cap-webmail">Mappenoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">Het E-mail mappenoverzicht</a>
 </dt>
 <dt class="">meldingsgeluid, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
 </dt>
@@ -1003,9 +1017,11 @@
 </dt>
 <dt class="cap-webmail">pop-up, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.popup.html">De E-mail pop-up</a>
 </dt>
+<dt class="cap-webmail">Postvak-In categorieën balk, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">De Postvak IN-categorieën balk</a>
+</dt>
 <dt class="cap-webmail">schakel functionele e-mailaccounts In of uit, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">In- en uitschakelen van functionele e-mailaccounts</a>
 </dt>
-<dt class="cap-webmail">tabbladenbalk, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">De E-mail tabbladenbalk</a>
+<dt class="cap-infostore">toon bijlagen, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Tonen van e-mailbijlagen in Bestanden</a>
 </dt>
 <dt class="cap-webmail">versturen vanuit uit een adresboek, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Versturen van e-mailberichten vanuit uit een adresboek</a>
 </dt>
@@ -1014,10 +1030,6 @@
 </dl></dd>
 <dt class="cap-webmail">e-mail</dt>
 <dd><dl>
-<dt class="cap-webmail">adressen verzamelen, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Adressen verzamelen</a>
-</dt>
-<dt class="cap-webmail">afdrukken, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">E-mailberichten Afdrukken</a>
-</dt>
 <dt class="cap-webmail">archief, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">E-mailberichten Archiveren</a>
 </dt>
 <dt class="cap-webmail">automatisch doorsturen, <a class="indexterm" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatisch e-mailberichten doorsturen</a>
@@ -1026,19 +1038,11 @@
 </dt>
 <dt class="cap-webmail">Beheren, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a>
 </dt>
-<dt class="cap-webmail cap-switchboard">bel de verzender of een andere ontvanger, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">De verzender of een andere ontvanger bellen</a>
-</dt>
-<dt class="cap-deputy">bewerken, beheren als plaatsvervanger, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">E-mails verzenden of ontvangen als plaatsvervanger</a>
-</dt>
-<dt class="cap-webmail">bijlagen opslaan, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Tonen of opslaan van e-mailbijlagen</a>
-</dt>
-<dt class="cap-webmail">bijlagen toevoegen, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Bijlagen toevoegen</a>
+<dt class="cap-webmail">bijlagen toevoegen, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">bijlagen toevoegen</a>
 </dt>
 <dt class="cap-webmail">bijlagen toevoegen uit bestaande e-mailberichten, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Bijlagen toevoegen uit bestaande e-mailberichten</a>
 </dt>
-<dt class="cap-webmail">bijlagen tonen, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Tonen of opslaan van e-mailbijlagen</a>
-</dt>
-<dt class="cap-infostore">Bijlagen versturen als link, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Bijlagen versturen als link</a>
+<dt class="cap-infostore">bijlagen verzenden als link, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">bijlagen verzenden als link</a>
 </dt>
 <dt class="cap-webmail">categoriseren, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">E-mailberichten Categoriseren</a>
 </dt>
@@ -1048,10 +1052,6 @@
 </dt>
 <dt class="cap-webmail">doorsturen, <a class="indexterm" href="ox.appsuite.user.sect.email.send.forward.html">E-mailberichten doorsturen</a>
 </dt>
-<dt class="cap-webmail">e-mailaccount toevoegen, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">E-mailaccounts toevoegen</a>
-</dt>
-<dt class="cap-webmail">e-mailbron weergeven, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">E-mailbron weergeven</a>
-</dt>
 <dt class="feat-io-ox-core-mailPDFExport">exporteren als PDF, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">E-mailberichten exporteren als PDF</a>
 </dt>
 <dt class="">externe afbeeldingen, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Extern Gekoppelde Afbeeldingen in E-mailberichten</a>
@@ -1060,22 +1060,16 @@
 </dt>
 <dt class="feat-io-ox-core-openai">gebruik AI functies voor antwoorden, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">AI functies gebruiken bij het beantwoorden van e-mailberichten</a>
 </dt>
-<dt class="feat-io-ox-core-openai">gebruik AI functies voor het opstellen van e-mailberichten, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">AI functies gebruiken bij het opstellen van e-mailberichten</a>
-</dt>
 <dt class="feat-io-ox-core-openai">gebruik AI integratie, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">De AI integratie gebruiken</a>
 </dt>
-<dt class="cap-webmail">gebruik ondertekeningen, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Ondertekeningen gebruiken</a>
-</dt>
-<dt class="feat-io-ox-core-templates">gebruik sjablonen, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Sjablonen gebruiken</a>
-</dt>
 <dt class="cap-tasks">herinnering aanmaken, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.reminder.html">E-mailherinneringen aanmaken</a>
 </dt>
+<dt class="cap-webmail">Herstellen, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">E-mailberichten herstellen</a>
+</dt>
 <dt class="cap-webmail">importeren van EML:, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">E-mailberichten importeren</a>
 </dt>
 <dt class="cap-guard">inkomende e-mailberichten coderen, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Inkomende e-mailberichten coderen met de hulp van een filterregel</a>
 </dt>
-<dt class="cap-webmail">instellingen, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
-</dt>
 <dt class="cap-webmail">kleur toewijzen, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">E-mailberichten Categoriseren</a>
 </dt>
 <dt class="cap-webmail">kopiëren, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Verplaatsen of kopiëren van e-mailberichten</a>
@@ -1090,15 +1084,13 @@
 </dt>
 <dt class="cap-webmail">markeren als gelezen, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Markeren van e-mailberichten als gelezen of ongelezen</a>
 </dt>
-<dt class="cap-webmail">markeren als gelezen, instelling voor, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
-</dt>
 <dt class="cap-webmail">markeren als ongelezen, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Markeren van e-mailberichten als gelezen of ongelezen</a>
 </dt>
 <dt class="cap-webmail">opslaan als EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">E-mailberichten opslaan</a>
 </dt>
 <dt class="cap-webmail">Postvak IN-categorieën, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Werken met Postvak IN-categorieën</a>
 </dt>
-<dt class="cap-webmail">selecteer een afzenderadres, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">Een afzenderadres selecteren</a>
+<dt class="cap-webmail">selecteer een verzendadres, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">selecteer een verzendadres</a>
 </dt>
 <dt class="cap-webmail">stel antwoordadres in, <a class="indexterm" href="ox.appsuite.user.sect.email.send.replyto.html">Antwoordadres instellen</a>
 </dt>
@@ -1110,23 +1102,21 @@
 </dt>
 <dt class="cap-guard">toon Autocrypt-sleutels, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Autocrypt-sleutels beheren</a>
 </dt>
-<dt class="cap-infostore">toon bijlagen, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Tonen van e-mailbijlagen in Bestanden</a>
-</dt>
 <dt class="cap-webmail">verplaatsen, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Verplaatsen of kopiëren van e-mailberichten</a>
 </dt>
 <dt class="cap-webmail">verstuur een afwezigheidsmelding, <a class="indexterm" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Verstuur een automatische afwezigheidsmelding</a>
 </dt>
 <dt class="cap-guard">verwijder Autocrypt-sleutels, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Autocrypt-sleutels beheren</a>
 </dt>
+<dt class="cap-dumpster">verwijderde e-mailberichten herstellen, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Verwijderde e-mailberichten herstellen</a>
+</dt>
 <dt class="cap-webmail">verwijderen, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">E-mailberichten verwijderen</a>
 </dt>
-<dt class="cap-webmail">verzamelde e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Verzamelde Mail gebruiken</a>
+<dt class="cap-webmail">Verzamelde Mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Verzamelde Mail gebruiken</a>
 </dt>
 <dt class="cap-guard">verzend gecodeerde e-mailberichten, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Gecodeerde e-mailberichten verzenden</a>
 </dt>
-<dt class="cap-webmail">verzenden, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a>
-</dt>
-<dt class="cap-deputy">verzenden als plaatsvervanger, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">E-mails verzenden of ontvangen als plaatsvervanger</a>
+<dt class="cap-webmail">verzenden, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a>
 </dt>
 <dt class="cap-webmail">zoeken, <a class="indexterm" href="ox.appsuite.user.sect.email.search.html">Zoeken naar E-mailberichten</a>
 </dt>
@@ -1138,6 +1128,41 @@
     
   </a>
 </dt>
+<dt class="cap-webmail">E-mailberichten</dt>
+<dd><dl>
+<dt class="cap-webmail">adressen verzamelen, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Adressen verzamelen</a>
+</dt>
+<dt class="cap-webmail">afdrukken, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">E-mailberichten Afdrukken</a>
+</dt>
+<dt class="cap-webmail cap-switchboard">bel de verzender of een andere ontvanger, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">De verzender of een andere ontvanger bellen</a>
+</dt>
+<dt class="cap-deputy">bewerken, beheren als plaatsvervanger, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">E-mails verzenden of ontvangen als plaatsvervanger</a>
+</dt>
+<dt class="cap-webmail">bijlagen opslaan, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Tonen of opslaan van e-mailbijlagen</a>
+</dt>
+<dt class="cap-webmail">bijlagen tonen, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Tonen of opslaan van e-mailbijlagen</a>
+</dt>
+<dt class="feat-io-ox-core-categories">categorieën gebruiken, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">PGP inline standaard ingesteld voor nieuwe berichten</a>
+</dt>
+<dt class="cap-webmail">e-mailaccount toevoegen, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">E-mailaccounts toevoegen</a>
+</dt>
+<dt class="cap-webmail">e-mailbron weergeven, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">E-mailbron weergeven</a>
+</dt>
+<dt class="feat-io-ox-core-openai">gebruik AI functies voor het opstellen van e-mailberichten, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">AI functies gebruiken bij het opstellen van e-mailberichten</a>
+</dt>
+<dt class="cap-webmail">gebruik ondertekeningen, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Ondertekeningen gebruiken</a>
+</dt>
+<dt class="feat-io-ox-core-templates">gebruik sjablonen, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Sjablonen gebruiken</a>
+</dt>
+<dt class="cap-webmail">instellingen, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
+</dt>
+<dt class="cap-webmail">markeren als gelezen, instelling voor, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
+</dt>
+<dt class="cap-webmail">permanent verwijderen, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-mailberichten verwijderen</a>
+</dt>
+<dt class="cap-deputy">verzenden als plaatsvervanger, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">E-mails verzenden of ontvangen als plaatsvervanger</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">E-mailfilters, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">E-mailfilters gebruiken</a>
 </dt>
 <dd><dl>
@@ -1170,21 +1195,19 @@
 </dt>
 <dt class="cap-webmail">automatisch e-mailberichten sturen naar BCC, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
-<dt class="cap-webmail">berichtenlijst, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
-</dt>
-<dt class="cap-webmail">berichtformaat, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
+<dt class="cap-webmail">Berichtenlijst, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
 <dt class="cap-webmail">berichtgrootte tonen, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
+<dt class="cap-webmail">berichtindeling, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
+</dt>
 <dt class="cap-webmail">bevestiging vragen voordat u op een mailinglijst reageert, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
 <dt class="cap-webmail">Datum en tijd tonen, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
 <dt class="cap-webmail">de oorspronkelijke e-mailtekst in een antwoord invoegen, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
-<dt class="cap-webmail">e-mails doorsturen als, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
-</dt>
-<dt class="cap-webmail">geef geciteerde tekst weer in een andere kleur, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
+<dt class="cap-webmail">E-mails doorsturen als, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
 <dt class="cap-webmail">HTML geformatteerde e-mailberichten toestaan, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
@@ -1206,15 +1229,19 @@
 </dt>
 <dt class="cap-webmail">tekstvoorbeeld tonen, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
+<dt class="cap-webmail">toon categorieën, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
+</dt>
+<dt class="cap-webmail">toon geciteerde tekst in een andere kleur, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
+</dt>
 <dt class="cap-webmail">toon mappen met alle gemarkeerde berichten, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
 <dt class="cap-webmail">toon mappen met alle ongelezen berichten, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
-<dt class="cap-webmail">toon verzoeken om leesbevestigingen, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
+<dt class="cap-webmail">Toon verzoeken om ontvangstbevestigingen, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
 <dt class="cap-webmail">vCard toevoegen, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
-<dt class="cap-webmail">verwijderde e-mailberichten permanent wissen, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
+<dt class="cap-webmail">Verwijderde e-mailberichten permanent wissen, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
 <dt class="cap-webmail">verzenden ongedaan maken, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
@@ -1267,6 +1294,8 @@
 <dl>
 <dt class="feat-io-ox-core-navigation">Gebruik browserknoppen, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.browserbuttons.html">Browserknoppen gebruiken</a>
 </dt>
+<dt class="">gebruik het meldingengebied, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">gebruik het meldingengebied</a>
+</dt>
 <dt class="cap-calendar">Gebruik het planningsoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Het planningsoverzicht gebruiken</a>
 </dt>
 <dt class="cap-webmail">Gebruik ondertekeningen, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Ondertekeningen gebruiken</a>
@@ -1275,8 +1304,6 @@
 </dt>
 <dt class="feat-io-ox-core-templates">Gebruik sjablonen, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Sjablonen gebruiken</a>
 </dt>
-<dt class="">Gebruik van het meldingengebied, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Gebruik het meldingengebied</a>
-</dt>
 <dt class="">Gebruikersinterface</dt>
 <dd><dl>
 <dt class="">algemene beschrijving, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.html">Algemene Beschrijving van de gebruikersinterface</a>
@@ -1354,10 +1381,12 @@
 <dd><dl>
 <dt class="cap-guard">afmelden, <a class="indexterm" href="ox.appsuite.user.sect.guard.logout.html">Afmelden uit Guard</a>
 </dt>
-<dt class="cap-guard">Autocrypt sleutels importeren, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Autocrypt sleutels importeren</a>
-</dt>
 <dt class="cap-guard">Autocrypt-sleutels overdragen naar andere clients, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Autocrypt-sleutels overdragen naar andere clients</a>
 </dt>
+<dt class="cap-guard">beheer PGP sleutels van ontvangers, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">PGP sleutels van ontvangers beheren</a>
+</dt>
+<dt class="cap-guard">beheer S/MIME sleutels van ontvangers, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">S/MIME sleutels van ontvangers beheren</a>
+</dt>
 <dt class="cap-guard">bestandscodering, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.html">Bestanden Coderen of Decoderen</a>, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.encrypt.html">Bestanden coderen</a>
 </dt>
 <dt class="cap-guard">controleer Autocrypt-sleutels, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Autocrypt-sleutels beheren</a>
@@ -1376,7 +1405,9 @@
 </dt>
 <dt class="cap-guard">geselecteerde documenten opslaan in een gecodeerd formaat, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Geselecteerde documenten opslaan in een gecodeerd formaat</a>
 </dt>
-<dt class="cap-guard">het wachtwoord herstellen, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a>
+<dt class="cap-guard">herstel het wachtwoord, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">Herstel het wachtwoord</a>
+</dt>
+<dt class="cap-guard">importeer Autocrypt-sleutels, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Autocrypt sleutels importeren</a>
 </dt>
 <dt class="cap-guard">inkomende e-mailberichten coderen, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Inkomende e-mailberichten coderen met de hulp van een filterregel</a>
 </dt>
@@ -1390,51 +1421,60 @@
 </dt>
 <dt class="cap-guard">nieuwe gecodeerde bestanden aanmaken, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.upload.html">Veilig uploaden van bestanden door het gebruik van codering</a>
 </dt>
-<dt class="cap-guard">Office document codering, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office-documenten coderen</a>
+<dt class="cap-guard">Office document codering, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Officedocumenten Coderen</a>
 </dt>
 <dt class="cap-guard">open gecodeerde bestanden, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.open.html">Gecodeerde bestanden openen</a>
 </dt>
 <dt class="cap-guard">open gecodeerde documenten, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.open.html">Gecodeerde documenten openen</a>
 </dt>
-<dt class="cap-guard">publieke sleutels beheren, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Publieke sleutels beheren</a>
-</dt>
-<dt class="cap-guard">sleutelbeheer, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a>
+<dt class="cap-guard">Sleutelbeheer, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a>
 </dt>
 <dt class="cap-guard">toon Autocrypt-sleutels, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Autocrypt-sleutels beheren</a>
 </dt>
 <dt class="cap-guard">verwijder Autocrypt-sleutels, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Autocrypt-sleutels beheren</a>
 </dt>
+<dt class="cap-guard">verwijder de wachtwoordherstelfunctie, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">De wachtwoordherstelfunctie verwijderen</a>
+</dt>
 <dt class="cap-guard">verzend gecodeerde e-mailberichten, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Gecodeerde e-mailberichten verzenden</a>
 </dt>
-<dt class="cap-guard">wachtwoord wijzigen, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a>
+<dt class="cap-guard">wachtwoord wijzigen, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Het wachtwoord wijzigen</a>
 </dt>
 <dt class="cap-guard">wachtwoordbeheer, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a>
 </dt>
 </dl></dd>
 <dt class="cap-guard">Guard beveiligingsinstellingen</dt>
-<dd><dl><dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="cap-guard">Autocrypt instelling, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
+</dt>
+<dt class="cap-guard">E-mail cache instelling, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
+</dt>
+<dt class="cap-guard">opties herstellen, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
+</dt>
+<dt class="cap-guard">toon geavanceerde instellingen bij het opstellen van een e-mailbericht, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
+</dt>
+</dl></dd>
 <dt class="cap-guard">Guardbeveiligingsinstellingen</dt>
 <dd><dl>
-<dt class="cap-guard">geavanceerde instellingen, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
+<dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
 </dt>
 <dt class="cap-guard">Onthoud standaard wachtwoord, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
 </dt>
 <dt class="cap-guard">PGP inline standaard ingesteld voor nieuwe berichten, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
 </dt>
-<dt class="cap-guard">S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
-</dt>
 <dt class="cap-guard">standaard bij het opstellen van gecodeerde e-mailberichten, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
 </dt>
 <dt class="cap-guard">Standaard ondertekening toevoegen aan uitgaande e-mailberichten, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
 </dt>
 </dl></dd>
+<dt class="cap-guard">GuardInstellingen</dt>
+<dd><dl><dt class="cap-guard">opties voor samenstellen, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
+</dt></dl></dd>
 </dl>
 </div>
 <div class="indexdiv">
 <h3>H</h3>
 <dl>
-<dt class="cap-webmail cap-calendar cap-tasks">halo overzicht, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Contacten tonen in het halo overzicht</a>
+<dt class="cap-webmail cap-calendar cap-tasks">Halo overzicht, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Contacten tonen in het halo overzicht</a>
 </dt>
 <dt class="">halo overzicht, zie pop-up, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.popup.html">De pop-up</a>
 </dt>
@@ -1445,6 +1485,13 @@
 <dt class="">map, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Hernoemen van een map</a>
 </dt>
 </dl></dd>
+<dt class="cap-webmail">Herstellen</dt>
+<dd><dl>
+<dt class="cap-webmail">e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">E-mailberichten herstellen</a>
+</dt>
+<dt class="cap-dumpster">permanent verwijderde e-mailberichten, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Verwijderde e-mailberichten herstellen</a>
+</dt>
+</dl></dd>
 <dt class="">hoofdgebied, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.content.html">Het hoofdgebied</a>
 </dt>
 </dl>
@@ -1466,19 +1513,17 @@
 </dt>
 </dl></dd>
 <dt class="cap-webmail">importeren</dt>
+<dd><dl><dt class="cap-webmail">e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">E-mailberichten importeren</a>
+</dt></dl></dd>
+<dt class="cap-calendar">Importeren</dt>
 <dd><dl>
+<dt class="cap-calendar">afspraken, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Afspraken importeren</a>
+</dt>
 <dt class="cap-contacts">contacten in CSV formaat, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importeren van contacten</a>
 </dt>
 <dt class="cap-contacts">contacten in vCard-indeling, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importeren van contacten</a>
 </dt>
-<dt class="cap-webmail">E-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">E-mailberichten importeren</a>
-</dt>
-</dl></dd>
-<dt class="cap-calendar">Importeren</dt>
-<dd><dl>
-<dt class="cap-calendar">afspraken, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Afspraken importeren</a>
-</dt>
-<dt class="cap-calendar">Agenda, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importeren van agenda's vanuit bestanden</a>
+<dt class="cap-calendar">kalender, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importeren van agenda's vanuit bestanden</a>
 </dt>
 <dt class="cap-tasks">taken, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importeren van taken</a>
 </dt>
@@ -1498,24 +1543,26 @@
 </dt>
 <dt class="">algemene instellingen, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Algemene instellingen aanpassen</a>
 </dt>
-<dt class="">configureer lokale apps met een wizard, <a class="indexterm" href="ox.appsuite.user.sect.settings.wizard.html">Gebruik een Wizard om Lokale Apps te Configureren</a>
-</dt>
-<dt class="cap-contacts">contacten, zie adresboekinstellingen, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Adresboek Instellingen</a>
-</dt>
-<dt class="cap-webmail">e-mailbericht, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
+<dt class="cap-deputy">beheer vertegenwoordigers, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">beheer vertegenwoordigers</a>
 </dt>
-<dt class="cap-guard">
-        Guard
+<dt class="cap-infostore">
+        Bestanden
         
         
         
-      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
+      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Bestanden Instellingen</a>
+</dt>
+<dt class="">configureer lokale apps met een wizard, <a class="indexterm" href="ox.appsuite.user.sect.settings.wizard.html">Gebruik een Wizard om Lokale Apps te Configureren</a>
+</dt>
+<dt class="cap-contacts">contacten, zie adresboekinstellingen, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Adresboek Instellingen</a>
+</dt>
+<dt class="cap-webmail">e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
 </dt>
 <dt class="cap-calendar">kalender, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
 <dt class="">meldingen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
 </dt>
-<dt class="">Persoonlijke contactgegevens, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Persoonlijke Contactgegevens wijzigen</a>
+<dt class="">persoonlijke contactgegevens, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Persoonlijke Contactgegevens wijzigen</a>
 </dt>
 <dt class="cap-dataexport">persoonlijke gegevens downloaden, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Persoonlijke Gegevens Downloaden</a>
 </dt>
@@ -1523,20 +1570,18 @@
 </dt>
 <dt class="cap-switchboard">stel de presentiestatus in, <a class="indexterm" href="ox.appsuite.user.sect.settings.presencestatus.html">De presentiestatus instellen</a>
 </dt>
-<dt class="cap-deputy">vertegenwoordigers beheren, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vertegenwoordigers beheren</a>
-</dt>
 <dt class="">wachtwoord wijzigen, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.changepassword.html">Het Wachtwoord wijzigen</a>
 </dt>
 <dt class="">zoeken, <a class="indexterm" href="ox.appsuite.user.sect.settings.search.html">Zoeken naar instellingen</a>
 </dt>
 </dl></dd>
-<dt class="cap-infostore">instellingen</dt>
-<dd><dl><dt class="cap-infostore">
-        Bestanden
+<dt class="cap-guard">instellingen</dt>
+<dd><dl><dt class="cap-guard">
+        Guard
         
         
         
-      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Bestanden Instellingen</a>
+      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardInstellingen</a>
 </dt></dl></dd>
 </dl>
 </div>
@@ -1551,13 +1596,13 @@
 </dt>
 <dt class="cap-webmail cap-switchboard">bel de verzender of een andere ontvanger, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">De verzender of een andere ontvanger bellen</a>
 </dt>
-<dt class="cap-contacts cap-switchboard">Contactpersonen bellen, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Contactpersonen bellen</a>
+<dt class="cap-contacts cap-switchboard">contactpersonen bellen, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Contactpersonen bellen</a>
 </dt>
 <dt class="cap-tasks cap-switchboard">taakdeelnemer bellen, <a class="indexterm" href="ox.appsuite.user.sect.tasks.call.html">Taakdeelnemer bellen</a>
 </dt>
 </dl></dd>
 <dt class="cap-calendar">Jitsi-instellingen</dt>
-<dd><dl><dt class="cap-calendar">Link automatisch naar locatie kopiëren, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
+<dd><dl><dt class="cap-calendar">automatisch de link naar de locatie sturen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt></dl></dd>
 </dl>
 </div>
@@ -1607,7 +1652,7 @@
 </dt>
 <dt class="">gedeelde mappen, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.kind.html">Wat zijn maptypen?</a>
 </dt>
-<dt class="">Hernoemen, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Hernoemen van een map</a>
+<dt class="">hernoemen, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Hernoemen van een map</a>
 </dt>
 <dt class="cap-infostore">inhoud downloaden, <a class="indexterm" href="ox.appsuite.user.sect.drive.download.html">Bestanden of Mapinhoud downloaden</a>
 </dt>
@@ -1632,7 +1677,7 @@
 </dl></dd>
 <dt class="">Mappen structuur</dt>
 <dd><dl>
-<dt class="">Favorieten, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Mappen toevoegen aan favorieten</a>
+<dt class="">favorieten, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Mappen toevoegen aan favorieten</a>
 </dt>
 <dt class="">navigeren, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Navigeren binnen de mappenstructuur</a>
 </dt>
@@ -1641,8 +1686,9 @@
 </dl></dd>
 <dt class="">mappenoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.foldertree.html">Het mappenoverzicht</a>
 </dt>
+<dt class="">Mappenoverzicht</dt>
 <dd><dl>
-<dt class="">Favorieten, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Mappen toevoegen aan favorieten</a>
+<dt class="">favorieten, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Mappen toevoegen aan favorieten</a>
 </dt>
 <dt class="">openen, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Navigeren binnen de mappenstructuur</a>
 </dt>
@@ -1654,16 +1700,18 @@
 <dt class="">meldingen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
 </dt>
 <dd><dl>
-<dt class="">Aftellen gebruiken voor afspraken, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Aftellen gebruiken voor afspraken</a>
-</dt>
-<dt class="">Gebruik het meldingengebied, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Gebruik het meldingengebied</a>
+<dt class="">gebruik het meldingengebied, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">gebruik het meldingengebied</a>
 </dt>
 <dt class="">Open meldingengebied automatisch, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
 </dt>
 </dl></dd>
 <dt class="">Meldingen</dt>
-<dd><dl><dt class="">toon desktopmeldingen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="">aftellen gebruiken voor afspraken, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Aftellen gebruiken voor afspraken</a>
+</dt>
+<dt class="">toon desktopkennisgevingen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
+</dt>
+</dl></dd>
 <dt class="">Meldingengebied, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.notificationarea.html">Het meldingengebied</a>
 </dt>
 <dt class="">Menubalk, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.menubar.html">De menu balk</a>
@@ -1691,20 +1739,20 @@
 </dt>
 <dt class="cap-calendar">afspraken, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.create.html">Nieuwe afspraken maken</a>
 </dt>
-<dt class="cap-calendar">Agenda, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Agenda's toevoegen</a>
-</dt>
 <dt class="cap-infostore">Bestanden mappen, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.html">Bestanden: Mappen aanmaken</a>, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.personal.html">Bestanden: Mappen aanmaken</a>
 </dt>
 <dt class="cap-contacts">contact, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.create.html">Nieuw contact aanmaken</a>
 </dt>
 <dt class="cap-contacts">distributielijst, <a class="indexterm" href="ox.appsuite.user.sect.contacts.distributionlist.html">Distributielijsten Toevoegen</a>
 </dt>
-<dt class="cap-webmail">e-mailbericht, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a>
+<dt class="cap-webmail">e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a>
 </dt>
-<dt class="cap-webmail">E-mailmappen, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">E-mailmappen toevoegen</a>
+<dt class="cap-webmail">e-mailmappen, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">E-mailmappen toevoegen</a>
 </dt>
 <dt class="cap-guard">gecodeerde bestanden aanmaken, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.upload.html">Veilig uploaden van bestanden door het gebruik van codering</a>
 </dt>
+<dt class="cap-calendar">kalender, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Agenda's toevoegen</a>
+</dt>
 <dt class="cap-guard">maak gecodeerde bestanden aan, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.createencrypted.html">Nieuwe gecodeerde bestanden aanmaken</a>
 </dt>
 <dt class="cap-contacts">persoonlijk adresboek, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.personal.html">Persoonlijke adresboeken toevoegen</a>
@@ -1728,7 +1776,7 @@
 </div>
 <div class="indexdiv">
 <h3>O</h3>
-<dl><dt class="cap-guard">Officedocumenten coderen, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office-documenten coderen</a>
+<dl><dt class="cap-guard">Officedocumenten coderen, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Officedocumenten Coderen</a>
 </dt></dl>
 </div>
 <div class="indexdiv">
@@ -1823,18 +1871,21 @@
 <div class="indexdiv">
 <h3>R</h3>
 <dl>
-<dt class="">rechten</dt>
+<dt class="">Rechten</dt>
 <dd><dl>
 <dt class="cap-share_links cap-share_mail_attachments">applicatie, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Welke rechten kunnen worden gebruikt?</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">auteur, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Welke rechten kunnen worden gebruikt?</a>
-</dt>
 <dt class="cap-share_links cap-share_mail_attachments">beheerder, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Welke rechten kunnen worden gebruikt?</a>
 </dt>
 <dt class="">definitie, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">Wat is het doel van rechten?</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">lezer, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Welke rechten kunnen worden gebruikt?</a>
 </dt>
+</dl></dd>
+<dt class="cap-share_links cap-share_mail_attachments">rechten</dt>
+<dd><dl>
+<dt class="cap-share_links cap-share_mail_attachments">auteur, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Welke rechten kunnen worden gebruikt?</a>
+</dt>
 <dt class="cap-share_links cap-share_mail_attachments">reviewer, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Welke rechten kunnen worden gebruikt?</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">voorbeelden, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">Gebruiksvoorbeelden van rechten</a>
@@ -1903,6 +1954,8 @@
 </dt>
 <dt class="cap-tasks">exporteren, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.export.html">Taken exporteren</a>
 </dt>
+<dt class="feat-io-ox-core-categories">gebruik categorieën, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Categorieën gebruiken voor taken</a>
+</dt>
 <dt class="cap-tasks">het instellingen menu, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.settingsmenu.html">Het Taken instellingenmenu</a>
 </dt>
 <dt class="cap-tasks">importeer, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importeren van taken</a>
@@ -1911,7 +1964,7 @@
 </dt>
 <dt class="cap-tasks">maak terugkerende taak aan, <a class="indexterm" href="ox.appsuite.user.sect.tasks.add.serial.html">Terugkerende taak aanmaken</a>
 </dt>
-<dt class="cap-tasks">mappenoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">Het Taken mappenoverzicht</a>
+<dt class="cap-tasks">Mappenoverzicht, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">Het Taken mappenoverzicht</a>
 </dt>
 <dt class="cap-tasks">markeer als voltooid, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Taken markeren als voltooid</a>
 </dt>
@@ -1950,7 +2003,7 @@
 <dd><dl>
 <dt class="cap-calendar cap-switchboard">bel de deelnemers van de afspraak, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Afspraakdeelnemers bellen</a>
 </dt>
-<dt class="cap-contacts cap-switchboard">Contactpersonen bellen, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Contactpersonen bellen</a>
+<dt class="cap-contacts cap-switchboard">contactpersonen bellen, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Contactpersonen bellen</a>
 </dt>
 <dt class="cap-tasks cap-switchboard">taakdeelnemer bellen, <a class="indexterm" href="ox.appsuite.user.sect.tasks.call.html">Taakdeelnemer bellen</a>
 </dt>
@@ -1990,6 +2043,8 @@
 </dl></dd>
 <dt class="">Tonen of afmelden van actieve clients, <a class="indexterm" href="ox.appsuite.user.sect.security.sessions.html">Tonen of afmelden van actieve clients</a>
 </dt>
+<dt class="">Toon desktopkennisgevingen, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a>
+</dt>
 </dl>
 </div>
 <div class="indexdiv">
@@ -2023,7 +2078,7 @@
 </dt></dl></dd>
 <dt class="cap-deputy">Vertegenwoordiger</dt>
 <dd><dl>
-<dt class="cap-deputy">Beheren, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vertegenwoordigers beheren</a>
+<dt class="cap-deputy">Beheren, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">beheer vertegenwoordigers</a>
 </dt>
 <dt class="cap-deputy">bewerken, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">vertegenwoordigers bekijken, bewerken, verwijderen</a>
 </dt>
@@ -2044,17 +2099,17 @@
 </dt>
 <dt class="cap-contacts">contacten, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.delete.html">Contacten verwijderen</a>
 </dt>
-<dt class="cap-webmail">E-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">E-mailberichten verwijderen</a>
+<dt class="cap-webmail">e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">E-mailberichten verwijderen</a>, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-mailberichten verwijderen</a>
 </dt>
 <dt class="">map, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.delete.html">Mappen wissen</a>
 </dt>
 <dt class="cap-tasks">taken, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.delete.html">Taken verwijderen</a>
 </dt>
 </dl></dd>
-<dt class="cap-webmail">verzamelde e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Verzamelde Mail gebruiken</a>
+<dt class="cap-webmail">Verzamelde Mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Verzamelde Mail gebruiken</a>
 </dt>
 <dt class="cap-webmail">Verzenden</dt>
-<dd><dl><dt class="cap-webmail">e-mailbericht, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a>
+<dd><dl><dt class="cap-webmail">e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a>
 </dt></dl></dd>
 <dt class="cap-webmail">Verzetten</dt>
 <dd><dl>
@@ -2093,9 +2148,9 @@
 <dd><dl>
 <dt class="">Applicatie wachtwoorden gebruiken, <a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">Applicatie wachtwoorden gebruiken</a>
 </dt>
-<dt class="cap-guard">Guard wachtwoord herstellen, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a>
+<dt class="cap-guard">Guard wachtwoord herstellen, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">Herstel het wachtwoord</a>
 </dt>
-<dt class="cap-guard">Guard wachtwoord veranderen, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a>
+<dt class="cap-guard">Guard wachtwoord veranderen, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Het wachtwoord wijzigen</a>
 </dt>
 <dt class="">wijzigen, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.changepassword.html">Het Wachtwoord wijzigen</a>
 </dt>
@@ -2178,7 +2233,7 @@
 </dt>
 <dt class="cap-webmail cap-switchboard">bel de verzender of een andere ontvanger, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">De verzender of een andere ontvanger bellen</a>
 </dt>
-<dt class="cap-contacts cap-switchboard">Contactpersonen bellen, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Contactpersonen bellen</a>
+<dt class="cap-contacts cap-switchboard">contactpersonen bellen, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">Contactpersonen bellen</a>
 </dt>
 <dt class="cap-tasks cap-switchboard">taakdeelnemer bellen, <a class="indexterm" href="ox.appsuite.user.sect.tasks.call.html">Taakdeelnemer bellen</a>
 </dt>
@@ -2187,9 +2242,9 @@
 <dd><dl>
 <dt class="cap-calendar">altijd een willekeurig vergaderingswachtwoord toevoegen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
-<dt class="cap-calendar">Kopieer inbelinformatie naar beschrijving, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
+<dt class="cap-calendar">automatisch de link naar de locatie sturen, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
-<dt class="cap-calendar">Link automatisch naar locatie kopiëren, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
+<dt class="cap-calendar">kopieer inbelgegevens naar de omschrijving, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Agendainstellingen</a>
 </dt>
 </dl></dd>
 </dl>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.about.glossary.html b/help/l10n/nl_NL/ox.appsuite.user.sect.about.glossary.html
index d3f58ae43..59c982b7f 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.about.glossary.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.about.glossary.html
@@ -72,8 +72,8 @@
 </dd>
 <dt class="feat-io-ox-core-categories" id="ox.appsuite.user.reference.about.glossary.categories"><span class="glossterm">Categorieën</span></dt>
 <dd class="glossdef feat-io-ox-core-categories">
-<p role="presentation">Categorieën kunnen worden gebruikt om afspraken, contacten en taken te classificeren. Op die manier kunnen semantisch gerelateerde objecten worden geïdentificeerd en gemakkelijk worden gevonden. Afhankelijk van de configuratie zijn specifieke categorieën vooraf gedefinieerd. U kunt uw eigen categorieën instellen.</p>
-<p role="presentation">Opmerking: deze categorieën kunnen niet worden gebruikt voor e-mails. Voor e-mails zijn er Postvak IN-tabbladen.</p>
+<p role="presentation">Categorieën kunnen worden gebruikt om afspraken, contacten en taken te organiseren buiten de apps om, onafhankelijk van de mapstructuur. Op deze manier kunnen logisch gerelateerde objecten worden geïdentificeerd en gemakkelijk worden terug gevonden, bijvoorbeeld alle e-mails, afspraken, contacten en taken van een specifieke klant of project. Afhankelijk van de configuratie zijn specifieke categorieën vooraf gedefinieerd. U kunt ook uw eigen categorieën instellen.</p>
+<p role="presentation">Opmerking: Voor e-mailberichten kan u ook Postvak-In tabbladen gebruiken.</p>
 <p role="presentation">Gerelateerde onderwerpen: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a></p></li></ul></p>
 </dd>
 <dt id="ox.appsuite.user.reference.about.glossary.participant"><span class="glossterm">Deelnemer</span></dt>
@@ -185,16 +185,16 @@
 <li class="listitem"><p role="presentation">plannen, bewerken en organiseren van afspraken voor een andere gebruiker</p></li>
 </ul></p>
 <p role="presentation">Gerelateerde onderwerpen: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vertegenwoordigers beheren</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">beheer vertegenwoordigers</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">E-mails verzenden of ontvangen als plaatsvervanger</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Afspraken maken, bewerken of beheren als plaatsvervanger</a></p>
 </li></ul></p>
 </dd>
-<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Postvak IN-tabbladen</span></dt>
+<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Postvak-In categorieën</span></dt>
 <dd class="glossdef cap-webmail">
 <p role="presentation">Postvak IN-tabbladen bieden een eenvoudige manier om de <span class="guilabel"><strong>Postvak In</strong></span> map netjes te houden. Met tabbladen worden inkomende e-mails per afzender gescheiden opgeslagen in de map <span class="guilabel"><strong>Postvak In</strong></span>. Afhankelijk van de configuratie zijn specifieke categorieën voorgedefinieerd. U kunt extra tabbladen instellen op basis van uw behoeften.</p>
 <p role="presentation">De Postvak-IN tabbladen kunnen alleen gebruikt worden in de <span class="guilabel"><strong>Postvak In</strong></span> map. Als u meer opslagopties nodig heeft, gebruikt u het mappenoverzicht om e-mailmappen te maken.</p>
-<p role="presentation" class="feat-io-ox-core-categories">Opmerking: de hier beschreven Postvak IN-tabbladen kunnen alleen voor e-mails worden gebruikt. Afhankelijk van de configuratie kunt u aparte categorieën gebruiken voor afspraken, contacten en taken.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Opmerking: De hier beschreven Postvak IN-categorieën kunnen alleen voor e-mails worden gebruikt. Afhankelijk van de configuratie kunt u aparte categorieën gebruiken voor afspraken, contacten en taken.</p>
 <p role="presentation">Gerelateerde onderwerpen: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Werken met Postvak IN-categorieën</a></p></li></ul></p>
 </dd>
 <dt id="ox.appsuite.user.reference.about.glossary.session"><span class="glossterm">Sessie</span></dt>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.alarms.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.alarms.html
index 1155411ac..9f78050a2 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.alarms.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.alarms.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.display.html" title="Een afsprakenoverzicht instellen">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Deelnemers of bronnen toevoegen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.alarms">
 <div class="titlepage"><div><div><h3 class="title">Afspraakherinneringen gebruiken</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.12.2"></a><p id="ox.appsuite.user.concept.calendar.add.alarms">Als u een afspraak maakt of bewerkt kan u instellen of u een herinnering wil krijgen over de vervaldatum van de afspraak. Om dit te doen kan u één of meerdere meldingen gebruiken: </p>
@@ -65,7 +65,7 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Afspraakherinneringen aanpassen</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.alarms">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.alarms">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.attachments.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.attachments.html
index 69bb96451..26e0e9366 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.attachments.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.attachments.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Deelnemers of bronnen toevoegen">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Het planningsoverzicht gebruiken">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attachments">
 <div class="titlepage"><div><div><h3 class="title">Bijlagen toevoegen</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.14.2"></a><a class="indexterm" name="id-1.8.10.14.3"></a><p id="ox.appsuite.user.concept.calendar.add.attachments">Afhankelijk van de instellingen, kan u bestanden bijvoegen die op uw computer of in de <span class="phrase">Bestanden</span> app opgeslagen zijn.</p>
@@ -65,7 +65,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.attachments">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attachments">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.attendees.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.attendees.html
index 9a2b88edf..055063823 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.attendees.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Een vervolgafspraak maken">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="E-mailontvangers uitnodigen van voor een nieuwe afspraak">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attendees">
 <div class="titlepage"><div><div><h3 class="title">Deelnemers uitnodigen voor een nieuwe afspraak</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.17.2"></a><p id="ox.appsuite.user.concept.calendar.add.attendees">Als een afspraak meerdere deelnemers heeft, kan u deze uitnodigingen voor een nieuwe afspraak.</p>
@@ -67,10 +67,10 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Het planningsoverzicht gebruiken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">conflicten oplossen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Conflicten oplossen</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.attendees">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attendees">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.call.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.call.html
index 5dbe600fd..425624312 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.call.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.call.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="De datumkiezer gebruiken">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Terugkerende afspraken instellen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.call">
 <div class="titlepage"><div><div><h3 class="title">Audio-/videovergaderingen plannen</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.9.2"></a><a class="indexterm" name="id-1.8.10.9.3"></a><a class="indexterm" name="id-1.8.10.9.4"></a><a class="indexterm" name="id-1.8.10.9.5"></a><a class="indexterm" name="id-1.8.10.9.6"></a><p id="ox.appsuite.user.precondition.calendar.add.call">Voorwaarde: u hebt een account aangemaakt bij een aanbieder van audio- of videoconferenties.</p>
@@ -71,7 +71,7 @@
 <p role="presentation" class="feat-jitsi"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.jitsi">Jitsi-vergaderingen</a></p>
 <p role="presentation" class="feat-zoom"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.zoom">Zoomvergaderingen</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.call">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.call">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.conflicthandling.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.conflicthandling.html
index ef1d40315..dbf0774e5 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.conflicthandling.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.conflicthandling.html
@@ -1,11 +1,11 @@
 <html lang="nl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>conflicten oplossen</title>
+<title>Conflicten oplossen</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Het creëren van een nieuwe afspraak uit een iCal-bijlage">
 <link rel="next" href="ox.appsuite.user.sect.calendar.invitation.html" title="Beantwoorden van Afspraakuitnodigingen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.conflicthandling">
-<div class="titlepage"><div><div><h3 class="title">conflicten oplossen</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Conflicten oplossen</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.20.2"></a><p id="ox.appsuite.user.concept.calendar.add.conflicthandling">Een conflict ontstaat wanneer de volgende omstandigheden samenvallen:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
@@ -84,7 +84,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.create.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.create.html
index d898a4e6c..e679de1d4 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.create.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.create.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="De datumkiezer gebruiken">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.create">
 <div class="titlepage"><div><div><h3 class="title">Nieuwe afspraken maken</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.7.2"></a><a class="indexterm" name="id-1.8.10.7.3"></a><div class="task" id="ox.appsuite.user.task.calendar.add.create">
@@ -110,13 +110,13 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Deelnemers uitnodigen voor een nieuwe afspraak</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">E-mailontvangers uitnodigen van voor een nieuwe afspraak</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Het creëren van een nieuwe afspraak uit een iCal-bijlage</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">conflicten oplossen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Conflicten oplossen</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Uitnodigen van contacten voor een afspraak</a></p>
 <p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Afspraken bewerken</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.create">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.create">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.datepicker.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.datepicker.html
index 06a0bbb89..f1188d572 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.datepicker.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.datepicker.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.create.html" title="Nieuwe afspraken maken">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.call.html" title="Audio-/videovergaderingen plannen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.datepicker">
 <div class="titlepage"><div><div><h3 class="title">De datumkiezer gebruiken</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.8.2"></a><p id="ox.appsuite.user.concept.calendar.add.datepicker">De datumselectie laat u een datum voor in het datumveld kiezen.</p>
@@ -87,7 +87,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Taken bewerken</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.datepicker">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.datepicker">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.display.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.display.html
index d290775a3..f4d96d8b5 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.display.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.display.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Terugkerende afspraken instellen">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Afspraakherinneringen gebruiken">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.display">
 <div class="titlepage"><div><div><h3 class="title">Een afsprakenoverzicht instellen</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.11.2"></a><p id="ox.appsuite.user.concept.calendar.add.display">De volgende mogelijkheden zijn beschikbaar: </p>
@@ -75,7 +75,7 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Hoe worden afspraken getoond in het agendaoverzicht? </a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.display">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.display">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.followup.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.followup.html
index 43801b610..8fbb589fa 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.followup.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.followup.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Het planningsoverzicht gebruiken">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Deelnemers uitnodigen voor een nieuwe afspraak">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.followup">
 <div class="titlepage"><div><div><h3 class="title">Een vervolgafspraak maken</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.16.2"></a><a class="indexterm" name="id-1.8.10.16.3"></a><p id="ox.appsuite.user.concept.calendar.add.followup">U kan een vervolgafspraak maken voor een bestaande afspraak. De vervolgafspraak is alvast ingevuld met de belangrijkste gegevens uit de bestaande afspraak.</p>
@@ -64,10 +64,10 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Nieuwe afspraken maken</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Het planningsoverzicht gebruiken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">conflicten oplossen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Conflicten oplossen</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.followup">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.followup">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.html
index 01185c1a1..c90da40ac 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.html
@@ -1,7 +1,7 @@
 <html lang="nl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>afspraken maken</title>
+<title>Afspraken maken</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
@@ -36,7 +36,7 @@
     
   </h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.add">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">afspraken maken</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Afspraken maken</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.calendar.add">Leer hoe u een afspraak kan aanmaken en over de functies die beschikbaar zijn voor het bepalen van afspraakgegevens: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Nieuwe afspraken maken</a></p></li>
@@ -52,7 +52,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Deelnemers uitnodigen voor een nieuwe afspraak</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">E-mailontvangers uitnodigen van voor een nieuwe afspraak</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Het creëren van een nieuwe afspraak uit een iCal-bijlage</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">conflicten oplossen</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Conflicten oplossen</a></p></li>
 </ul>
 <p id="ox.appsuite.user.hint.calendar.add">Opmerkingen: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.icalattachment.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.icalattachment.html
index 913d897bd..caf3d4b7c 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.icalattachment.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.icalattachment.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="E-mailontvangers uitnodigen van voor een nieuwe afspraak">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="conflicten oplossen">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Conflicten oplossen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.icalattachment">
 <div class="titlepage"><div><div><h3 class="title">Het creëren van een nieuwe afspraak uit een iCal-bijlage</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.19.2"></a><a class="indexterm" name="id-1.8.10.19.3"></a><p id="ox.appsuite.user.concept.calendar.add.icalattachment">U kunt een nieuwe afspraak aanmaken uit een iCal-bijlage van een E-mail. Een ICal-bijlage is te herkennen aan de extensie ics.</p>
@@ -54,12 +54,12 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Nieuwe afspraken maken</a>
             </p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">conflicten oplossen</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Conflicten oplossen</a>
             </p></li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.participants.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.participants.html
index 7eaec3b48..20eba21d9 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.participants.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.participants.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Afspraakherinneringen gebruiken">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Bijlagen toevoegen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.participants">
 <div class="titlepage"><div><div><h3 class="title">Deelnemers of bronnen toevoegen</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.13.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.participants">
@@ -67,6 +67,7 @@
 <li class="listitem"><p role="presentation">Als externe deelnemers de afspraak accepteren ontvangt u een e-mail.</p></li>
 </ul>
           <p role="presentation" class="feat-io-ox-core-managedResources">Opmerking: Bij het toevoegen van een beheerde bron ontvangt de boekingsgemachtigde een boekingsaanvraag voor deze bron. Zodra de boekingsgemachtigde uw boekingsaanvraag voor de bron accepteert of afwijst, wordt u hiervan op de hoogte gesteld.</p>
+          
         </div>
 </div>
 <p id="ox.appsuite.user.tip.calendar.add.participants">Tip: Om vrije momenten voor alle deelnemers en bronnen te vinden kan u <a class="link" href="ox.appsuite.user.sect.calendar.add.scheduling.html">het planningsoverzicht gebruiken</a>.</p>
@@ -82,7 +83,7 @@
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatisch contacten of bronnen toevoegen vanuit een adresboek</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatisch contacten of bronnen toevoegen vanuit de adreslijst</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.participants">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.participants">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.recipients.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.recipients.html
index 23b090a17..be871b3aa 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.recipients.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.recipients.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Deelnemers uitnodigen voor een nieuwe afspraak">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Het creëren van een nieuwe afspraak uit een iCal-bijlage">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.recipients">
 <div class="titlepage"><div><div><h3 class="title">E-mailontvangers uitnodigen van voor een nieuwe afspraak</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.18.2"></a><p id="ox.appsuite.user.concept.calendar.add.recipients">U kan de ontvangers van een e-mail die is verzonden voor een afspraak uitnodigen voor een nieuwe afspraak.</p>
@@ -67,13 +67,13 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Het planningsoverzicht gebruiken</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">conflicten oplossen</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Conflicten oplossen</a>
             </p>
 </li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.calendar.add.recipients">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.recipients">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.scheduling.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.scheduling.html
index 41ea0d2e7..038e5ea20 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.scheduling.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.scheduling.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Bijlagen toevoegen">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Een vervolgafspraak maken">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.scheduling">
 <div class="titlepage"><div><div><h3 class="title">Het planningsoverzicht gebruiken</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.15.2"></a><a class="indexterm" name="id-1.8.10.15.3"></a><a class="indexterm" name="id-1.8.10.15.4"></a><a class="indexterm" name="id-1.8.10.15.5"></a><p id="ox.appsuite.user.concept.calendar.add.scheduling">Bij het plannen van een afspraak met meerdere deelnemers of bronnen, het planningsoverzicht toont vrije en bezette perioden voor de gebruikers en bronnen.</p>
@@ -92,11 +92,11 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Nieuwe afspraken maken</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Deelnemers uitnodigen voor een nieuwe afspraak</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">conflicten oplossen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Conflicten oplossen</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy">Toon beschikbaar/bezet informatie aan anderen</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.scheduling">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.scheduling">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.serial.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.serial.html
index e7da4ed6d..75db09ba7 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.serial.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.add.serial.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.call.html" title="Audio-/videovergaderingen plannen">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.display.html" title="Een afsprakenoverzicht instellen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">afspraken maken</h2>
+<h2 class="sr-only">Afspraken maken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.serial">
 <div class="titlepage"><div><div><h3 class="title">Terugkerende afspraken instellen</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.10.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.serial">
@@ -108,7 +108,7 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.serial.html">Terugkerende taak aanmaken</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.serial">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.serial">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.attachments.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.attachments.html
index 39be3ac3c..65a732d5b 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.attachments.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Agenda">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.view.appointments.html" title="Hoe worden afspraken getoond in het agendaoverzicht?">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="afspraken maken">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="Afspraken maken">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.deputy.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.deputy.html
index 872455790..83569be4c 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.deputy.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.deputy.html
@@ -63,12 +63,12 @@
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Beheren van Afspraken</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">E-mails verzenden of ontvangen als plaatsvervanger</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vertegenwoordigers beheren</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">beheer vertegenwoordigers</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.deputy">Zie ook: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.create.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.create.html
index b3fe38f78..c67e6ac7c 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.create.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.create.html
@@ -110,7 +110,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">Het <span class="phrase">Agenda</span> detailoverzicht</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Nieuwe afspraken maken</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
 <p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Afspraken maken, bewerken of beheren als plaatsvervanger</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Afspraken bewerken</a></p>
 </li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.detailview.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.detailview.html
index da188c530..57a6752e1 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.detailview.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.detailview.html
@@ -65,7 +65,7 @@
 <li class="listitem">
 <p role="presentation">Verdere afspraakgegevens, indien ingesteld: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">bijlagen</p></li>
+<li class="listitem"><p role="presentation">Bijlagen</p></li>
 <li class="listitem"><p role="presentation">definitie</p></li>
 <li class="listitem">
 <p role="presentation">organisator, extra ontvangers, bronnen</p>
@@ -103,10 +103,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Contacten tonen in het halo overzicht</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Afspraakdeelnemers bellen</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Wijzigen van de afspraakstatus</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Afspraakherinneringen aanpassen</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Beheren van Afspraken</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.detailview">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">De <span class="phrase">Agenda</span> Componenten</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.foldertree.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.foldertree.html
index d653733fa..8983cd13c 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.foldertree.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.foldertree.html
@@ -63,7 +63,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Tonen van Afspraken</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">Persoonlijke agenda's toevoegen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Agendakleuren gebruiken</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Beheren van Afspraken</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Een bronagenda en bronagendagroepen aanmaken</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.edit.html">Bronagenda's bewerken</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Afspraken maken met behulp van de bronkalender</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.list.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.list.html
index 304273b87..da7b77887 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.list.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.list.html
@@ -55,11 +55,11 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">Het <span class="phrase">Agenda</span> detailoverzicht</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Afspraken tonen in het verschillende overzichten</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.view.html">Bronagenda's tonen</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Beheren van Afspraken</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.list">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">De <span class="phrase">Agenda</span> Componenten</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.new.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.new.html
index f8d6c3de5..cd146724a 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.new.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.new.html
@@ -51,10 +51,7 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Nieuwe afspraken maken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Het planningsoverzicht gebruiken</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">Abonneren op Google agenda's</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Publieke en Gedeelde agenda's tonen</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.popup.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.popup.html
index c0a3dd485..b02269226 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.popup.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.popup.html
@@ -69,7 +69,7 @@
 <li class="listitem">
 <p role="presentation">Verdere afspraakgegevens, indien ingesteld: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">bijlagen</p></li>
+<li class="listitem"><p role="presentation">Bijlagen</p></li>
 <li class="listitem"><p role="presentation">definitie</p></li>
 <li class="listitem">
 <p role="presentation">organisator, extra ontvangers, bronnen</p>
@@ -117,15 +117,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Afspraken bewerken</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Een vervolgafspraak maken</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Wijzigen van de afspraakstatus</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Afspraakherinneringen aanpassen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Wijzig de organisator</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Afspraken verplaatsen naar een andere agenda</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Afspraken exporteren</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Afdrukken van afspraken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Afspraken wissen</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Beheren van Afspraken</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Versturen van een e-mailbericht naar afspraakdeelnemers</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.popup">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">De <span class="phrase">Agenda</span> Componenten</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.toolbar.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.toolbar.html
index e5291f7b9..17de12907 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.toolbar.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.gui.toolbar.html
@@ -74,14 +74,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Afspraken bewerken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Afspraakherinneringen aanpassen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Wijzig de organisator</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Afspraken verplaatsen naar een andere agenda</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Afspraken exporteren</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Afdrukken van afspraken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Afspraken wissen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Beheren van Afspraken</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.toolbar">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">De <span class="phrase">Agenda</span> Componenten</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.invitation.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.invitation.html
index fa7ded0f8..ecbed19ac 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.invitation.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.invitation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Agenda">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="conflicten oplossen">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Conflicten oplossen">
 <link rel="next" href="ox.appsuite.user.sect.calendar.edit.html" title="Afspraken bewerken">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -87,7 +87,7 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Wijzigen van de afspraakstatus</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Afspraakstatus wijzigen</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Meldingen aanpassen</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.invitation">Zie ook: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.categories.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.categories.html
new file mode 100644
index 000000000..e5bce7212
--- /dev/null
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.categories.html
@@ -0,0 +1,106 @@
+<html lang="nl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Categorieën gebruiken voor afspraken</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Gebruikershandleiding">
+<link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Beheren van Afspraken">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Favoriete tijdzones beheren">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Agendakleuren gebruiken">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Terug</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Volgende</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Agenda</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Beheren van Afspraken</h2>
+<div class="sect2" id="ox.appsuite.user.sect.calendar.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Categorieën gebruiken voor afspraken</h3></div></div></div>
+<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><a class="indexterm" name="id-1.8.15.11.4"></a><p id="ox.appsuite.user.concept.calendar.manage.categories">Om afspraken onafhankelijk van agenda's te organiseren kan u gebruik maken van categorieën. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">U kan afspraken markeren met categorieën.</p></li>
+<li class="listitem"><p role="presentation">U kan alle afspraken tonen die zijn gemarkeerd met een specifieke categorie.</p></li>
+</ul>
+<p> U kan uw eigen categorieën maken, bewerken en verwijderen, zie <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>.</p>
+<div class="task" id="ox.appsuite.user.task.calendar.manage.categories">
+<p class="title">Afspraken toewijzen aan een categorie gaat als volgt:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Afhankelijk van het gekozen overzicht, kan u één van de volgende methoden kiezen: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Klik op een afspraak in het agendaoverzicht. Klik op het <span class="guibutton"><strong>Wijzig afspraak</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in de pop-up.</p></li>
+<li class="listitem"><p role="presentation">Selecteer een afspraak in de lijstweergave. Klik op het <span class="guibutton"><strong>Wijzig afspraak</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in de werkbalk.</p></li>
+</ul></p>
+<p role="presentation">Het afspraak bewerkingsscherm opent.</p>
+</li>
+<li class="step">
+<p role="presentation">Om dit te doen klikt u op <span class="guibutton"><strong>Categorie toevoegen</strong></span> naast <span class="guibutton"><strong>Categorieën</strong></span>. Selecteer een categorie.</p>
+<p role="presentation">Om een categorie van een afspraak te verwijderen, klikt u op het <span class="guibutton"><strong>Categorie verwijderen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> naast de categorie.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.calendar.categories.view">
+<p class="title">Afspraken toont u op de volgende manier met een specifieke categorie:</p>
+<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Afhankelijk van het gekozen overzicht, kan u één van de volgende methoden kiezen: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Vanuit het agendaoverzicht, klikt u op een afspraak die is gemarkeerd met een categorie. In de pop-up klikt u op de categorie.</p></li>
+<li class="listitem"><p role="presentation">In het lijstoverzicht selecteert u een afspraak gemarkeerd met een categorie. Klik op de categorie in het detailoverzicht.</p></li>
+</ul></p></li></ul></div>
+<div class="taskrelated">
+          <p>Resultaat: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Het lijstoverzicht toont alle afspraken die zijn gemarkeerd met deze categorie.</p></li>
+<li class="listitem"><p role="presentation">Om het vorige overzicht te tonen, klikt u op het <span class="guibutton"><strong>Zoeken annuleren</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in het zoekveld.</p></li>
+</ul>
+          <p>Tip: U kan ook de zoekfunctie gebruiken om te zoeken naar een categorie met de zoekfunctie.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.calendar.manage.categories">
+        </p>
+<p class="title">Zie ook:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Zoeken naar Afspraken</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">PGP inline standaard ingesteld voor nieuwe berichten</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Categorieën gebruiken voor contacten</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Categorieën gebruiken voor taken</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.calendar.manage.categories">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Beheren van Afspraken</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.changeorganizer.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
index 62e28d356..2f9577893 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
@@ -64,8 +64,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changeorganizer"></p>
 <p class="title">Gebruikersinterface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">De <span class="phrase">Agenda</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Het <span class="phrase">Agenda</span> lijstoverzicht</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.changereminder.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.changereminder.html
index 80344f251..5ec4e8ae8 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.changereminder.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.changereminder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Beheren van Afspraken">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="Wijzigen van de afspraakstatus">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="Afspraakstatus wijzigen">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Wijzig de organisator">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -60,9 +60,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changereminder"></p>
 <p class="title">Gebruikersinterface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">De <span class="phrase">Agenda</span> werkbalk</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">Het <span class="phrase">Agenda</span> detailoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Het <span class="phrase">Agenda</span> lijstoverzicht</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.changestatus.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.changestatus.html
index 6a99d7859..c27d36a81 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.changestatus.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.changestatus.html
@@ -1,7 +1,7 @@
 <html lang="nl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Wijzigen van de afspraakstatus</title>
+<title>Afspraakstatus wijzigen</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
@@ -37,7 +37,7 @@
   </h1>
 <h2 class="sr-only">Beheren van Afspraken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.changestatus">
-<div class="titlepage"><div><div><h3 class="title">Wijzigen van de afspraakstatus</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Afspraakstatus wijzigen</h3></div></div></div>
 <a class="indexterm" name="id-1.8.15.7.2"></a><a class="indexterm" name="id-1.8.15.7.3"></a><p id="ox.appsuite.user.concept.calendar.manage.changestatus">U kunt uw afspraakstatus later wijzigen. U kunt een opmerking toevoegen die zichtbaar is voor andere deelnemers.</p>
 <p id="ox.appsuite.user.hint.calendar.manage.changestatus">Opmerkingen: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -64,6 +64,7 @@
 <p class="title">Gebruikersinterface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Het <span class="phrase">Agenda</span> lijstoverzicht</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">Het <span class="phrase">Agenda</span> detailoverzicht</a></p>
 </li></ul>
 <p> </p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.colors.html
index 640c8beba..6f8ffdead 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.colors.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.colors.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Beheren van Afspraken">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Favoriete tijdzones beheren">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Categorieën gebruiken voor afspraken">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.move.html" title="Afspraken verplaatsen naar een andere agenda">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.move.html">Volgende</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Beheren van Afspraken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.colors">
 <div class="titlepage"><div><div><h3 class="title">Agendakleuren gebruiken</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">U kunt een agendakleur instellen. Standaard worden alle afspraken in deze agenda weergegeven in de kleur van de agenda. Als u een individuele kleur toewijst aan een afspraak bij het maken of bewerken ervan, wordt de afspraak weergegeven in de toegewezen kleur, niet in de kleur van de agenda.</p>
+<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">U kunt een agendakleur instellen. Standaard worden alle afspraken in deze agenda weergegeven in de kleur van de agenda. Als u een individuele kleur toewijst aan een afspraak bij het maken of bewerken ervan, wordt de afspraak weergegeven in de toegewezen kleur, niet in de kleur van de agenda.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.colors">
 <p class="title">Een agendakleur kiest u als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,19 +46,15 @@
 <li class="step"><p role="presentation">Selecteer een kleur vanuit de kleurselectie drop-down.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.colors">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.colors"></p>
+<p class="title">Gebruikersinterface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Het <span class="phrase">Agenda</span> mappenoverzicht</a></p></li></ul>
+<p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Hoe worden afspraken getoond in het agendaoverzicht? </a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Het <span class="phrase">Agenda</span> mappenoverzicht</a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Het <span class="phrase">Agenda</span> mappenoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Hoe worden afspraken getoond in het agendaoverzicht? </a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.colors">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Beheren van Afspraken</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.delete.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.delete.html
index 07fa2d113..fa8dacc35 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.delete.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Beheren van Afspraken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Afspraken wissen</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Waarschuwing:</strong></span> Verwijderde afspraken kunnen <span class="phrase"><strong>niet</strong></span> worden hersteld. Afhankelijk van de configuratie kunt u alleen een afspraak in uw privéagenda's verwijderen als u de organisator van de afspraak bent.</p>
+<a class="indexterm" name="id-1.8.15.17.2"></a><a class="indexterm" name="id-1.8.15.17.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Waarschuwing:</strong></span> Verwijderde afspraken kunnen <span class="phrase"><strong>niet</strong></span> worden hersteld. Afhankelijk van de configuratie kunt u alleen een afspraak in uw privéagenda's verwijderen als u de organisator van de afspraak bent.</p>
 <p id="ox.appsuite.user.concept.calendar.manage.delete">U kan een afsprak verwijderen uit een agenda als u toestemming heeft om items te verwijderen.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.delete">
 <p class="title">Een afspraak verwijderen gaat als volgt:</p>
@@ -73,11 +73,14 @@
         </p>
 <p class="title">Gebruikersinterface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">De <span class="phrase">Agenda</span> werkbalk</a>
+            </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">De <span class="phrase">Agenda</span> werkbalk</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Het <span class="phrase">Agenda</span> lijstoverzicht</a>
             </p>
 </li></ul>
 <p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.export.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.export.html
index 227097769..5d5453334 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.export.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Beheren van Afspraken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Afspraken exporteren</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">U kan afspraken exporteren in het iCal formaat. U kan dit formaat gebruiken om afspraken uit te wisselen met andere agenda applicaties. U kan een enkele afspraak exporteren of allemaal uit een agenda.</p>
+<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">U kan afspraken exporteren in het iCal formaat. U kan dit formaat gebruiken om afspraken uit te wisselen met andere agenda applicaties. U kan een enkele afspraak exporteren of allemaal uit een agenda.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.manage.export.selected">
 <p class="title">Een enkele afspraak exporteert u als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -65,14 +65,16 @@
 <p id="ox.appsuite.user.related.calendar.manage.export"></p>
 <p class="title">Gebruikersinterface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Het <span class="phrase">Agenda</span> mappenoverzicht</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">De <span class="phrase">Agenda</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Het <span class="phrase">Agenda</span> lijstoverzicht</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Afspraken importeren</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.8.15.14.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Persoonlijke Gegevens Downloaden</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.8.15.15.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Persoonlijke Gegevens Downloaden</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.manage.export">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Beheren van Afspraken</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.html
index 81e1c3bbb..1690d4e86 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Agenda">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.folder.import.html" title="Importeren van agenda's vanuit bestanden">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="Wijzigen van de afspraakstatus">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="Afspraakstatus wijzigen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -39,10 +39,11 @@
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Beheren van Afspraken</h2></div></div></div>
 <a class="indexterm" name="id-1.8.15.2"></a><a class="indexterm" name="id-1.8.15.3"></a><p id="ox.appsuite.user.orientation.calendar.manage">Leer hoe u uw afspraken kan organiseren en over de afspraakacties die beschikbaar zijn. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Wijzigen van de afspraakstatus</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Afspraakstatus wijzigen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Afspraakherinneringen aanpassen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Wijzig de organisator</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Favoriete tijdzones beheren</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Categorieën gebruiken voor afspraken</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Agendakleuren gebruiken</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Afspraken verplaatsen naar een andere agenda</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Afspraken importeren</a></p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.import.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.import.html
index f6c4f4be0..79c4ff090 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.import.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Beheren van Afspraken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Afspraken importeren</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><a class="indexterm" name="id-1.8.15.13.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">U kan afspraken importeren vanuit bestanden in het iCal formaat.</p>
+<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">U kan afspraken importeren vanuit bestanden in het iCal formaat.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.import">
 <p class="title">Importeren van afspraken vanuit een iCal bestand gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -55,22 +55,16 @@
           <p>Let op: Alle deelnemers aan de geïmporteerde afspraken worden verwijderd.In plaats daarvan wordt u als deelnemer toegevoegd.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.import"></p>
+<p class="title">Gebruikersinterface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Het <span class="phrase">Agenda</span> mappenoverzicht</a></p></li></ul>
+<p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Afspraken exporteren</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importeren van agenda's vanuit bestanden</a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Afspraken exporteren</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importeren van agenda's vanuit bestanden</a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.import">Zie ook: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Beheren van Afspraken</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.move.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.move.html
index 9d64bb050..e04f86654 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.move.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.move.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Beheren van Afspraken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Afspraken verplaatsen naar een andere agenda</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">U kunt afzonderlijke afspraken naar een andere agenda verplaatsen, maar geen afspraakreeksen.</p>
+<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">U kunt afzonderlijke afspraken naar een andere agenda verplaatsen, maar geen afspraakreeksen.</p>
 <p>Voorwaarde: U moet de juiste rechten hebben om objecten aan te maken in de doelagenda.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.move">
 <p class="title">Een afspraak verplaatsen naar een andere agenda gaat als volgt:</p>
@@ -57,8 +57,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.move"></p>
 <p class="title">Gebruikersinterface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">De <span class="phrase">Agenda</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Het <span class="phrase">Agenda</span> lijstoverzicht</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.print.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.print.html
index 62ea00f95..b07630a52 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.print.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Beheren van Afspraken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Afdrukken van afspraken</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><a class="indexterm" name="id-1.8.15.15.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">Om agenda's en afspraken af te drukken kan u: </p>
+<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><a class="indexterm" name="id-1.8.15.16.4"></a><a class="indexterm" name="id-1.8.15.16.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">Om agenda's en afspraken af te drukken kan u: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">een agendablad met afspraken afdrukken</p></li>
 <li class="listitem"><p role="presentation">de gegevens van een afspraak afdrukken</p></li>
@@ -89,14 +89,20 @@
 <p class="title">Gebruikersinterface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">Het <span class="phrase">Agenda</span> instellingenmenu</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">Het <span class="phrase">Agenda</span> instellingenmenu</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Het <span class="phrase">Agenda</span> mappenoverzicht</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">De <span class="phrase">Agenda</span> werkbalk</a>
             </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Het <span class="phrase">Agenda</span> lijstoverzicht</a>
+            </p>
 </li></ul>
 <p>
       </p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.timezones.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.timezones.html
index e55d2b6b0..9a0bb777f 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.timezones.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.manage.timezones.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Beheren van Afspraken">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Wijzig de organisator">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Agendakleuren gebruiken">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Categorieën gebruiken voor afspraken">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Volgende</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Volgende</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.search.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.search.html
index 58622faf9..bd62ac869 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.search.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.search.html
@@ -89,7 +89,7 @@
             <a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Afspraken tonen in het verschillende overzichten</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Categorieën gebruiken voor afspraken</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.settings.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.settings.html
index 5b01242d0..51ba301fd 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.settings.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.settings.html
@@ -103,7 +103,7 @@
 <p id="ox.appsuite.user.reference.calendar.settings.jitsi"></p>
 <h3 class="title">Jitsi-vergaderingen</h3>
 <p><a class="indexterm" name="id-1.8.22.9.2"></a>Met die opties kun je het gedrag definiëren als je <span class="guibutton"><strong>Jitsi Meeting</strong></span> selecteert in de vervolgkeuzelijst <span class="guibutton"><strong>Conferentie</strong></span> bij het maken van afspraken. </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>Link automatisch naar locatie kopiëren. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Bepaalt of de link voor deelname aan de Jitsi-vergadering wordt gekopieerd naar het veld <span class="guibutton"><strong>Locatie</strong></span>.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>automatisch de link naar de locatie sturen. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Bepaalt of de link voor deelname aan de Jitsi-vergadering wordt gekopieerd naar het veld <span class="guibutton"><strong>Locatie</strong></span>.</p></li></ul>
 <p> Zie ook <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Audio-/videovergaderingen plannen</a></p>
 </div>
 <div id="ox.appsuite.user.reference.calendar.settings.zoom" class="feat-zoom">
@@ -115,8 +115,8 @@
 <p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments"><b>Afspraken. </b></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.password"><b>Altijd een willekeurig vergaderingswachtwoord toevoegen. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.1.1.2"></a>Definieert of de vergadering wordt beveiligd met een automatisch aangemaakt wachtwoord.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>Link automatisch naar locatie kopiëren. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Bepaalt of de link voor deelname aan de Zoomvergadering wordt gekopieerd naar het veld <span class="guibutton"><strong>Locatie</strong></span>.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>Kopieer inbelinformatie naar beschrijving. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Bepaalt of de link voor deelname aan de Zoomvergadering wordt gekopieerd naar het veld <span class="guibutton"><strong>Locatie</strong></span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>automatisch de link naar de locatie sturen. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Bepaalt of de link voor deelname aan de Zoomvergadering wordt gekopieerd naar het veld <span class="guibutton"><strong>Locatie</strong></span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>kopieer inbelgegevens naar de omschrijving. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Bepaalt of de link voor deelname aan de Zoomvergadering wordt gekopieerd naar het veld <span class="guibutton"><strong>Locatie</strong></span>.</p></li>
 </ul>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.dialinnumber"><b>Inbelnummers. </b>Als u minimaal een Zoom Pro account hebt, biedt Zoom inbelnummers per land aan. Klik op <span class="guibutton"><strong>Zoomprofiel openen</strong></span> om de landen te definiëren die moeten worden weergegeven in uitnodigingen voor afspraken.</p></li>
@@ -128,8 +128,8 @@
 <p><a class="indexterm" name="id-1.8.22.11.2"></a>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>verjaardagskalender weergeven. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Geeft aan of een verjaardagskalender getoond wordt in het mappenoverzicht.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>toon herinnering voor afspraken uit het verleden. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Geef aan of u herinneringen wilt zien voor afspraken die al geweest zijn.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>Verjaardagskalender weergeven. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Geeft aan of een verjaardagskalender getoond wordt in het mappenoverzicht.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>Toon herinneringen voor afspraken uit het verleden. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Geef aan of u herinneringen wilt zien voor afspraken die al geweest zijn.</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.calendar.settings.advanced.emailchanges"><b>Automatisch e-mailberichten met aanpassingen in afspraken verwerken in uw agenda. </b><a class="indexterm" name="id-1.8.22.11.3.1.3.1.2"></a>Geeft aan wanneer afspraakuitnodigingen van externe contacten automatisch aan uw agenda worden toegevoegd. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -143,7 +143,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.declined"><b>Toon afgewezen afspraken. </b><a class="indexterm" name="id-1.8.22.11.3.1.6.1.2"></a>Geef aan hoe door u geweigerde afspraken getoond moeten worden. Zie <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Beantwoorden van Afspraakuitnodigingen</a></p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.participantsedit"><b>Altijd "Deelnemers kunnen afspraken bewerken" aanvinken bij het maken of bewerken van afspraken. </b><a class="indexterm" name="id-1.8.22.11.3.1.7.1.2"></a>Stelt in of deelnemers standaard een afspraak mogen aanpassen.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.wholeday"><b>Markeer alle dagafspraken automatisch als "beschikbaar" bij het maken of bewerken van afspraken. </b><a class="indexterm" name="id-1.8.22.11.3.1.8.1.2"></a>Bepaalt of dagafspraken standaard als beschikbaar worden weergegeven.</p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>gebruik de kleur van de eerste categorie voor afspraken. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Geeft aan of afspraken waaraan u een categorie heeft toegewezen, worden weergegeven in de kleur van die categorie. Bij het toekennen van meerdere categorieën aan een afspraak, wordt de kleur van de initieel toegewezen categorie gebruikt. Zie ook <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>Gebruik de kleur van de eerste categorie voor afspraken. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Geeft aan of afspraken waaraan u een categorie heeft toegewezen, worden weergegeven in de kleur van die categorie. Bij het toekennen van meerdere categorieën aan een afspraak, wordt de kleur van de initieel toegewezen categorie gebruikt. Zie ook <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a></p></li>
 </ul>
 <p>
       </p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.appointments.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.appointments.html
index 2aea1d814..8d62098b6 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.appointments.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.appointments.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Tonen van Afspraken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.appointments">
 <div class="titlepage"><div><div><h3 class="title">Hoe worden afspraken getoond in het agendaoverzicht? </h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.9.2"></a><a class="indexterm" name="id-1.8.8.9.3"></a><a class="indexterm" name="id-1.8.8.9.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">De volgende afspraakeigenschappen bepalen de weergave van een afspraak in het agendaoverzicht: </p>
+<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><a class="indexterm" name="id-1.8.8.8.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">De volgende afspraakeigenschappen bepalen de weergave van een afspraak in het agendaoverzicht: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">De kleur van een afspraak</p>
@@ -67,7 +67,7 @@
 <p role="presentation">Een afspraak die u heeft geweigerd, wordt grijs weergegeven. Het onderwerp wordt voorafgegaan door het <span class="guibutton"><strong>Afgewezen</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.declined"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>pictogram. Het onderwerp is doorgestreept.</p>
 <p role="presentation">Bij de agenda-instellingen kan u aangeven of afgewezen afspraken worden getoond.</p>
 </li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.6.2.1.6"><p role="presentation">Een afspraak die door alle andere deelnemers is afgewezen, wordt gemarkeerd met het <span class="guibutton"><strong>Allen afgewezen</strong></span>  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>pictogram.</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.6.2.1.6"><p role="presentation">Een afspraak die door alle andere deelnemers is afgewezen, wordt gemarkeerd met het <span class="guibutton"><strong>Allen afgewezen</strong></span>  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>pictogram.</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.view.appointments.private"></p>
 <h4 class="title">Weergave van privéafspraken</h4>
@@ -94,7 +94,7 @@
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.secret"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span>geheime afspraak</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.unconfirmed"><object type="image/svg+xml" data="../../images/question-circle.svg" height="15"></object></span>onbevestigde afspraak</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.rejected"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>afgewezen afspraak</p></li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>afspraak afgewezen door alle andere deelnemers</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>afspraak afgewezen door alle andere deelnemers</p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.view.appointments">
         </p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.html
index 1db9fb0db..2d203fc65 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.html
@@ -43,14 +43,6 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.timezones.html">Meerdere tijdzones tonen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Hoe worden afspraken getoond in het agendaoverzicht? </a></p></li>
 </ul>
-<p id="ox.appsuite.user.related.calendar.view">
-      </p>
-<p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Het <span class="phrase">Agenda</span> mappenoverzicht</a>
-          </p></li></ul>
-<p>
-    </p>
 <p id="ox.appsuite.user.parent.calendar.view">Zie ook: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
     <span class="phrase">Agenda</span>
     
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.timezones.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.timezones.html
index 47f61f4d6..d4bb455b9 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.timezones.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.timezones.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Tonen van Afspraken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.timezones">
 <div class="titlepage"><div><div><h3 class="title">Meerdere tijdzones tonen</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">Naast de standaard tijdzone, kan u ook de tijdzones tonen die door u zijn toegevoegd als favoriet. De standaard tijdzone kan u veranderen in de standaardinstellingen.</p>
+<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">Naast de standaard tijdzone, kan u ook de tijdzones tonen die door u zijn toegevoegd als favoriet. De standaard tijdzone kan u veranderen in de standaardinstellingen.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.timezones">
 <p class="title">Meerdere tijdzones tonen in het agendaoverzicht gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.views.html b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.views.html
index 6b1a61800..933f4282d 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.views.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.calendar.view.views.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Tonen van Afspraken</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.views">
 <div class="titlepage"><div><div><h3 class="title">Afspraken tonen in het verschillende overzichten</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><a class="indexterm" name="id-1.8.8.7.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Leer hoe u de afspraken van één of meerdere agenda's op verschillende manieren kan tonen:</p>
+<a class="indexterm" name="id-1.8.8.6.2"></a><a class="indexterm" name="id-1.8.8.6.3"></a><a class="indexterm" name="id-1.8.8.6.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Leer hoe u de afspraken van één of meerdere agenda's op verschillende manieren kan tonen:</p>
 <div class="task" id="ox.appsuite.user.task.calendar.view.views">
 <p class="title">Een afspraak bekijken:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.create.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.create.html
index d2366eeb4..0b0e5a331 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.create.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.create.html
@@ -49,8 +49,8 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">Een contactafbeelding, indien geüpload. Klik op de contactafbeelding om deze te bewerken of om een nieuwe contactafbeelding te uploaden.</p>
-<p role="presentation">Achternaam, voornaam</p>
-<p role="presentation">Indien ingevuld: titel, bedrijfsinformatie, woonplaats</p>
+<p role="presentation">achternaam, voornaam</p>
+<p role="presentation">indien ingevuld: titel, bedrijfsinformatie, woonplaats</p>
 </li>
 <li class="listitem">
 <p role="presentation">Persoonlijke informatie </p>
@@ -87,13 +87,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">Het bewerkingscherm</a></p></li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">Het <span class="phrase">Adresboek</span> detailoverzicht</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Nieuw contact aanmaken</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Contacten Toevoegen</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Contacten of Distributielijsten bewerken</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.create">Zie ook: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">De <span class="phrase">Adresboek</span> Componenten</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.detailview.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.detailview.html
index b2be57cdb..c9640afb4 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.detailview.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.detailview.html
@@ -44,17 +44,17 @@
 <p class="title">Inhoud</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Een contactafbeelding, indien geüpload</p>
-<p role="presentation">Achternaam, voornaam</p>
-<p role="presentation">Indien ingevuld: titel, bedrijfsinformatie, woonplaats</p>
+<p role="presentation">een contactafbeelding, indien geüpload</p>
+<p role="presentation">achternaam, voornaam</p>
+<p role="presentation">indien ingevuld: titel, bedrijfsinformatie, woonplaats</p>
 </li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.7.11.4.1.3">
-<p role="presentation">De toegewezen categorieën</p>
+<p role="presentation">de toegewezen categorieën</p>
 <p role="presentation">Als u op een categorie klikt, zoekt u naar contactpersonen die aan die categorie zijn toegewezen.</p>
 </li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.4"><p role="presentation">Afhankelijk van de configuratie: De beschikbaarheid van het contact voor oproepen</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.5">
-<p role="presentation">Afhankelijk van de configuratie: Pictogrammen voor het communiceren met een contact: </p>
+<p role="presentation">Afhankelijk van de configuratie: pictogrammen voor het communiceren met een contact: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>E-mail</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.detailview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>. Opent het venster voor het opstellen van een e-mail.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Bellen</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.detailview.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>. Opent een menu met functies voor bellen.</p></li>
@@ -82,7 +82,7 @@
 </li>
 <li class="listitem"><p role="presentation">Een opmerking</p></li>
 <li class="listitem"><p role="presentation">Maximaal 18 optionele gebruikersvelden</p></li>
-<li class="listitem"><p role="presentation">bijlagen</p></li>
+<li class="listitem"><p role="presentation">Bijlagen</p></li>
 </ul>
 </li>
 </ul>
@@ -95,15 +95,11 @@
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">De  <span class="phrase">Adresboek</span> lijst</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.create.html">Het contactbewerkingscherm</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Toon de contacten van een adresboek</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.attachments.html">Tonen of opslaan van contactbijlagen</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Contactpersonen bellen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Contacten beheren</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Contacten beheren</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.detailview">Zie ook: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">De <span class="phrase">Adresboek</span> Componenten</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.foldertree.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.foldertree.html
index fa4ab8902..a1a69edfb 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.foldertree.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.foldertree.html
@@ -60,6 +60,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Toon de contacten van een adresboek</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adresboeken toevoegen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Contacten beheren</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gegevens Beheren met Mappen</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.list.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.list.html
index 1d23b58bd..1c59fdb49 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.list.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.list.html
@@ -51,8 +51,8 @@
 <p role="presentation">De volgende details worden voor elk contact getoond: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">een foto indien geüpload</p></li>
-<li class="listitem"><p role="presentation">Achternaam, voornaam</p></li>
-<li class="listitem"><p role="presentation">Zakelijke gegevens, indien ingevoerd</p></li>
+<li class="listitem"><p role="presentation">achternaam, voornaam</p></li>
+<li class="listitem"><p role="presentation">zakelijke gegevens, indien ingevoerd</p></li>
 </ul>
 <p role="presentation">Namen die beginnen met een symbool of een speciaal karakter worden getoond onder <span class="guibutton"><strong>#</strong></span> bovenaan de lijst. Namen die beginnen met een speciaal teken worden onder <span class="guibutton"><strong>Ω</strong></span> getoond aan de onderkant van de lijst.</p>
 </li>
@@ -64,11 +64,8 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.settingsmenu.html">Het <span class="phrase">Adresboek</span> instellingenmenu</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">Het <span class="phrase">Adresboek</span> detailoverzicht</a></p>
-</li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Toon de contacten van een adresboek</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Contacten beheren</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.list">Zie ook: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">De <span class="phrase">Adresboek</span> Componenten</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.new.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.new.html
index a50bbc860..479550c9b 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.new.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.new.html
@@ -41,7 +41,7 @@
 <a class="indexterm" name="id-1.9.7.6.2"></a><p id="ox.appsuite.user.concept.contacts.gui.new">Maakt een nieuw contact aan. Als u op het pictogram <span class="guibutton"><strong>Meer acties</strong></span> klikt <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>, wordt een menu met verdere functies geopend: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">nieuwe distributielijst</p></li>
-<li class="listitem"><p role="presentation">Abonneren op gedeelde of andere adresboeken</p></li>
+<li class="listitem"><p role="presentation">abonneren op gedeelde of andere adresboeken</p></li>
 <li class="listitem"><p role="presentation">nieuwe e-mail, nieuwe afspraak, nieuw contact</p></li>
 </ul>
 <p id="ox.appsuite.user.hint.contacts.gui.new">Opmerking: Als de map is gesloten, wordt de knop weergegeven als pictogram. In dit geval zal het <span class="guibutton"><strong>Meer acties</strong></span> pictogram niet beschikbaar zijn. Om het mappenoverzicht te tonen klikt u op het <span class="guibutton"><strong>Open mappenoverzicht</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.open"><object type="image/svg+xml" data="../../images/layout-split.svg" height="15"></object></span> linksonder.</p>
@@ -51,7 +51,7 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Nieuw contact aanmaken</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Contacten Toevoegen</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">Maken van nieuwe distributielijsten</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Abonneren op externe adresboeken</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Abonneren op publieke en gedeelde adresboeken</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.settingsmenu.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
index f6c731818..7c8153f0f 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
@@ -43,7 +43,7 @@
 <li class="listitem"><p role="presentation">Alle instellingen aanpassen</p></li>
 <li class="listitem"><p role="presentation">Selecteer een thema voor de gebruikersinterface</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Lijstopties</strong></span>. Geeft aan of contactafbeeldingen, selectievakjes of geen van deze elementen worden weergegeven in de lijst.</p></li>
-<li class="listitem"><p role="presentation">Abonneren op gedeelde of andere adresboeken</p></li>
+<li class="listitem"><p role="presentation">abonneren op gedeelde of andere adresboeken</p></li>
 <li class="listitem"><p role="presentation">Afhankelijk van de configuratie: <span class="guibutton"><strong>Verbindt uw Drive</strong></span>. Start de wizard voor het instellen van locale apps waarmee u uw groupware gegevens kan benaderen.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.contacts.gui.settingsmenu"></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.toolbar.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.toolbar.html
index 6109b4e91..0b70fbb9b 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.toolbar.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.gui.toolbar.html
@@ -62,13 +62,7 @@
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Contacten of Distributielijsten bewerken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Versturen van e-mailberichten vanuit uit een adresboek</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Uitnodigen van contacten voor een afspraak</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Verplaatsen of kopiëren van contacten</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Versturen van contactgegevens als vCard</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Contacten exporteren</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.print.html">Contacten afdrukken </a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.delete.html">Contacten verwijderen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Contacten beheren</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.toolbar">Zie ook: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">De <span class="phrase">Adresboek</span> Componenten</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.categories.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.categories.html
new file mode 100644
index 000000000..12aad9417
--- /dev/null
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="nl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Categorieën gebruiken voor contacten</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Gebruikershandleiding">
+<link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Contacten beheren">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Uitnodigen van contacten voor een afspraak">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Verplaatsen of kopiëren van contacten">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Terug</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Volgende</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Adresboek</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Contacten beheren</h2>
+<div class="sect2" id="ox.appsuite.user.sect.contacts.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Categorieën gebruiken voor contacten</h3></div></div></div>
+<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><p id="ox.appsuite.user.concept.contacts.manage.categories">Om contacten onafhankelijk van mappen te organiseren kan u gebruik maken van categorieën. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">U kan contacten markeren met categorieën.</p></li>
+<li class="listitem"><p role="presentation">U kan alle contacten tonen die zijn gemarkeerd met een specifieke categorie.</p></li>
+</ul>
+<p> U kan uw eigen categorieën maken, bewerken en verwijderen, zie <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>.</p>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories">
+<p class="title">Een categorie toewijzen aan contacten gaat als volgt:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Selecteer een contact. Klik op het <span class="guibutton"><strong>Bewerk contact</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in de werkbalk.</p>
+<p role="presentation">Het contactbewerkingscherm opent.</p>
+</li>
+<li class="step">
+<p role="presentation">Om dit te doen klikt u op <span class="guibutton"><strong>Categorie toevoegen</strong></span> naast <span class="guibutton"><strong>Categorieën</strong></span>. Selecteer een categorie.</p>
+<p role="presentation">Om een categorie van een contact te verwijderen, klikt u op het <span class="guibutton"><strong>Categorie verwijderen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> naast de categorie.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories.view">
+<p class="title">Contacten toont u op de volgende manier met een specifieke categorie:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selecteer een contact welke is gemarkeerd met een categorie.</p></li>
+<li class="step"><p role="presentation">Klik op de categorie in het detailoverzicht.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Resultaat: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Het lijstoverzicht toont alle contacten die zijn gemarkeerd met deze categorie. </p></li>
+<li class="listitem"><p role="presentation">Om vorige lijst te tonen, klikt u op het <span class="guibutton"><strong>Zoeken annuleren</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in het zoekveld.</p></li>
+</ul>
+          <p>Tip: U kan ook de zoekfunctie gebruiken om te zoeken naar een categorie met de zoekfunctie.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.contacts.manage.categories">
+        </p>
+<p class="title">Zie ook:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Zoeken naar Contacten</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">PGP inline standaard ingesteld voor nieuwe berichten</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Categorieën gebruiken voor afspraken</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Categorieën gebruiken voor taken</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.contacts.manage.categories">Zie ook: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Contacten beheren</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.delete.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.delete.html
index d85ebaa7c..d67da9240 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.delete.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Contacten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Contacten verwijderen</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Waarschuwing:</strong></span> Verwijderde contacten en distributielijsten kunnen <span class="phrase"><strong>niet</strong></span> worden hersteld.</p>
+<a class="indexterm" name="id-1.9.17.15.2"></a><a class="indexterm" name="id-1.9.17.15.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Waarschuwing:</strong></span> Verwijderde contacten en distributielijsten kunnen <span class="phrase"><strong>niet</strong></span> worden hersteld.</p>
 <p id="ox.appsuite.user.concept.contacts.manage.delete">U kan contacten of distributielijsten uit een adresboek verwijderen als u toestemming heeft om items uit dit adresboek te verwijderen. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">U kunt geen contacten verwijderen uit het adresboek <span class="guibutton"><strong>Alle gebruikers</strong></span>.</p></li>
@@ -55,9 +55,14 @@
 <p id="ox.appsuite.user.related.contacts.manage.delete">
         </p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">De <span class="phrase">Adresboek</span> werkbalk</a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">De  <span class="phrase">Adresboek</span> lijst</a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.delete">Zie ook: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Contacten beheren</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.export.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.export.html
index ecd2a34f0..5d713d7e7 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.export.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Contacten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Contacten exporteren</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">U kan contacten of distributielijsten exporteren naar deze formaten: </p>
+<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><a class="indexterm" name="id-1.9.17.13.4"></a><a class="indexterm" name="id-1.9.17.13.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">U kan contacten of distributielijsten exporteren naar deze formaten: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">vCard. U kan dit formaat bijvoorbeeld gebruiken om contacten uit te wisselen met andere e-mailapplicaties.</p></li>
 <li class="listitem"><p role="presentation">CSV U kan dit formaat gebruiken om contacten te exporteren naar spreadsheet formaten.</p></li>
@@ -76,7 +76,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.export"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">De <span class="phrase">Adresboek</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">Het <span class="phrase">Adresboek</span> mappenoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">De <span class="phrase">Adresboek</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">De  <span class="phrase">Adresboek</span> lijst</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -84,7 +88,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Versturen van contactgegevens als vCard</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importeren van contacten</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.9.17.12.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Persoonlijke Gegevens Downloaden</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.9.17.13.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Persoonlijke Gegevens Downloaden</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.export">Zie ook: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Contacten beheren</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.html
index 34a08e40e..10ad304ad 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem cap-webmail" id="id-1.9.17.4.1.1"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Versturen van e-mailberichten vanuit uit een adresboek</a></p></li>
 <li class="listitem cap-calendar" id="id-1.9.17.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Uitnodigen van contacten voor een afspraak</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Categorieën gebruiken voor contacten</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Verplaatsen of kopiëren van contacten</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Versturen van contactgegevens als vCard</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importeren van contacten</a></p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.import.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.import.html
index 8d7a7aa77..ec24dd6c3 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.import.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Contacten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importeren van contacten</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><a class="indexterm" name="id-1.9.17.11.5"></a><a class="indexterm" name="id-1.9.17.11.6"></a><a class="indexterm" name="id-1.9.17.11.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">U kan contacten importeren vanuit bestanden in de volgende formaten: </p>
+<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><a class="indexterm" name="id-1.9.17.12.6"></a><a class="indexterm" name="id-1.9.17.12.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">U kan contacten importeren vanuit bestanden in de volgende formaten: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">vCard. Opmerkingen: </p>
@@ -72,19 +72,15 @@
 <li class="step"><p role="presentation">Klik op <span class="guibutton"><strong>Importeren</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.contacts.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.contacts.manage.import"></p>
+<p class="title">Gebruikersinterface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">Het <span class="phrase">Adresboek</span> mappenoverzicht</a></p></li></ul>
+<p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Contacten exporteren</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Contacten Toevoegen</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Contacten exporteren</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Contacten Toevoegen</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.contacts.manage.import">Zie ook: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Contacten beheren</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.inviteappointment.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
index 6bc229bf8..352c5efeb 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Contacten beheren">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.manage.sendmail.html" title="Versturen van e-mailberichten vanuit uit een adresboek">
-<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Verplaatsen of kopiëren van contacten">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Categorieën gebruiken voor contacten">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Volgende</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Volgende</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -53,7 +53,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.inviteappointment"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">De <span class="phrase">Adresboek</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">De <span class="phrase">Adresboek</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">De  <span class="phrase">Adresboek</span> lijst</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">Het <span class="phrase">Adresboek</span> detailoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Nieuwe afspraken maken</a></p></li></ul>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.movecopy.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.movecopy.html
index 933e5e69c..e73b6da66 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.movecopy.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.movecopy.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Contacten beheren">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Uitnodigen van contacten voor een afspraak">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Categorieën gebruiken voor contacten">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html" title="Versturen van contactgegevens als vCard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Volgende</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Contacten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.movecopy">
 <div class="titlepage"><div><div><h3 class="title">Verplaatsen of kopiëren van contacten</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><a class="indexterm" name="id-1.9.17.9.4"></a><a class="indexterm" name="id-1.9.17.9.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">U kan contacten of distributielijsten verplaatsen of kopiëren naar een ander adresboek.</p>
+<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><a class="indexterm" name="id-1.9.17.10.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">U kan contacten of distributielijsten verplaatsen of kopiëren naar een ander adresboek.</p>
 <p id="ox.appsuite.user.hints.contacts.manage.movecopy">Opmerkingen: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">U kunt contacten of distributielijsten niet verplaatsen of kopiëren naar het adresboek <span class="guibutton"><strong>Alle gebruikers</strong></span>.</p></li>
@@ -61,7 +61,10 @@
 <p id="ox.appsuite.user.tip.contacts.manage.movecopy">Tip: U kan ook de geselecteerde objecten verplaatsen door deze van het mappenoverzicht naar een adresboek te slepen.</p>
 <p id="ox.appsuite.user.related.contacts.manage.movecopy"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">De <span class="phrase">Adresboek</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">De <span class="phrase">Adresboek</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">De  <span class="phrase">Adresboek</span> lijst</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.personal.html">Persoonlijke adresboeken toevoegen</a></p></li></ul>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.print.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.print.html
index 11034e1e3..d29507b83 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.print.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Contacten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Contacten afdrukken </h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">U kan een afdruk van de gegevens van een individueel contact of meerdere contacten maken. U kan kiezen tussen verschillende afdrukvormen.</p>
+<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">U kan een afdruk van de gegevens van een individueel contact of meerdere contacten maken. U kan kiezen tussen verschillende afdrukvormen.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.print.list">
 <p class="title">Het afdrukken van contactgegevens gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,9 +54,17 @@
 <p id="ox.appsuite.user.related.contacts.manage.print">
         </p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">Het <span class="phrase">Adresboek</span> mappenoverzicht</a>
+            </p>
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">De <span class="phrase">Adresboek</span> werkbalk</a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">De  <span class="phrase">Adresboek</span> lijst</a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.print">Zie ook: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Contacten beheren</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.sendmail.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.sendmail.html
index badc66a9b..36676185b 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.sendmail.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.sendmail.html
@@ -53,10 +53,14 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendmail"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">De <span class="phrase">Adresboek</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">De <span class="phrase">Adresboek</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">De  <span class="phrase">Adresboek</span> lijst</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">Het <span class="phrase">Adresboek</span> detailoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p></li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendmail">Zie ook: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Contacten beheren</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.sendvcard.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.sendvcard.html
index d28e3e3fc..63cc3d519 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.sendvcard.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.manage.sendvcard.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Contacten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.sendvcard">
 <div class="titlepage"><div><div><h3 class="title">Versturen van contactgegevens als vCard</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">U kan contacten of distributielijsten verzenden als een bijlage bij een e-mailbericht.</p>
+<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">U kan contacten of distributielijsten verzenden als een bijlage bij een e-mailbericht.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.sendvcard">
 <p class="title">Het versturen van contacten als vCard gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,12 +49,15 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendvcard"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">De <span class="phrase">Adresboek</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">De <span class="phrase">Adresboek</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">De  <span class="phrase">Adresboek</span> lijst</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Contacten exporteren</a></p></li>
-<li class="listitem cap-webmail" id="id-1.9.17.10.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p></li>
+<li class="listitem cap-webmail" id="id-1.9.17.11.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendvcard">Zie ook: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Contacten beheren</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.search.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.search.html
index 4d2ebd77f..dcfce9698 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.search.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Toon de contacten van een adresboek</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Categorieën gebruiken voor contacten</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.settings.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.settings.html
index 4ec827bb0..270f5c60a 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.settings.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.settings.html
@@ -60,7 +60,7 @@
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>namen. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a>
+<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>Namen. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Geeft de volgorde van de voor- en achternaam zoals contactpersonen worden getoond in het adresboek.</p></li></ul>
 <p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.useaddressbook.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.useaddressbook.html
index 988cd165d..5bd2a09cb 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.useaddressbook.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.useaddressbook.html
@@ -70,7 +70,7 @@
 <p> </p>
 <p class="title">Bovenliggende acties:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Deelnemers of bronnen toevoegen</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Het planningsoverzicht gebruiken</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Beheerde bronnen maken</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.useaddressdirectory.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.useaddressdirectory.html
index 311ff0389..b924977af 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.useaddressdirectory.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.useaddressdirectory.html
@@ -77,7 +77,7 @@
 <p id="ox.appsuite.user.related.contacts.useaddressdirectory"></p>
 <p class="title">Bovenliggende acties:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Deelnemers of bronnen toevoegen</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Het planningsoverzicht gebruiken</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Beheerde bronnen maken</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.view.haloview.html b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.view.haloview.html
index 5d6aa33b4..b6de9794e 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.view.haloview.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.contacts.view.haloview.html
@@ -48,11 +48,11 @@
 <li class="listitem"><p role="presentation">Selecteer een afspraak of taak in de <span class="phrase">Agenda</span> of <span class="phrase">Taken</span> app. Klik op een deelnemer in het detailoverzicht of in de pop-up.</p></li>
 </ul></p>
 <p role="presentation">Afhankelijk van de vermeldingen van de contactpersoon in het adresboek, worden deze gegevens weergegeven in een pop-up: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Een foto indien geüpload</p></li>
-<li class="listitem"><p role="presentation">Achternaam, voornaam</p></li>
-<li class="listitem"><p role="presentation">Zakelijke gegevens, indien ingevoerd</p></li>
+<li class="listitem"><p role="presentation">een foto indien geüpload</p></li>
+<li class="listitem"><p role="presentation">achternaam, voornaam</p></li>
+<li class="listitem"><p role="presentation">zakelijke gegevens, indien ingevoerd</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.4"><p role="presentation">Afhankelijk van de configuratie: De beschikbaarheid van het contact voor oproepen</p></li>
-<li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">Afhankelijk van de configuratie: Pictogrammen voor het communiceren met een contact: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">Afhankelijk van de configuratie: pictogrammen voor het communiceren met een contact: <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>E-mail</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>. Opent het venster voor het opstellen van een e-mail.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Bellen</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>. Opent een menu met functies voor bellen.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Uitnodigen</strong></span>  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.invite"><object type="image/svg+xml" data="../../images/calendar-plus.svg" height="15"></object></span>. Opent het venster voor het maken van een afspraak.</p></li>
@@ -62,7 +62,7 @@
 <li class="listitem"><p role="presentation">E-mailadres. Als u op een e-mailadres klikt wordt het scherm voor het maken van een nieuwe e-mail getoond.</p></li>
 <li class="listitem"><p role="presentation">Zakelijke en privé telefoonnummers. Als u op een nummer klikt, wordt er een functie voor bellen geopend, indien beschikbaar.</p></li>
 <li class="listitem"><p role="presentation">Zakelijke en privé adressen. In de adresboek-instellingen kan u instellen of een kaartendienst voor het weergeven van het adres moet worden gebruikt bij het klikken op een adres.</p></li>
-<li class="listitem"><p role="presentation">bijlagen</p></li>
+<li class="listitem"><p role="presentation">Bijlagen</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">Het adresboek waar de contactpersoon in opgeslagen is</p></li>
 <li class="listitem"><p role="presentation">Uw recente gesprekken met deze contactpersoon. Als u op een e-mail klikt, wordt de inhoud ervan in een pop-up weergegeven.</p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.accounts.edit.html b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
index 9efc4d955..849946cf1 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
@@ -94,7 +94,7 @@
               <a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Verzamelde Mail gebruiken</a>
             </p>
 <p role="presentation" class="cap-webmail">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Een afzenderadres selecteren</a>
+              <a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">selecteer een verzendadres</a>
             </p>
 <p role="presentation" class="cap-infostore">
               <a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Cloudopslag accounts toevoegen</a>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
index 58a30a439..bf573ad8b 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
@@ -64,7 +64,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Verzamelde Mail gebruiken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Een afzenderadres selecteren</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">selecteer een verzendadres</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.accounts.functionalmail">Zie ook: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Accounts Beheren</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.categories.html b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.categories.html
index 7a0435f01..c8e1f7241 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.categories.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.categories.html
@@ -32,15 +32,15 @@
   <h1 class="sr-only">Gegevensorganisatie en Delen</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.categories">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Categorieën beheren</h2></div></div></div>
-<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Leer hoe u <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categorieën</a> beheert waarmee u afspraken, contacten en taken kunt classificeren. Categorieën hebben de volgende eigenschappen: </p>
+<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Leer hoe u <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categorieën</a> beheert waarmee u e-mails, afspraken, contacten en taken kunt classificeren, onafhankelijk van de mappenstructuur. U kan bijvoorbeeld uw eigen categorieën  Categorieën hebben de volgende eigenschappen: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Een categorie bestaat uit een naam en een kleur.</p></li>
 <li class="listitem"><p role="presentation">Bij het zoeken naar objecten kunt u categorieën gebruiken als zoekfunctie. termen.</p></li>
 <li class="listitem"><p role="presentation">Afhankelijk van de configuratie zijn specifieke categorieën vooraf gedefinieerd. Dergelijke categorieën kunnen niet worden bewerkt of verwijderd.</p></li>
 <li class="listitem"><p role="presentation">U kunt eigen categorieën maken, bewerken en verwijderen.</p></li>
-<li class="listitem"><p role="presentation">U kunt een categorie of meerdere categorieën toe aan afspraken, contacten en taken en verwijder ze later.</p></li>
+<li class="listitem"><p role="presentation">U kunt een categorie of meerdere categorieën toewijzen aan afspraken, contacten en taken en deze later verwijderen.</p></li>
 </ul>
-<p> Opmerking: Deze categorieën kunnen niet gebruikt worden voor e-mails. Voor e-mails zijn er de Postvak IN-categorieën, zie <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Werken met Postvak IN-categorieën</a>.</p>
+<p> Opmerking: Voor e-mailberichten kan u ook inbox tabbladen gebruiken. Een specifieke inbox categorie kan worden toegewezen aan een e-mailbericht. De categorie is afhankelijke van de verzender, zie <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Werken met Postvak IN-categorieën</a>.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.categories">De volgende opties bestaan: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">maak een eigen categorie aan</p></li>
@@ -51,9 +51,15 @@
 <p class="title">Hoe uw categorieën te beheren:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step help-hide-inline">
+<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> rechts van de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>. Het <span class="guilabel"><strong>Instellingen</strong></span> scherm opent.</p>
+<p role="presentation">Klik op <span class="guibutton"><strong>Standaard</strong></span> in het linkerpaneel. Klik op <span class="guibutton"><strong>Categorieën beheren</strong></span> onder <span class="guibutton"><strong>Geavanceerde instellingen</strong></span></p>
+<p role="presentation">U kan ook één van de volgende methoden gebruiken: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Selecteer een e-mailbericht. Klik het <span class="guibutton"><strong>Categorie toevoegen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> in de werkbalk. Selecteer <span class="guibutton"><strong>Categorieën beheren</strong></span>.</p></li>
+<li class="listitem">
 <p role="presentation">Open het bewerkingsvenster voor afspraken, contacten of taken door een afspraak, een contact of een taak aan te maken of te bewerken.</p>
 <p role="presentation">Klik hiervoor op <span class="guibutton"><strong>Categorie toevoegen</strong></span> naast <span class="guibutton"><strong>Categorieën</strong></span>. Selecteer <span class="guibutton"><strong>Categorieën beheren</strong></span>.</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">U kunt ook de knop <span class="guibutton"><strong>Categorieën beheren</strong></span> gebruiken in de algemene instellingen onder <span class="guibutton"><strong>Geavanceerde instellingen</strong></span>.</p></li></ul>
+</li>
+</ul></p>
 <p role="presentation">Het <span class="guilabel"><strong>Categorieën beheren</strong></span> scherm wordt geopend.</p>
 </li>
 <li class="step">
@@ -69,41 +75,22 @@
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Nieuwe afspraken maken</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Nieuw contact aanmaken</a>
+<p role="presentation" class="cap-webmail">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">PGP inline standaard ingesteld voor nieuwe berichten</a>
           </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Nieuwe taken aanmaken</a>
-          </p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Afspraken bewerken</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Categorieën gebruiken voor afspraken</a>
           </p>
 <p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Contacten of Distributielijsten bewerken</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Categorieën gebruiken voor contacten</a>
           </p>
 <p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Taken bewerken</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Categorieën gebruiken voor taken</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Algemene instellingen aanpassen</a>
           </p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Zoeken naar Afspraken</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Zoeken naar Contacten</a>
-          </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Zoeken naar Taken</a>
-          </p>
-</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.deputy.add.html b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.deputy.add.html
index 7d4cab82a..0558dcd2c 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.deputy.add.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.deputy.add.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Vertegenwoordigers beheren">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Vertegenwoordigers beheren">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="beheer vertegenwoordigers">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="beheer vertegenwoordigers">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html" title="vertegenwoordigers bekijken, bewerken, verwijderen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Gegevensorganisatie en Delen</h1>
-<h2 class="sr-only">Vertegenwoordigers beheren</h2>
+<h2 class="sr-only">beheer vertegenwoordigers</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.add">
 <div class="titlepage"><div><div><h3 class="title">vertegenwoordigers toevoegen</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.8.2"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.add">De volgende opties bestaan: </p>
@@ -86,7 +86,7 @@
             </p></li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Hoofdonderwerp: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vertegenwoordigers beheren</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Hoofdonderwerp: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">beheer vertegenwoordigers</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.deputy.edit.html b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
index da5ddb1e6..ba8dbd484 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Vertegenwoordigers beheren">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="beheer vertegenwoordigers">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.add.html" title="vertegenwoordigers toevoegen">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.accounts.html" title="Accounts Beheren">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Gegevensorganisatie en Delen</h1>
-<h2 class="sr-only">Vertegenwoordigers beheren</h2>
+<h2 class="sr-only">beheer vertegenwoordigers</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.edit">
 <div class="titlepage"><div><div><h3 class="title">vertegenwoordigers bekijken, bewerken, verwijderen</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.9.2"></a><a class="indexterm" name="id-1.12.6.9.3"></a><a class="indexterm" name="id-1.12.6.9.4"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.edit">De volgende opties bestaan: </p>
@@ -81,7 +81,7 @@
             </p></li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Hoofdonderwerp: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vertegenwoordigers beheren</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Hoofdonderwerp: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">beheer vertegenwoordigers</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.deputy.html b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.deputy.html
index 526c2b744..fc2d005ea 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.deputy.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.deputy.html
@@ -1,7 +1,7 @@
 <html lang="nl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Vertegenwoordigers beheren</title>
+<title>beheer vertegenwoordigers</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Gegevensorganisatie en Delen</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.deputy">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Vertegenwoordigers beheren</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">beheer vertegenwoordigers</h2></div></div></div>
 <a class="indexterm" name="id-1.12.6.2"></a><a class="indexterm" name="id-1.12.6.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.deputy">U kunt andere gebruikers aanwijzen om op te treden als uw <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">vertegenwoordiger</a>. U kunt een of meerdere vertegenwoordigers verschillende machtigingsniveaus verlenen om de e-mailcommunicatie en het plannen van afspraken in uw naam af te handelen.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.deputy">De volgende opties bestaan: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.sharing.examples.html b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
index 0293868aa..80255987b 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.dataorganisation.sharing.html" title="Gegevens Delen">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html" title="Welke rechten kunnen worden gebruikt?">
-<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Vertegenwoordigers beheren">
+<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="beheer vertegenwoordigers">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.sharing.share.html b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.sharing.share.html
index c6b9247e9..f2813df77 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.sharing.share.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.dataorganisation.sharing.share.html
@@ -37,7 +37,7 @@
 <p class="title">De volgende opties bestaan:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">E-mailmappen </p>
+<p role="presentation">e-mailmappen </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">De <span class="guibutton"><strong>Postvk in</strong></span> map en alle mappen en submappen in <span class="guibutton"><strong>Mijn mappen</strong></span> kunnen gedeeld worden met alle interne gebruikers met leesrechten.</p>
@@ -48,7 +48,7 @@
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">agenda </p>
+<p role="presentation">Agenda </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">De mappen in <span class="guibutton"><strong>Mijn agenda's</strong></span> kunnen gedeeld worden met interne gebruikers met lees- of bewerkingsrechten.</p></li>
 <li class="listitem"><p role="presentation">De <span class="guibutton"><strong>Mijn agenda's</strong></span> map kan niet worden gedeeld.</p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.content.html b/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.content.html
index 26ce20a23..ca77ef51c 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.content.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.content.html
@@ -74,6 +74,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Bekijken van <span class="phrase">Bestanden</span> mapinhoud</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Tonen van de inhoud van een bestand</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Bestanden en <span class="phrase">Bestanden</span> Mappen organiseren</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gegevens Beheren met Mappen</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Gegevens Delen</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.foldertree.html b/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.foldertree.html
index b81fac380..cfcb2f089 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.foldertree.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.foldertree.html
@@ -71,6 +71,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">Bestanden</span>: Mappen aanmaken</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">Abonneren op publieke en gedeelde <span class="phrase">Bestanden</span> mappen</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Bestanden en <span class="phrase">Bestanden</span> Mappen organiseren</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gegevens Beheren met Mappen</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Gegevens Delen</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.toolbar.html b/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.toolbar.html
index 16e9f48a1..ad53542cd 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.toolbar.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.toolbar.html
@@ -74,20 +74,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Bekijken van <span class="phrase">Bestanden</span> mapinhoud</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Tonen van de inhoud van een bestand</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.send.html">Bestanden versturen als e-mailbijlage</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Bewerken van bestandsnamen </a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Beschrijvingen aanmaken of bewerken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.move.html">Bestanden of <span class="phrase">Bestanden</span> mappen verplaatsen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.copy.html">Bestanden kopiëren</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Bestanden opslaan als PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Bestanden afdrukken als PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.addportal.html">Bestanden toevoegen aan het portaal</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.favorite.html">Bestanden en <span class="phrase">Bestanden</span> mappen toevoegen aan Favorieten</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.delete.html">Bestanden of <span class="phrase">Bestanden</span> mappen verwijderen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.lock.html">Bestanden blokkeren of deblokkeren</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Werken met versies</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Bestanden en <span class="phrase">Bestanden</span> Mappen organiseren</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Bestanden Coderen of Decoderen</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.toolbar">Zie ook: <a class="xref" href="ox.appsuite.user.sect.drive.gui.html">De <span class="phrase">Bestanden</span> Componenten</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.viewer.html b/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.viewer.html
index 29d09ea26..ab828ec97 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.viewer.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.drive.gui.viewer.html
@@ -105,23 +105,9 @@
               <a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">Een presentatie houden</a>
             </p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Bewerken van bestandsnamen </a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Beschrijvingen aanmaken of bewerken</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Bestanden opslaan als PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Bestanden afdrukken als PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Werken met versies</a>
-            </p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Bestanden en <span class="phrase">Bestanden</span> Mappen organiseren</a>
+            </p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-share_links cap-share_mail_attachments">
               <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Gegevens Delen</a>
             </p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.drive.settings.html b/help/l10n/nl_NL/ox.appsuite.user.sect.drive.settings.html
index b59cba861..5eb583fd3 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.drive.settings.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.drive.settings.html
@@ -51,13 +51,13 @@
 </div>
 <p id="ox.appsuite.user.reference.drive.settings">Afhankelijk van de configuratie zijn de volgende instellingen beschikbaar.</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">bestanden toevoegen</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">Bestanden toevoegen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.versionhistory">Versie geschiedenis</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.advanced">Geavanceerde instellingen</a></p></li>
 </ul>
 <p>Zie ook: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Zoeken naar instellingen</a></p>
 <p id="ox.appsuite.user.reference.drive.settings.adddrive"></p>
-<h3 class="title">bestanden toevoegen</h3>
+<h3 class="title">Bestanden toevoegen</h3>
 <p><a class="indexterm" name="id-1.11.17.6.2"></a>Bepaald of een nieuw bestand óf een nieuwe versie van een bestaand bestand met de zelfde naam wordt gemaakt. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><b>Nieuwe versie toevoegen. </b>Een nieuwe versie van het bestand wordt gemaakt.</p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.accounts.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.accounts.html
index 380949408..5b4c7792a 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.accounts.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.accounts.html
@@ -76,7 +76,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Verzamelde Mail gebruiken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Een afzenderadres selecteren</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">selecteer een verzendadres</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Antwoordadres instellen</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.attachments.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.attachments.html
index 4555f102b..6a4bdaaaa 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.attachments.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="E-mail">
 <link rel="prev" href="ox.appsuite.user.sect.email.view.html" title="E-mailberichten bekijken">
-<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
+<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.deputy.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.deputy.html
index 061c4843a..49f5b55e5 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.deputy.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.deputy.html
@@ -91,12 +91,12 @@
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Afspraken maken, bewerken of beheren als plaatsvervanger</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vertegenwoordigers beheren</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">beheer vertegenwoordigers</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.email.deputy">Zie ook: <a class="xref" href="ox.appsuite.user.chap.email.html"><i>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.create.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.create.html
index ae3d81120..87f33a225 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.create.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.create.html
@@ -82,6 +82,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Verzenden</strong></span>. Verzend de E-mail naar de ingevoerde ontvangers.</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.13.5.1.5"><p role="presentation"><span class="guibutton"><strong>Later verzenden</strong></span>. Opent een menu om waar u het verzendmoment kan instellen.</p></li>
 <li class="listitem">
 <p role="presentation">Knoppenbalk </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -115,17 +116,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">Het bewerkingscherm</a></p></li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Beantwoorden van e-mailberichten</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">E-mailberichten doorsturen</a></p>
-<p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">AI functies gebruiken bij het opstellen van e-mailberichten</a></p>
-<p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">E-mails verzenden of ontvangen als plaatsvervanger</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 <p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Gecodeerde e-mailberichten verzenden</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.email.gui.create">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">De <span class="phrase">E-mail</span> Componenten</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.detailview.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.detailview.html
index 3aa0a7bc2..333cb6643 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.detailview.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.detailview.html
@@ -61,6 +61,7 @@
 <li class="listitem">
 <p role="presentation">Afhankelijk van de configuratie zijn één of meer van de volgende functies beschikbaar: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Categorieën instellen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Opent een menu met functies voor het toewijzen en beheren van categorieën.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Stel kleur in</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Opent een menu waarmee u een kleur kan toewijzen aan een label bij het e-mailbericht.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Vlaggen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Markeert de e-mail met vlaggen.</p></li>
 </ul>
@@ -78,6 +79,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation">Als een e-mailbericht met een gekoppelde bijlage wordt geselecteerd vanuit de <span class="guibutton"><strong>Verzonden items</strong></span> map, wordt informatie over de bijlage getoond bovenaan het e-mailbericht.</p></li>
+<li class="listitem"><p role="presentation">Afhankelijk van de configuratie: Indien beschikbaar worden de toegewezen categorieën getoond.</p></li>
 <li class="listitem">
 <p role="presentation">E-mailtekst</p>
 <p role="presentation">Quotes uit vorige e-mailberichten worden gemarkeerd aan het begin van de regel.</p>
@@ -93,15 +95,11 @@
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">De <span class="phrase">E-mail</span> pop-up</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">Het e-mailbewerkingsscherm</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-mailberichten bekijken</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Beantwoorden van e-mailberichten</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Tonen of opslaan van e-mailbijlagen</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.detailview">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">De <span class="phrase">E-mail</span> Componenten</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.foldertree.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.foldertree.html
index 118a9398d..339cca695 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.foldertree.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.foldertree.html
@@ -52,7 +52,9 @@
 </ul>
 <p>Afhankelijk van de configuratie en e-mailinstellingen zijn eventueel meer mappen beschikbaar: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Mappen voor ongelezen e-mails, mappen voor gemarkeerde berichten</p></li>
+<li class="listitem"><p role="presentation">Map voor gemarkeerde berichten</p></li>
+<li class="listitem"><p role="presentation">Map voor ongelezen e-mails</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.7.5.2.3"><p role="presentation">Map voor berichten die later worden verzonden</p></li>
 <li class="listitem"><p role="presentation">Gedeelde en publieke e-mailmappen waarop u een abonnement heeft.</p></li>
 <li class="listitem"><p role="presentation">Mappen van functionele accounts die aan u zijn toegewezen door de beheerder.</p></li>
 </ul>
@@ -65,10 +67,10 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-mailberichten bekijken</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">E-mailmappen toevoegen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">In- en uitschakelen van functionele e-mailaccounts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">In- en uitschakelen van functionele e-mailaccounts</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gegevens Beheren met Mappen</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Gegevens Delen</a></p>
 </li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.html
index f9b705be6..fd25af5bc 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.html
@@ -43,7 +43,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">De Nieuwe e-mail knop</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Het <span class="phrase">E-mail</span> mappenoverzicht</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">De <span class="phrase">E-mail</span> tabbladenbalk</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">De Postvak IN-categorieën balk</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">De <span class="phrase">E-mail</span> pop-up</a></p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.list.html
index 751e8c26c..1506d5892 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.list.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.list.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="De E-mail Componenten">
-<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="De E-mail tabbladenbalk">
+<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="De Postvak IN-categorieën balk">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.detailview.html" title="Het E-mail detailoverzicht">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -50,6 +50,7 @@
 <li class="listitem"><p role="presentation">De volgende details worden voor elk e-mailbericht getoond: Afzender, onderwerp, ontvangstdatum. Ongelezen e-mailberichten zijn gemarkeerd met het <span class="guibutton"><strong>Ongelezen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span>.</p></li>
 <li class="listitem"><p role="presentation">Een tooltip op de naam van een afzender toont het e-mailadres van de afzender.</p></li>
 <li class="listitem"><p role="presentation">Indien beschikbaar wordt additionele informatie getoond: bijlage pictogrammen, gekleurde labels of vlaggen, aantal e-mailberichten in de <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">conversatie</a> en prioriteit.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.10.5.1.7"><p role="presentation">Indien beschikbaar worden de toegewezen categorieën getoond. In de e-mailinstellingen kan u opgeven of categorieën getoond moeten worden in het lijstoverzicht.</p></li>
 <li class="listitem"><p role="presentation">Gecodeerde e-mailberichten zijn gemarkeerd met het Gecodeerd pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.encrypted"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span> .</p></li>
 <li class="listitem">
 <p role="presentation">Als uw afwezigheidsmelding actief is, wordt er bovenaan het lijstoverzicht een melding getoond.</p>
@@ -67,12 +68,9 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">Het <span class="phrase">E-mail</span> instellingenmenu</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-mailberichten bekijken</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.list">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">De <span class="phrase">E-mail</span> Componenten</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.new.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.new.html
index b1c7ce1a6..1c6298d3a 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.new.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.new.html
@@ -51,7 +51,7 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">E-mailaccounts toevoegen</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Tonen of opslaan van e-mailbijlagen</a></p>
 </li></ul>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.popup.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.popup.html
index c09f0d759..fc5164f68 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.popup.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.popup.html
@@ -69,8 +69,7 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">De verzender of een andere ontvanger bellen</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">De verzender of een andere ontvanger bellen</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Contacten tonen in het halo overzicht</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.popup">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">De <span class="phrase">E-mail</span> Componenten</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.settingsmenu.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.settingsmenu.html
index 1b16898f3..765a0a67b 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.settingsmenu.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.settingsmenu.html
@@ -57,7 +57,6 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">E-mailaccounts toevoegen</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Tonen of opslaan van e-mailbijlagen</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.tabs.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.tabs.html
index 6d6232b4e..244779886 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.tabs.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.tabs.html
@@ -1,7 +1,7 @@
 <html lang="nl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>De E-mail tabbladenbalk</title>
+<title>De Postvak IN-categorieën balk</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
@@ -37,14 +37,14 @@
   </h1>
 <h2 class="sr-only">De <span class="phrase">E-mail</span> Componenten</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.tabs">
-<div class="titlepage"><div><div><h3 class="title">De <span class="phrase">E-mail</span> tabbladenbalk</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">De Postvak IN-categorieën balk</h3></div></div></div>
 <a class="indexterm" name="id-1.7.8.9.2"></a><p id="ox.appsuite.user.concept.email.gui.tabs">Toont de voorgedefinieerde Postvak IN-tabbladen voor de e-mailberichten in de <span class="guibutton"><strong>Postvak In</strong></span> map. Dit maakt het mogelijk om inkomende e-mailberichten toe te wijzen aan specifieke tabbladen, geordend op verzender.</p>
 <p id="ox.appsuite.user.reference.email.gui.tabs">
         </p>
 <p class="title">Opmerkingen:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Afhankelijk van de configuratie zijn Postvak IN-tabbladen mogelijk niet beschikbaar.</p></li>
-<li class="listitem"><p role="presentation">Als Postvak IN-tabbladen beschikbaar zijn, kunt u de Postvak IN-tabbladbalk tonen of verbergen. Klik hiervoor op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Postvak In categorieën</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Als Postvak-In categorieën beschikbaar zijn, kunt u de Postvak-In categorieën tonen of verbergen. Klik hiervoor op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Postvak-In categorieën</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">Het aantal Postvak IN-tabbladen en hun namen en volgorde zijn vooraf ingesteld. Afhankelijk van de configuratie kunnen sommige Postvak IN-tabbladen worden hernoemd of uitgeschakeld.</p></li>
 </ul>
 <p>
@@ -52,14 +52,9 @@
 <p id="ox.appsuite.user.related.email.gui.tabs">
         </p>
 <p class="title">Zie ook:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Werken met Postvak IN-categorieën</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a>
-            </p></li>
-</ul>
+            </p></li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.reference.email.gui.tabs.parent">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">De <span class="phrase">E-mail</span> Componenten</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.toolbar.html
index 7d1d387f1..68aa7798f 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.toolbar.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.gui.toolbar.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="De E-mail Componenten">
 <link rel="prev" href="ox.appsuite.user.sect.email.gui.foldertree.html" title="Het E-mail mappenoverzicht">
-<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="De E-mail tabbladenbalk">
+<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="De Postvak IN-categorieën balk">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -47,7 +47,8 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Archief</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.archive"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span>. Archiveer de door u geselecteerde e-mailberichten.</p></li>
 <li class="listitem"><p role="presentation">Pictogrammen voor het <span class="guibutton"><strong>beantwoorden van</strong></span> en het <span class="guibutton"><strong>doorsturen van</strong></span> de geselecteerde e-mailberichten: <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">Afhankelijk van de configuratie: <span class="guibutton"><strong>AI integratie</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>. Opent een menu met AI functies voor het bewerken van de berichtinhoud.</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Categorie instellen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Opent een menu waarmee u een e-mail naar een categorie kunt verplaatsen. Dit pictogram is alleen beschikbaar als de tabbladenbalk van het Postvak IN wordt weergegeven.</p></li>
+<li class="listitem"><p role="presentation">Afhankelijk van de configuratie: <span class="guibutton"><strong>Postvak-In categorie instellen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.inboxcategories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Opent een menu waarmee u een e-mail naar een Postvak-In categorie kunt verplaatsen. Dit pictogram is alleen beschikbaar als de tabbladenbalk wordt weergegeven.</p></li>
+<li class="listitem"><p role="presentation">Afhankelijk van de configuratie: <span class="guibutton"><strong>Categorie instellen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Opent een menu voor het toewijzen van een categorie of het beheren van categorieën.</p></li>
 <li class="listitem"><p role="presentation">Afhankelijk van de configuratie: <span class="guibutton"><strong>Kleur instellen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Opent een menu waarmee u een gekleurd label aan de geselecteerde e-mails kunt toewijzen.</p></li>
 <li class="listitem"><p role="presentation">Afhankelijk van de configuratie: <span class="guibutton"><strong>Markeren</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Markeert de e-mail.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Verplaatsen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.moveto"><object type="image/svg+xml" data="../../images/folder-symlink.svg" height="15"></object></span>. Verplaatst de geselecteerde e-mails naar een andere map.</p></li>
@@ -61,25 +62,12 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">De <span class="phrase">E-mail</span> tabbladenbalk</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Beantwoorden van e-mailberichten</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">E-mailberichten doorsturen</a></p>
 </li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">AI functies gebruiken bij het beantwoorden van e-mailberichten</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Verplaatsen of kopiëren van e-mailberichten</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Markeren van e-mailberichten als gelezen of ongelezen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">E-mailberichten Categoriseren</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">E-mailbron weergeven</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Concept e-mailberichten gebruiken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">E-mailherinneringen aanmaken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">E-mail toevoegen aan het portaal</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">E-mailberichten opslaan</a></p>
-<p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">E-mailberichten exporteren als PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">E-mailberichten Afdrukken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-mailberichten verwijderen</a></p>
-</li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">AI functies gebruiken bij het beantwoorden van e-mailberichten</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.toolbar">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">De <span class="phrase">E-mail</span> Componenten</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.addportal.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.addportal.html
index 7bca559fb..c023db8c9 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.addportal.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.addportal.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">E-mailberichten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.addportal">
 <div class="titlepage"><div><div><h3 class="title">E-mail toevoegen aan het portaal</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.15.2"></a><a class="indexterm" name="id-1.7.15.15.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">U kan een e-mailbericht toevoegen als widget op het Portaal.</p>
+<a class="indexterm" name="id-1.7.15.16.2"></a><a class="indexterm" name="id-1.7.15.16.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">U kan een e-mailbericht toevoegen als widget op het Portaal.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.addportal">
 <p class="title">E-mail toevoegen als portaalvlak gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.addportal"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.add.html">Portaal widgets toevoegen</a></p></li></ul>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.archive.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.archive.html
index 1fd95f0b3..52636b4f6 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.archive.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.archive.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">E-mailberichten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.archive">
 <div class="titlepage"><div><div><h3 class="title">E-mailberichten Archiveren</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.20.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">Als u e-mailberichten archiveert, worden deze e-mailberichten verplaatst naar de <span class="guibutton"><strong>Archief</strong></span> map. De <span class="guibutton"><strong>Archief</strong></span> map bevat een submap voor elk kalenderjaar. De gearchiveerde e-mailberichten worden in deze map opgeslagen geordend op het jaar van ontvangst. De <span class="guibutton"><strong>Archief</strong></span> map wordt aangemaakt als u deze functie voor het eerst gebruikt. De volgende opties zijn beschikbaar: </p>
+<a class="indexterm" name="id-1.7.15.21.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">Als u e-mailberichten archiveert, worden deze e-mailberichten verplaatst naar de <span class="guibutton"><strong>Archief</strong></span> map. De <span class="guibutton"><strong>Archief</strong></span> map bevat een submap voor elk kalenderjaar. De gearchiveerde e-mailberichten worden in deze map opgeslagen geordend op het jaar van ontvangst. De <span class="guibutton"><strong>Archief</strong></span> map wordt aangemaakt als u deze functie voor het eerst gebruikt. De volgende opties zijn beschikbaar: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Archiveer de e-mailberichten uit een map die ouder zijn dan 90 dagen</p></li>
 <li class="listitem"><p role="presentation">Archiveer individuele e-mailberichten</p></li>
@@ -61,14 +61,16 @@
 </li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.archive">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.archive"></p>
+<p class="title">Gebruikersinterface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Het <span class="phrase">E-mail</span> mappenoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p>
+</li></ul>
+<p> </p>
 <p class="title">Zie ook:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">E-mailberichten Afdrukken</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">E-mailberichten Afdrukken</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.archive">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.categories.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.categories.html
new file mode 100644
index 000000000..d157e5c0c
--- /dev/null
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.categories.html
@@ -0,0 +1,95 @@
+<html lang="nl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>PGP inline standaard ingesteld voor nieuwe berichten</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Gebruikershandleiding">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-mailberichten beheren">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Adressen verzamelen">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="E-mailberichten Categoriseren">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Terug</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Volgende</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">E-mail</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">E-mailberichten beheren</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">PGP inline standaard ingesteld voor nieuwe berichten</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.categories">Om e-mailberichten onafhankelijk van mappen te organiseren kan u gebruik maken van categorieën. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">U kan e-mailberichten markeren met categorieën.</p></li>
+<li class="listitem"><p role="presentation">U kan alle e-mailberichten tonen die zijn gemarkeerd met een specifieke categorie.</p></li>
+</ul>
+<p> U kan uw eigen categorieën maken, bewerken en verwijderen, zie <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>.</p>
+<p id="ox.appsuite.user.tip.email.manage.categories">Onafhankelijk van categorieën kan u postvak-in categorieën gebruiken. Met postvak-in categorieën kan u e-mails organiseren op verzender, zie <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Werken met Postvak IN-categorieën</a>.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.mark">
+<p class="title">E-mailberichten toewijzen aan een categorie gaat als volgt:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selecteer één of meerdere e-mailberichten.</p></li>
+<li class="step">
+<p role="presentation">Klik op het <span class="guibutton"><strong>Categorie instellen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.mark.add"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> in de werkbalk. Selecteer een categorie.</p>
+<p role="presentation">Om een categorie van een e-mailbericht te verwijderen, klikt u op categorie.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.view">
+<p class="title">E-mailberichten toont u op de volgende manier met een specifieke categorie:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selecteer een e-mailbericht welke is gemarkeerd met een categorie.</p></li>
+<li class="step"><p role="presentation">Klik op de categorie in het detailoverzicht.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Resultaat: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Het lijstoverzicht toont alle e-mailberichten die zijn gemarkeerd met deze categorie.</p></li>
+<li class="listitem"><p role="presentation">Voor elk e-mailbericht wordt de map getoond waar de mail wordt getoond.</p></li>
+<li class="listitem"><p role="presentation">Om vorige lijst te tonen, klikt u op het <span class="guibutton"><strong>Zoeken annuleren</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>  in het zoekveld.</p></li>
+</ul>
+          <p>Tip: U kan ook de zoekfunctie gebruiken om te zoeken naar een categorie met de zoekfunctie.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.categories"></p>
+<p class="title">Gebruikersinterface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p>
+</li></ul>
+<p> </p>
+<p class="title">Zie ook:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">Zoeken naar E-mailberichten</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Categorieën gebruiken voor afspraken</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Categorieën gebruiken voor contacten</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Categorieën gebruiken voor taken</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.categories">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.collectaddress.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.collectaddress.html
index 889b71b6e..1e23a9320 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.collectaddress.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.collectaddress.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-mailberichten beheren">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.mark.html" title="Markeren van e-mailberichten als gelezen of ongelezen">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="E-mailberichten Categoriseren">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="PGP inline standaard ingesteld voor nieuwe berichten">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.mark.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Volgende</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.categories.html">Volgende</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -40,7 +40,7 @@
 <div class="titlepage"><div><div><h3 class="title">Adressen verzamelen</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.10.2"></a><a class="indexterm" name="id-1.7.15.10.3"></a><p id="ox.appsuite.user.concept.email.manage.collectaddress">U heeft de volgende mogelijkheden: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Automatisch nieuwe e-mailcontacten verzamelen bij het verzenden of lezen van e-mailberichten door deze functie inschakelen bij de E-mail instellingen.</p></li>
+<li class="listitem"><p role="presentation">Automatisch nieuwe e-mailcontacten verzamelen bij het verzenden of lezen van e-mailberichten door deze functie in te schakelen bij de e-mailinstellingen.</p></li>
 <li class="listitem"><p role="presentation">Handmatig E-mailadressen toevoegen aan het adresboek</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.collectaddress">
@@ -56,16 +56,10 @@
           <p>Opmerking: Deze functie is alleen beschikbaar voor nieuwe contactpersonen.</p>
         </div>
 </div>
-<p role="presentation" class="cap-contacts">
-        <p class="title">Zie ook:</p><ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Nieuw contact aanmaken</a>
-            </p></li>
-</ul>
-      </p>
+<p role="presentation" class="cap-contacts"><p class="title">Gebruikersinterface:</p><ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p></li></ul> <p class="title">Zie ook:</p><ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Nieuw contact aanmaken</a></p></li>
+</ul></p>
 <p id="ox.appsuite.user.parent.email.manage.collectaddress">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.delete.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.delete.html
index 64abb9883..33e85a8d3 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.delete.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.delete.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-mailberichten beheren">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.archive.html" title="E-mailberichten Archiveren">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="E-mailmappen opschonen">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.recover.html" title="E-mailberichten herstellen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.archive.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Volgende</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.recover.html">Volgende</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -38,17 +38,17 @@
 <h2 class="sr-only">E-mailberichten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">E-mailberichten verwijderen</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.21.2"></a><a class="indexterm" name="id-1.7.15.21.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">U heeft de volgende mogelijkheden: </p>
+<a class="indexterm" name="id-1.7.15.22.2"></a><a class="indexterm" name="id-1.7.15.22.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">U heeft de volgende mogelijkheden: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Bepaal of e-mails naar de prullenbak worden verplaatst of permanent worden verwijderd wanneer ze worden verwijderd.</p>
-<p role="presentation">E-mails die naar de prullenbak worden verplaatst, kunnen worden hersteld.</p>
+<p role="presentation">U kan bepalen of e-mails naar de prullenbak worden verplaatst of permanent worden verwijderd als u kiest voor verwijderen. </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">E-mails die naar de prullenbak worden verplaatst, kunnen worden hersteld.</p></li>
+<li class="listitem"><p role="presentation"><span class="cap-dumpster">Permanent verwijderde e-mailberichten kunnen binnen 14 dagen worden hersteld. Na deze periode: </span> Permanent verwijderde e-mailberichten kunnen <span class="phrase"><strong>niet</strong></span> worden hersteld.</p></li>
+</ul>
 </li>
-<li class="listitem"><p role="presentation">Verwijder individuele e-mailberichten of een complete e-mailconversaties. </p></li>
-<li class="listitem"><p role="presentation">Verwijder alle e-mailberichten van een e-mailmap</p></li>
-<li class="listitem"><p role="presentation">Herstel e-mailberichten uit de prullenbak.</p></li>
-<li class="listitem"><p role="presentation">E-mailberichten uit de prullenbak definitief verwijderen.</p></li>
-<li class="listitem"><p role="presentation">Verwijder definitief alle e-mails uit de prullenbak door de prullenbak te legen.</p></li>
+<li class="listitem"><p role="presentation">U kan individuele e-mailberichten verwijderen of een complete e-mailconversatie.</p></li>
+<li class="listitem"><p role="presentation">U kan alle e-mailberichten uit een e-mailmap verwijderen.</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.delete.setting">
 <p class="title">Hoe te bepalen of e-mails naar de prullenbak worden verplaatst of permanent worden verwijderd wanneer ze worden verwijderd.</p>
@@ -65,21 +65,21 @@
 <li class="listitem"><p role="presentation">Als e-mails naar de prullenbak moeten worden verplaatst, schakelt u <span class="guibutton"><strong>Verwijderde e-mails permanent verwijderen</strong></span> uit.</p></li>
 <li class="listitem">
 <p role="presentation">Als e-mails permanent moeten worden verwijderd, schakelt u <span class="guibutton"><strong>Verwijderde e-mails permanent verwijderen</strong></span> in.</p>
-<p role="presentation"><span class="phrase"><strong>Waarschuwing:</strong></span> Permanent verwijderde e-mailberichten kunnen <span class="phrase"><strong>niet</strong></span> hersteld worden.</p>
+<p role="presentation"><span class="phrase"><strong>Waarschuwing:</strong></span> Afhankelijk van de configuratie kunnen permanent verwijderde e-mailberichten <span class="phrase"><strong>niet</strong></span> hersteld worden.</p>
 </li>
 </ul></p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.delete">
-<p class="title">Een e-mailbericht verwijderen gaat als volgt:</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.single">
+<p class="title">Individuele e-mailberichten verwijderen gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Selecteer één of meerdere e-mailberichten.</p></li>
 <li class="step">
-<p role="presentation">Klik op het <span class="guibutton"><strong>Verwijderen</strong></span> pictogram<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in de werkbalk.</p>
+<p role="presentation">Klik op het <span class="guibutton"><strong>Verwijderen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in de werkbalk.</p>
 <p role="presentation">Of: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">U kan ook de [Del] of [Backspace] toetsen op het toetsenbord gebruiken.</p></li>
 <li class="listitem"><p role="presentation">Klik in het contextmenu van een e-mail op <span class="guibutton"><strong>Verwijderen</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Als u een enkele e-mail hebt geselecteerd, gebruik dan het <span class="guibutton"><strong>Verwijderen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in de detailweergave.</p></li>
+<li class="listitem"><p role="presentation">Als u een enkele e-mail hebt geselecteerd, gebruik dan het <span class="guibutton"><strong>Verwijderen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in de detailweergave.</p></li>
 </ul></p>
 </li>
 </ol></div>
@@ -87,7 +87,7 @@
           <p>Resultaat: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Als de instelling <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Verwijderde e-mails permanent verwijderen</strong></span></a> is uitgeschakeld:</p>
+<p role="presentation">Als de instelling <span class="guibutton"><strong>Verwijderde e-mails permanent verwijderen</strong></span> is uitgeschakeld:</p>
 <p role="presentation">De e-mails worden verplaatst naar de map Prullenbak.</p>
 </li>
 <li class="listitem">
@@ -97,17 +97,17 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptyfolder">
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.emptyfolder">
 <p class="title">Alle e-mailberichten uit een map verwijderen gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Vanuit het mappenoverzicht, selecteert u de map waaruit u de e-mailberichten wilt verwijderen.</p></li>
 <li class="step">
 <p role="presentation">Gebruik één van de volgende methoden: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Klik op het <span class="guibutton"><strong>Acties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> naast de mapnaam.</p></li>
-<li class="listitem"><p role="presentation">Klik op het <span class="guibutton"><strong>Meer acties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> boven de lijst.</p></li>
+<li class="listitem"><p role="presentation">Klik op het <span class="guibutton"><strong>Acties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> naast de mapnaam.</p></li>
+<li class="listitem"><p role="presentation">Klik op het <span class="guibutton"><strong>Meer acties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> boven de lijst.</p></li>
 </ul></p>
 <p role="presentation">Klik op de <span class="guibutton"><strong>Alle berichten verwijderen</strong></span> knop.</p>
-<p role="presentation"><span class="phrase"><strong>Waarschuwing:</strong></span> als de instelling <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Verwijderde e-mails permanent verwijderen</strong></span></a> is ingeschakeld, kunnen verwijderde e-mails niet worden hersteld.</p>
+<p role="presentation"><span class="phrase"><strong>Waarschuwing:</strong></span> Als de instelling <span class="guibutton"><strong>Verwijder e-mails direct permanent</strong></span> is ingeschakeld kunnen verwijderde e-mailberichten <span class="phrase"><strong>niet</strong></span> worden hersteld, afhankelijk van de configuratie.</p>
 </li>
 <li class="step"><p role="presentation">Bevestig dat u de inhoud van deze map wilt verwijderen.</p></li>
 </ol></div>
@@ -115,7 +115,7 @@
           <p>Resultaat: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Als de instelling <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Verwijderde e-mails permanent verwijderen</strong></span></a> is uitgeschakeld:</p>
+<p role="presentation">Als de instelling <span class="guibutton"><strong>Verwijderde e-mails permanent verwijderen</strong></span> is uitgeschakeld:</p>
 <p role="presentation">De e-mails worden verplaatst naar de map Prullenbak.</p>
 </li>
 <li class="listitem">
@@ -125,60 +125,22 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
-<p class="title">E-mailberichten herstellen gaat als volgt:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Open de <span class="guibutton"><strong>Prullenbak</strong></span> map vanuit het mappenoverzicht.</p></li>
-<li class="step"><p role="presentation">Selecteer één of meerdere e-mailberichten.</p></li>
-<li class="step"><p role="presentation">Klik in het contextmenu van een e-mail op <span class="guibutton"><strong>Verplaatsen</strong></span>.</p></li>
-<li class="step"><p role="presentation">Selecteer een map met het <span class="guilabel"><strong>Verplaats</strong></span> scherm. Klik op <span class="guibutton"><strong>Verplaatsen</strong></span>.</p></li>
-</ol></div>
-<div class="taskrelated">
-          <p>Of: </p>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Om alle e-mails uit de prullenbak te herstellen, klikt u op het <span class="guibutton"><strong>Meer opties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> boven de lijst. Klik op de <span class="guibutton"><strong>Verplaats alle berichten</strong></span> knop.</p></li>
-<li class="listitem"><p role="presentation">Als u een enkele e-mail hebt geselecteerd, gebruik dan het <span class="guibutton"><strong>Meer acties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in de detailweergave. Klik op <span class="guibutton"><strong>Verplaatsen</strong></span>.</p></li>
-</ul>
-        </div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever">
-<p class="title">Permanent verwijderen van e-mailberichten gaat als volgt:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Waarschuwing:</strong></span> Permanent verwijderde e-mailberichten kunnen <span class="phrase"><strong>niet</strong></span> hersteld worden.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Open de <span class="guibutton"><strong>Prullenbak</strong></span> map vanuit het mappenoverzicht.</p></li>
-<li class="step"><p role="presentation">Selecteer één of meerdere e-mailberichten.</p></li>
-<li class="step">
-<p role="presentation">Klik op het <span class="guibutton"><strong>Verwijderen</strong></span> pictogram<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in de werkbalk.</p>
-<p role="presentation">Als u een enkele e-mail hebt geselecteerd, kunt u ook het <span class="guibutton"><strong>Verwijderen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>gebruiken in de detailweergave.</p>
-</li>
-<li class="step"><p role="presentation">Bevestig dat u de geselecteerde e-mails definitief wilt verwijderen.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptytrash">
-<p class="title">Permanent verwijderen van de inhoud van de prullenbak-map gaat als volgt:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Waarschuwing:</strong></span> Permanent verwijderde e-mailberichten kunnen <span class="phrase"><strong>niet</strong></span> hersteld worden.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Selecteer de <span class="guibutton"><strong>Prullenbak</strong></span> map vanuit het mappenoverzicht.</p></li>
-<li class="step">
-<p role="presentation">Gebruik één van de volgende methoden: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Klik op het <span class="guibutton"><strong>Meer acties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> naast <span class="guibutton"><strong>Prullenbak</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Klik op het <span class="guibutton"><strong>Meer acties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> boven de lijst.</p></li>
-</ul></p>
-<p role="presentation">Klik op <span class="guibutton"><strong>Lege map</strong></span>.</p>
-</li>
-<li class="step"><p role="presentation">Bevestig dat u de inhoud van de map wilt verwijderen.</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.email.manage.delete"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Het <span class="phrase">E-mail</span> mappenoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-mailmappen opschonen</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">E-mailberichten herstellen</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-mailberichten verwijderen</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.22.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Verwijderde e-mailberichten herstellen</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-mailmappen opschonen</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.email.manage.delete">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.deleteforever.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.deleteforever.html
new file mode 100644
index 000000000..d8b55549a
--- /dev/null
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.deleteforever.html
@@ -0,0 +1,92 @@
+<html lang="nl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>E-mailberichten verwijderen</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Gebruikershandleiding">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-mailberichten beheren">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.recover.html" title="E-mailberichten herstellen">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Verwijderde e-mailberichten herstellen">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.recover.html">Terug</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Volgende</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">E-mail</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">E-mailberichten beheren</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.deleteforever">
+<div class="titlepage"><div><div><h3 class="title">E-mailberichten verwijderen</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.24.2"></a><a class="indexterm" name="id-1.7.15.24.3"></a><p id="ox.appsuite.user.concept.email.manage.deleteforever">U heeft de volgende mogelijkheden: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Specifieke e-mailberichten definitief uit de prullenbak verwijderen.</p></li>
+<li class="listitem"><p role="presentation">Verwijder definitief alle e-mails uit de prullenbak door de prullenbak te legen.</p></li>
+</ul>
+<p id="ox.appsuite.user.hint.email.manage.deleteforever.html"><span class="cap-dumpster">Permanent verwijderde e-mailberichten kunnen binnen 14 dagen worden hersteld. Na deze periode: </span> Permanent verwijderde e-mailberichten kunnen <span class="phrase"><strong>niet</strong></span> worden hersteld.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.single">
+<p class="title">Specifieke e-mailberichten definitief uit de prullenbak verwijderen gaat als volgt:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Open de <span class="guibutton"><strong>Prullenbak</strong></span> map vanuit het mappenoverzicht.</p></li>
+<li class="step"><p role="presentation">Selecteer één of meerdere e-mailberichten.</p></li>
+<li class="step">
+<p role="presentation">Klik op het <span class="guibutton"><strong>Verwijderen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in de werkbalk.</p>
+<p role="presentation">Als u een enkele e-mail hebt geselecteerd, kunt u ook het <span class="guibutton"><strong>Verwijderen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> gebruiken in de detailweergave.</p>
+</li>
+<li class="step"><p role="presentation">Bevestig dat u de geselecteerde e-mails definitief wilt verwijderen.</p></li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.emptytrash">
+<p class="title">Alle e-mailberichten definitief uit de prullenbak verwijderen gaat als volgt:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selecteer de <span class="guibutton"><strong>Prullenbak</strong></span> map vanuit het mappenoverzicht.</p></li>
+<li class="step">
+<p role="presentation">Gebruik één van de volgende methoden: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Klik op het <span class="guibutton"><strong>Meer acties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> naast de <span class="guibutton"><strong>Prullenbak</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Klik op het <span class="guibutton"><strong>Meer acties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> boven de lijst.</p></li>
+</ul></p>
+<p role="presentation">Klik op <span class="guibutton"><strong>Lege map</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Bevestig dat u de inhoud van de map wilt verwijderen.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.deleteforever"></p>
+<p class="title">Gebruikersinterface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Het <span class="phrase">E-mail</span> mappenoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
+</li></ul>
+<p> </p>
+<p class="title">Zie ook:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-mailberichten verwijderen</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">E-mailberichten herstellen</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.24.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Verwijderde e-mailberichten herstellen</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-mailmappen opschonen</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.deleteforever">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.draft.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.draft.html
index 5d1d3c563..f3dfff3e1 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.draft.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.draft.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">E-mailberichten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.draft">
 <div class="titlepage"><div><div><h3 class="title">Concept e-mailberichten gebruiken</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">Als u een e-mailbericht aan het opstellen bent wordt het bericht  met enige regelmaat automatisch opgeslagen als een concept e-mail. De volgende opties zijn beschikbaar:</p>
+<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">Als u een e-mailbericht aan het opstellen bent wordt het bericht  met enige regelmaat automatisch opgeslagen als een concept e-mail. De volgende opties zijn beschikbaar:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Bewerk of verzend een concept e-mail.</p></li>
 <li class="listitem"><p role="presentation">Bewerk of verzend een kopie van een concept e-mail.</p></li>
@@ -69,11 +69,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.draft"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Het <span class="phrase">E-mail</span> mappenoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Sjablonen gebruiken</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.manage.draft">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.expungefolder.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.expungefolder.html
index 17cb17cae..9909cf6d5 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.expungefolder.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.expungefolder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-mailberichten beheren">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="E-mailberichten verwijderen">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Verwijderde e-mailberichten herstellen">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.unifiedmail.html" title="Verzamelde Mail gebruiken">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Volgende</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">E-mailberichten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.expungefolder">
 <div class="titlepage"><div><div><h3 class="title">E-mailmappen opschonen</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.22.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Afhankelijk van de e-mailinstellingen, worden e-mailberichten welke verwijderd zijn vanuit een e-mailapplicatie als Apple mail, MS Outlook of Mozilla Thunderbird pas volledig verwijderd nadat u zicht heeft afgemeld vanuit de applicatie. In de tussentijd worden deze e-mailberichten getoond als afgestreept in de groupware. Deze e-mailberichten worden definitief verwijderd bij het opschonen van de e-mailmap.</p>
+<a class="indexterm" name="id-1.7.15.26.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Afhankelijk van de e-mailinstellingen, worden e-mailberichten welke verwijderd zijn vanuit een e-mailapplicatie als Apple mail, MS Outlook of Mozilla Thunderbird pas volledig verwijderd nadat u zicht heeft afgemeld vanuit de applicatie. In de tussentijd worden deze e-mailberichten getoond als afgestreept in de groupware. Deze e-mailberichten worden definitief verwijderd bij het opschonen van de e-mailmap.</p>
 <p id="ox.appsuite.user.hint.email.manage.expungefolder">Opmerking: Afhankelijk van de instellingen is deze functie niet beschikbaar omdat dit soort e-mailberichten niet getoond worden.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.expunge">
 <p class="title">Het opschonen van de e-mailmap  gaat als volgt:</p>
@@ -47,14 +47,12 @@
 <li class="step"><p role="presentation">Klik op het <span class="guibutton"><strong>Acties</strong></span> pictogram<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.expungefolder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> naast de mapnaam. Klik op <span class="guibutton"><strong>Opschonen</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.expungefolder">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.expungefolder"></p>
+<p class="title">Gebruikersinterface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Het <span class="phrase">E-mail</span> mappenoverzicht</a></p></li></ul>
+<p> </p>
 <p class="title">Zie ook:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-mailberichten verwijderen</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-mailberichten verwijderen</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.expungefolder">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.html
index dbb1acb80..e7f1a1a88 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.html
@@ -43,17 +43,21 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Verplaatsen of kopiëren van e-mailberichten</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Markeren van e-mailberichten als gelezen of ongelezen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Adressen verzamelen</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">PGP inline standaard ingesteld voor nieuwe berichten</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">E-mailberichten Categoriseren</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">E-mailbron weergeven</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Concept e-mailberichten gebruiken</a></p></li>
-<li class="listitem cap-tasks" id="id-1.7.15.4.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">E-mailherinneringen aanmaken</a></p></li>
+<li class="listitem cap-tasks" id="id-1.7.15.4.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">E-mailherinneringen aanmaken</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">E-mail toevoegen aan het portaal</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">E-mailberichten opslaan</a></p></li>
-<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">E-mailberichten exporteren als PDF</a></p></li>
+<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">E-mailberichten exporteren als PDF</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">E-mailberichten importeren</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">E-mailberichten Afdrukken</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">E-mailberichten Archiveren</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-mailberichten verwijderen</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">E-mailberichten herstellen</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-mailberichten verwijderen</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.4.1.19"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Verwijderde e-mailberichten herstellen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-mailmappen opschonen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Verzamelde Mail gebruiken</a></p></li>
 </ul>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.import.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.import.html
index 7accc9846..f03d220cd 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.import.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">E-mailberichten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.import">
 <div class="titlepage"><div><div><h3 class="title">E-mailberichten importeren</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><p id="ox.appsuite.user.concept.email.manage.import">U kan een e-mailbericht importeren als deze beschikbaar is als EML formaat.</p>
+<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.import">U kan een e-mailbericht importeren als deze beschikbaar is als EML formaat.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.import">
 <p class="title">E-mailberichten importeren gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,14 +46,15 @@
 <li class="step"><p role="presentation">Sleep het eml-bestand van een bestandsbrowser of het bureaublad naar de e-maillijstweergave.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.import"></p>
+<p class="title">Gebruikersinterface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Het <span class="phrase">E-mail</span> mappenoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p>
+</li></ul>
+<p> </p>
 <p class="title">Zie ook:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">E-mailberichten opslaan</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">E-mailberichten opslaan</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.import">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.inboxcategories.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.inboxcategories.html
index f8dbb0568..63d675318 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.inboxcategories.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.inboxcategories.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation">inkomende e-mailberichten toewijzen aan een Postvak IN-categorie</p></li>
 <li class="listitem"><p role="presentation">bewerken van het Postvak IN-categorieën overzicht</p></li>
 </ul>
-<p role="presentation" class="feat-io-ox-core-categories">Opmerking: De hier beschreven Postvak IN-categorieën kunnen alleen voor e-mails worden gebruikt. Afhankelijk van de configuratie kunt u aparte categorieën gebruiken voor afspraken, contacten en taken, zie <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Opmerking: De hier beschreven Postvak IN-categorieën kunnen alleen voor e-mails worden gebruikt. Afhankelijk van de configuratie kunt u aparte categorieën gebruiken voor afspraken, contacten en taken, zie <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">PGP inline standaard ingesteld voor nieuwe berichten</a>.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.inboxcategories.activate">
 <p class="title">Het in- en uitschakelen van Postvak IN-tabbladen gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,7 @@
 <p role="presentation">Om de Postvak IN-tabbladen in te schakelen, klikt u op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.activate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Postvak IN-categorieën</strong></span>.</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">U kan ook gebruik maken van de <span class="guibutton"><strong>Postvak IN-categorieën aanmaken</strong></span>  knop onder below <span class="guibutton"><strong>Lezen</strong></span> in de e-mailinstellingen.</p></li></ul>
 <p role="presentation">Het <span class="guilabel"><strong>Categorieën configureren</strong></span>venster wordt geopend. Het toont de beschikbare Postvak IN-categorieën. Klik op <span class="guibutton"><strong>Categorieën inschakelen</strong></span>.</p>
-<p role="presentation">Aan de rechterkant onder de menubalk wordt de tabbladenbalk weergegeven.</p>
+<p role="presentation">Onder de menubalk wordt de postvak-in categorieënbalk weergegeven.</p>
 </li>
 <li class="step">
 <p role="presentation">Om de Postvak IN-tabbladen uit te schakelen, klikt u op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.deactivate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Postvak IN-categorieën</strong></span>.</p>
@@ -68,7 +68,7 @@
 <p role="presentation">E-mails die nog niet aan een Postvak IN-categorie zijn toegewezen, worden weergegeven op het tabblad <span class="guibutton"><strong>Algemeen</strong></span>.</p>
 </li>
 <li class="step">
-<p role="presentation">Sleep een e-mail van het lijstoverzicht naar een tabblad in de tabbladenbalk en zet het daar neer.</p>
+<p role="presentation">Sleep een e-mailbericht vanuit het lijstoverzicht naar een categorie in de postvak-in categorieënbalk en laat deze daar vallen.</p>
 <p role="presentation">U kan ook een e-mailbericht selecteren. Klik het <span class="guibutton"><strong>Categorie instellen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span> in de werkbalk. Selecteer een tabblad vanuit het menu.</p>
 </li>
 <li class="step"><p role="presentation">Om het proces te voltooien, voert u één van de volgende stappen uit: <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -82,14 +82,14 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Postvak In-categorieën</strong></span>.</p>
-<p role="presentation">U kan ook op het <span class="guibutton"><strong>Categorieën instellen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in de categorieën balk klikken.</p>
+<p role="presentation">U kan ook op het <span class="guibutton"><strong>Categorieën instellen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in de postvak-in categorieënbalk klikken.</p>
 <p role="presentation">Het <span class="guilabel"><strong>Categorieën configureren</strong></span> scherm opent.</p>
 </li>
 <li class="step">
 <p role="presentation">Om de Postvak IN-categorieën in of uit te schakelen, selecteer u het overeenkomstige aankruisvakje.</p>
 <p role="presentation">Om een Postvak IN-categorie te hernoemen, bewerkt u de overeenkomstige tekst.</p>
 <p role="presentation">Opmerking: Sommige categorieën kunnen niet aangepast worden.</p>
-<p role="presentation">Om de categorieënbalk te verbergen, klikt u op <span class="guibutton"><strong>Categorieën uitschakelen</strong></span>.</p>
+<p role="presentation">Om de postvak-in categorieënbalk te verbergen, klikt u op <span class="guibutton"><strong>Categorieën uitschakelen</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">Klik op <span class="guibutton"><strong>Opslaan</strong></span>.</p></li>
 </ol></div>
@@ -98,14 +98,11 @@
 <p class="title">Gebruikersinterface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">Het <span class="phrase">E-mail</span> instellingenmenu</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">De <span class="phrase">E-mail</span> tabbladenbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">De Postvak IN-categorieën balk</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-mailberichten bekijken</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.inboxcategories">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.label.html
index 5e7f686a3..ba4462635 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.label.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.label.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-mailberichten beheren">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Adressen verzamelen">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="PGP inline standaard ingesteld voor nieuwe berichten">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.source.html" title="E-mailbron weergeven">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.categories.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.source.html">Volgende</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">E-mailberichten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.label">
 <div class="titlepage"><div><div><h3 class="title">E-mailberichten Categoriseren</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Afhankelijk van de configuratie kan u een van de volgende functies gebruiken om e-mail te categoriseren: </p>
+<a class="indexterm" name="id-1.7.15.12.2"></a><a class="indexterm" name="id-1.7.15.12.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Afhankelijk van de configuratie kan u een van de volgende functies gebruiken om e-mail te categoriseren: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">met een gekleurd label</p></li>
 <li class="listitem"><p role="presentation">een vlag</p></li>
@@ -69,7 +69,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.label"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.mark.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.mark.html
index 697122f76..5358bf7eb 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.mark.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.mark.html
@@ -62,7 +62,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.mark"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-mailberichten bekijken</a></p></li></ul>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.movecopy.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.movecopy.html
index d18bdb178..417435f56 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.movecopy.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.movecopy.html
@@ -67,7 +67,11 @@
 </ul>
 <p id="ox.appsuite.user.related.email.manage.movecopy"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.pdfexport.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.pdfexport.html
index f765dc368..195aa3b40 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.pdfexport.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.pdfexport.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">E-mailberichten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.pdfexport">
 <div class="titlepage"><div><div><h3 class="title">E-mailberichten exporteren als PDF</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.17.2"></a><a class="indexterm" name="id-1.7.15.17.3"></a><a class="indexterm" name="id-1.7.15.17.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Opmerking: Afhankelijk van de configuratie is deze functie mogelijk niet beschikbaar.</p>
+<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><a class="indexterm" name="id-1.7.15.18.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Opmerking: Afhankelijk van de configuratie is deze functie mogelijk niet beschikbaar.</p>
 <p id="ox.appsuite.user.concept.email.manage.pdfexport">U kunt een e-mailbericht en de bijlagen in docx-formaat als PDF exporteren. Zodra het PDF-bestand is aangemaakt, wordt het opgeslagen in een <span class="phrase">Bestanden</span> map die door u kan worden gedefinieerd. Afhankelijk van het datavolume kan het downloaden even duren. Zodra het proces is voltooid, ontvangt u een melding.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.pdfexport">
 <p class="title">E-mailberichten als PDF exporteren gaat als volgt:</p>
@@ -54,7 +54,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.pdfexport"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">E-mailberichten opslaan</a></p></li></ul>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.print.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.print.html
index c10cf32f7..4af7a77c7 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.print.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">E-mailberichten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.print">
 <div class="titlepage"><div><div><h3 class="title">E-mailberichten Afdrukken</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.print">U kan de inhoud van een e-mailbericht of meerder e-mailberichten afdrukken.</p>
+<a class="indexterm" name="id-1.7.15.20.2"></a><a class="indexterm" name="id-1.7.15.20.3"></a><p id="ox.appsuite.user.concept.email.manage.print">U kan de inhoud van een e-mailbericht of meerder e-mailberichten afdrukken.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.print">
 <p class="title">De inhoud van een e-mailbericht afdrukken gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -56,7 +56,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.print"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">E-mailberichten Archiveren</a></p></li></ul>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.recover.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.recover.html
new file mode 100644
index 000000000..4e5cd42c3
--- /dev/null
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.recover.html
@@ -0,0 +1,97 @@
+<html lang="nl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>E-mailberichten herstellen</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Gebruikershandleiding">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-mailberichten beheren">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="E-mailberichten verwijderen">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="E-mailberichten verwijderen">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Terug</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Volgende</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">E-mail</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">E-mailberichten beheren</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.recover">
+<div class="titlepage"><div><div><h3 class="title">E-mailberichten herstellen</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.recover">U heeft de volgende mogelijkheden: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Herstel individuele e-mailberichten uit de prullenbak.</p></li>
+<li class="listitem"><p role="presentation">Herstel alle e-mailberichten uit de prullenbak.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.single">
+<p class="title">U herstelt individuele e-mailberichten uit de prullenbak als volgt:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Open de <span class="guibutton"><strong>Prullenbak</strong></span> map vanuit het mappenoverzicht.</p></li>
+<li class="step">
+<p role="presentation">Selecteer één of meerdere e-mailberichten.</p>
+<p role="presentation">Klik in het contextmenu van een e-mail op <span class="guibutton"><strong>Verplaatsen</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Selecteer een map met het <span class="guilabel"><strong>Verplaats</strong></span> scherm. Klik op <span class="guibutton"><strong>Verplaatsen</strong></span>.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Of: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Gebruik slepen en laten vallen om items van de prullenbak naar een andere map te verplaatsen in het mappenoverzicht.</p></li>
+<li class="listitem"><p role="presentation">Als u een enkele e-mail hebt geselecteerd, gebruik dan het <span class="guibutton"><strong>Meer acties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.single.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in de detailweergave. Klik op <span class="guibutton"><strong>Verplaatsen</strong></span>.</p></li>
+</ul>
+        </div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.all">
+<p class="title">U herstelt alle e-mailberichten als volgt uit de prullenbak:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selecteer de <span class="guibutton"><strong>Prullenbak</strong></span> map vanuit het mappenoverzicht.</p></li>
+<li class="step">
+<p role="presentation">Gebruik één van de volgende methoden: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Klik op het <span class="guibutton"><strong>Meer acties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> naast de <span class="guibutton"><strong>Prullenbak</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Klik op het <span class="guibutton"><strong>Meer acties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> boven de lijst.</p></li>
+</ul></p>
+<p role="presentation">Klik op de <span class="guibutton"><strong>Verplaats alle berichten</strong></span> knop.</p>
+</li>
+<li class="step"><p role="presentation">Selecteer een map in het <span class="guilabel"><strong>Verplaats</strong></span> scherm. Klik op <span class="guibutton"><strong>Alles verplaatsen</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.recover"></p>
+<p class="title">Gebruikersinterface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Het <span class="phrase">E-mail</span> mappenoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
+</li></ul>
+<p> </p>
+<p class="title">Zie ook:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-mailberichten verwijderen</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-mailberichten verwijderen</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.23.7.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Verwijderde e-mailberichten herstellen</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-mailmappen opschonen</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.recover">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.reminder.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.reminder.html
index cd81d47f7..391abeece 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.reminder.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.reminder.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">E-mailberichten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.reminder">
 <div class="titlepage"><div><div><h3 class="title">E-mailherinneringen aanmaken</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">U kunt een herinnering aanmaken voor een e-mailbericht. Deze functie creëert een taak en herinnert u aan de vervaldatum.</p>
+<a class="indexterm" name="id-1.7.15.15.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">U kunt een herinnering aanmaken voor een e-mailbericht. Deze functie creëert een taak en herinnert u aan de vervaldatum.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.email.manage.reminder">
 <p class="title">Een e-mailherinnering aanmaken gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.reminder"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Nieuwe taken aanmaken</a></p></li></ul>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.save.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.save.html
index 573e48952..bc8fcea9f 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.save.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.save.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">E-mailberichten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.save">
 <div class="titlepage"><div><div><h3 class="title">E-mailberichten opslaan</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.16.2"></a><p id="ox.appsuite.user.concept.email.manage.save">U kan e-mailberichten opslaan als een tekstbestand. Het tekstbestand heeft de extentie EML. Als u meerdere e-mailberichten selecteert wordt een eml bestand gemaakt voor elk e-mailbericht. De eml bestanden worden dan als zip archief opgeslagen.</p>
+<a class="indexterm" name="id-1.7.15.17.2"></a><p id="ox.appsuite.user.concept.email.manage.save">U kan e-mailberichten opslaan als een tekstbestand. Het tekstbestand heeft de extentie EML. Als u meerdere e-mailberichten selecteert wordt een eml bestand gemaakt voor elk e-mailbericht. De eml bestanden worden dan als zip archief opgeslagen.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.save">
 <p class="title">E-mailberichten opslaan gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.save"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -57,7 +60,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">E-mailberichten importeren</a></p>
 <p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">E-mailberichten exporteren als PDF</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.7.15.16.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Persoonlijke Gegevens Downloaden</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.7.15.17.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Persoonlijke Gegevens Downloaden</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.save">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.source.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.source.html
index 319566fcc..decb36e22 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.source.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.source.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">E-mailberichten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.source">
 <div class="titlepage"><div><div><h3 class="title">E-mailbron weergeven</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.12.2"></a><p id="ox.appsuite.user.concept.email.manage.source">De brongegevens bevatten het complete e-mailbericht inclusief de complete e-mailheader-gegevens.</p>
+<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.source">De brongegevens bevatten het complete e-mailbericht inclusief de complete e-mailheader-gegevens.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.source">
 <p class="title">Het tonen van de bron van e-mailberichten gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.source"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">De <span class="phrase">E-mail</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.undelete.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.undelete.html
new file mode 100644
index 000000000..fe7107912
--- /dev/null
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.undelete.html
@@ -0,0 +1,75 @@
+<html lang="nl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Verwijderde e-mailberichten herstellen</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Gebruikershandleiding">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-mailberichten beheren">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="E-mailberichten verwijderen">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="E-mailmappen opschonen">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Terug</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Volgende</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">E-mail</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">E-mailberichten beheren</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.undelete">
+<div class="titlepage"><div><div><h3 class="title">Verwijderde e-mailberichten herstellen</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.25.2"></a><a class="indexterm" name="id-1.7.15.25.3"></a><p id="ox.appsuite.user.concept.email.manage.undelete.html">Permanent verwijderde e-mailberichten kunnen binnen 14 dagen worden hersteld. Na deze periode zijn permanent verwijderde e-mailberichten niet meer te herstellen.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
+<p class="title">Verwijderde e-mailberichten herstellen gaat als volgt:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selecteer de <span class="guibutton"><strong>Prullenbak</strong></span> map vanuit het mappenoverzicht.</p></li>
+<li class="step">
+<p role="presentation">Klik op het <span class="guibutton"><strong>Meer acties</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> naast de <span class="guibutton"><strong>Prullenbak</strong></span>.</p>
+<p role="presentation">Klik op <span class="guibutton"><strong>Herstel verwijderde items</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Selecteer de e-mailberichten om te herstellen in het <span class="guilabel"><strong>Herstel verwijderde items</strong></span> scherm.</p>
+<p role="presentation">Klik op <span class="guibutton"><strong>Verplaats geselecteerde items</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">In het <span class="guilabel"><strong>Verplaats</strong></span> scherm geeft u op waar de herstelde e-mailberichten naartoe moeten.</p>
+<p role="presentation">Klik op <span class="guibutton"><strong>Verplaatsen</strong></span>.</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.undelete"></p>
+<p class="title">Gebruikersinterface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Het <span class="phrase">E-mail</span> mappenoverzicht</a></p></li></ul>
+<p> </p>
+<p class="title">Zie ook:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-mailberichten verwijderen</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">E-mailberichten herstellen</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-mailberichten verwijderen</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-mailmappen opschonen</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.undelete">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-mailberichten beheren</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.unifiedmail.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.unifiedmail.html
index c5cbbddb1..3427a1488 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.unifiedmail.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.manage.unifiedmail.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">E-mailberichten beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.unifiedmail">
 <div class="titlepage"><div><div><h3 class="title">Verzamelde Mail gebruiken</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">Met Verzamelde Mail kan u e-mailberichten van meerdere e-mailaccounts in één centrale map tonen. Dit geeft u een snel overzicht van de inkomende mail van meerdere e-mailaccounts. Verzamelde Mail kan als volgt omschreven worden: </p>
+<a class="indexterm" name="id-1.7.15.27.2"></a><a class="indexterm" name="id-1.7.15.27.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">Met Verzamelde Mail kan u e-mailberichten van meerdere e-mailaccounts in één centrale map tonen. Dit geeft u een snel overzicht van de inkomende mail van meerdere e-mailaccounts. Verzamelde Mail kan als volgt omschreven worden: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Naast de Postvak In map van een e-mailaccount geeft de <span class="guibutton"><strong>Verzamelde Mail</strong></span> map een verdere weergave van de e-mailberichten van het account. De e-mailberichten bestaan in werkelijkheid maar één keer.</p></li>
 <li class="listitem"><p role="presentation">E-mailberichten welke in submappen zijn geplaatst zijn niet zichtbaar in de <span class="guibutton"><strong>Verzamelde Mail</strong></span> map.</p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.openai.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.openai.html
index 9f88e9099..34d01f0aa 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.openai.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.openai.html
@@ -42,7 +42,7 @@
 <li class="listitem"><p role="presentation">bewerk de inhoud van bestaande e-mailberichten of ontvang tekstsuggesties om een antwoord te geven</p></li>
 <li class="listitem"><p role="presentation">maak tekstsuggesties om nieuw berichten te maken</p></li>
 </ul>
-<p> Opmerking: Als u de AI integratie gebruikt wordt de inhoud van de betrokken e-mailberichten naar de Microsoft Azure OpenAI dienst gestuurd. </p>
+<p> Opmerking: Als u de AI integratie gebruikt wordt de inhoud van het betrokken e-mailbericht naar een OpenAI dienst gestuurd. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Bij het eerste gebruik van een AI functie wordt een dialoog getoond waar u kan het verzenden van gegevens kan goedkeuren. U kan alleen gebruik maken van AI functies als u toestaat dat de gegevens worden verzonden.</p></li>
 <li class="listitem"><p role="presentation">U kan op elk moment uw goedkeuring voor het verzenden van gegevens intrekken. Om dit te doen klikt u op <span class="guibutton"><strong>Goedkeuring aanpassen</strong></span> onder <span class="guibutton"><strong>AI integratie</strong></span> in de e-mailinstellingen.</p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.openai.send.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.openai.send.html
index 63400b536..7e4aa3b95 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.openai.send.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.openai.send.html
@@ -64,7 +64,7 @@
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">AI functies gebruiken bij het beantwoorden van e-mailberichten</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.email.openai.send">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.openai.html">De AI integratie gebruiken</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.search.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.search.html
index 46f00efa7..a8d7e3a1b 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.search.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.search.html
@@ -101,9 +101,14 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">E-mailberichten bekijken</a>
           </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">E-mailberichten Categoriseren</a>
-          </p></li>
+          </p>
+<p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">PGP inline standaard ingesteld voor nieuwe berichten</a>
+          </p>
+</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attachmentexisting.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attachmentexisting.html
index 2ebcffee8..601c3d1fb 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attachmentexisting.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attachmentexisting.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="Bijlagen toevoegen">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Bijlagen versturen als link">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="bijlagen toevoegen">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="bijlagen verzenden als link">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">E-mailberichten versturen</h2>
+<h2 class="sr-only">e-mails verzenden</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentexisting">
 <div class="titlepage"><div><div><h3 class="title">Bijlagen toevoegen uit bestaande e-mailberichten</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.9.2"></a><a class="indexterm" name="id-1.7.11.9.3"></a><p id="ox.appsuite.user.concept.email.send.attachmentexisting">Afhankelijk van de configuratie kan bijlagen vanuit bestaande e-mailberichten aan een nieuw bericht toevoegen.</p>
@@ -59,14 +59,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachmentexisting"></p>
 <p class="title">Bovenliggende functies:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p></li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Bijlagen toevoegen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Bijlagen versturen als link</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">bijlagen toevoegen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">bijlagen verzenden als link</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attachmentlink.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attachmentlink.html
index 97f4cdac0..c3bd85b38 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attachmentlink.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attachmentlink.html
@@ -1,11 +1,11 @@
 <html lang="nl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Bijlagen versturen als link</title>
+<title>bijlagen verzenden als link</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Bijlagen toevoegen uit bestaande e-mailberichten">
 <link rel="next" href="ox.appsuite.user.sect.email.send.templates.html" title="Sjablonen gebruiken">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">E-mailberichten versturen</h2>
+<h2 class="sr-only">e-mails verzenden</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentlink">
-<div class="titlepage"><div><div><h3 class="title">Bijlagen versturen als link</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">bijlagen verzenden als link</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.10.2"></a><p id="ox.appsuite.user.concept.email.send.attachmentlink">Deze functie maakt het mogelijk om grote bijlagen te verzenden per e-mail. Het gaat als volgt: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">De bijlagen worden geüpload naar een nieuwe map onder <span class="guibutton"><strong>Drive Mail</strong></span> in de <span class="phrase">Bestanden</span> app. De naam van deze map komt overeen met het onderwerp van het e-mailbericht. De map wordt gedeeld met een publieke link.</p></li>
@@ -89,14 +89,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.attachmentlink"></p>
 <p class="title">Bovenliggende functies:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p></li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Bijlagen toevoegen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">bijlagen toevoegen</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Bijlagen toevoegen uit bestaande e-mailberichten</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachmentlink">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachmentlink">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attachments.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attachments.html
index 1c6e3adc6..7ce8bb867 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attachments.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attachments.html
@@ -1,11 +1,11 @@
 <html lang="nl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Bijlagen toevoegen</title>
+<title>bijlagen toevoegen</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.replyto.html" title="Antwoordadres instellen">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Bijlagen toevoegen uit bestaande e-mailberichten">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">E-mailberichten versturen</h2>
+<h2 class="sr-only">e-mails verzenden</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachments">
-<div class="titlepage"><div><div><h3 class="title">Bijlagen toevoegen</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">bijlagen toevoegen</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.8.2"></a><a class="indexterm" name="id-1.7.11.8.3"></a><p id="ox.appsuite.user.concept.emal.add.attachments">Afhankelijk van de instellingen van de groupware, kan u bestanden toevoegen die zijn opgeslagen op uw computer of in de <span class="phrase">Bestanden</span> app.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.attachments">
 <p class="title">Het toevoegen van een bijlage aan het e-mailbewerkscherm gaat als volgt:</p>
@@ -62,14 +62,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachments"></p>
 <p class="title">Bovenliggende functies:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p></li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Bijlagen toevoegen uit bestaande e-mailberichten</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Bijlagen versturen als link</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">bijlagen verzenden als link</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachments">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachments">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attendees.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attendees.html
index da90928c2..0e725d99d 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attendees.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Automatisch e-mailberichten doorsturen">
 <link rel="next" href="ox.appsuite.user.sect.email.send.vacationnotice.html" title="Verstuur een automatische afwezigheidsmelding">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">E-mailberichten versturen</h2>
+<h2 class="sr-only">e-mails verzenden</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attendees">
 <div class="titlepage"><div><div><h3 class="title">Versturen van een e-mailbericht naar afspraakdeelnemers</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.16.2"></a><div class="task" id="ox.appsuite.user.task.email.send.attendees">
@@ -51,25 +51,16 @@
 <li class="step"><p role="presentation">Vul de details in om het e-mailbericht te versturen.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.send.attendees">
-        </p>
+<p id="ox.appsuite.user.related.email.send.attendees"></p>
+<p class="title">Gebruikersinterface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">De <span class="phrase">Agenda</span> werkbalk</a></p>
+</li></ul>
+<p> </p>
 <p class="title">Zie ook:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">De <span class="phrase">Agenda</span> pop-up</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">De <span class="phrase">Agenda</span> werkbalk</a>
-            </p>
-</li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a>
-            </p></li>
-</ul>
-<p>
-      </p>
-<p id="ox.appsuite.user.parent.email.send.attendees">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p></li></ul>
+<p id="ox.appsuite.user.parent.email.send.attendees">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.autoforward.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.autoforward.html
index dfefe0200..4e2bb890f 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.autoforward.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.autoforward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.forward.html" title="E-mailberichten doorsturen">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attendees.html" title="Versturen van een e-mailbericht naar afspraakdeelnemers">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">E-mailberichten versturen</h2>
+<h2 class="sr-only">e-mails verzenden</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.autoforward">
 <div class="titlepage"><div><div><h3 class="title">Automatisch e-mailberichten doorsturen</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.15.2"></a><p id="ox.appsuite.user.concept.email.send.autoforward">U kan e-mailberichten automatisch doorsturen naar een ander adres.</p>
@@ -67,7 +67,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a>
+              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Beantwoorden van e-mailberichten</a>
@@ -90,7 +90,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.email.send.autoforward">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p id="ox.appsuite.user.parent.email.send.autoforward">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.forward.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.forward.html
index 9658b642c..5be22fe56 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.forward.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.forward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.reply.html" title="Beantwoorden van e-mailberichten">
 <link rel="next" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Automatisch e-mailberichten doorsturen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">E-mailberichten versturen</h2>
+<h2 class="sr-only">e-mails verzenden</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.forward">
 <div class="titlepage"><div><div><h3 class="title">E-mailberichten doorsturen</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.14.2"></a><p id="ox.appsuite.user.concept.email.send.forward">Als u een e-mailbericht doorstuurt worden sommige velden van het e-mailbericht alvast ingevuld:</p>
@@ -74,11 +74,11 @@
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Beantwoorden van e-mailberichten</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatisch e-mailberichten doorsturen</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.forward">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p id="ox.appsuite.user.parent.email.send.forward">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.html
index 6336ef4f0..f1a43a823 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.html
@@ -1,13 +1,13 @@
 <html lang="nl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>E-mailberichten versturen</title>
+<title>e-mails verzenden</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="E-mail">
 <link rel="prev" href="ox.appsuite.user.sect.email.attachments.html" title="Tonen of opslaan van e-mailbijlagen">
-<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Versturen van een nieuw e-mailbericht">
+<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Nieuwe e-mailberichten versturen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -36,15 +36,15 @@
     
   </h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.send">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">E-mailberichten versturen</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">e-mails verzenden</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.email.send">Leer hoe u een E-mail verzendt en over de beschikbare functies voor het aanpassen van de E-mailinhoud: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Een afzenderadres selecteren</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">selecteer een verzendadres</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Antwoordadres instellen</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Bijlagen toevoegen</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">bijlagen toevoegen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Bijlagen toevoegen uit bestaande e-mailberichten</a></p></li>
-<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Bijlagen versturen als link</a></p></li>
+<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">bijlagen verzenden als link</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.11.2.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Sjablonen gebruiken</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Ondertekeningen gebruiken</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Beantwoorden van e-mailberichten</a></p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.new.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.new.html
index 0e18680a1..a87520a17 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.new.html
@@ -1,13 +1,13 @@
 <html lang="nl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Versturen van een nieuw e-mailbericht</title>
+<title>Nieuwe e-mailberichten versturen</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
-<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="Een afzenderadres selecteren">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
+<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="selecteer een verzendadres">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">E-mailberichten versturen</h2>
+<h2 class="sr-only">e-mails verzenden</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.new">
-<div class="titlepage"><div><div><h3 class="title">Versturen van een nieuw e-mailbericht</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Nieuwe e-mailberichten versturen</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.5.2"></a><a class="indexterm" name="id-1.7.11.5.3"></a><a class="indexterm" name="id-1.7.11.5.4"></a><div class="task" id="ox.appsuite.user.task.email.send.new">
 <p class="title">Een nieuw e-mailbericht stuurt u als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -93,37 +93,26 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">De Nieuwe e-mail knop</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">Het e-mailbewerkingsscherm</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Onderliggende functies:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatisch contacten of bronnen toevoegen vanuit een adresboek</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatisch contacten of bronnen toevoegen vanuit de adreslijst</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Een afzenderadres selecteren</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">selecteer een verzendadres</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Antwoordadres instellen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Bijlagen toevoegen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">bijlagen toevoegen</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Bijlagen toevoegen uit bestaande e-mailberichten</a></p>
-<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Bijlagen versturen als link</a></p>
+<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">bijlagen verzenden als link</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Sjablonen gebruiken</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Ondertekeningen gebruiken</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Beantwoorden van e-mailberichten</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">E-mailberichten doorsturen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatisch e-mailberichten doorsturen</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Versturen van een e-mailbericht naar afspraakdeelnemers</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Verstuur een automatische afwezigheidsmelding</a></p>
-<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Gecodeerde e-mailberichten verzenden</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Versturen van contactgegevens als vCard</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Versturen van e-mailberichten vanuit uit een adresboek</a></p>
-</li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">AI functies gebruiken bij het opstellen van e-mailberichten</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">AI functies gebruiken bij het opstellen van e-mailberichten</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.new">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p id="ox.appsuite.user.parent.email.send.new">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.reply.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.reply.html
index 48c599229..a39b5390b 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.reply.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.reply.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.signatures.html" title="Ondertekeningen gebruiken">
 <link rel="next" href="ox.appsuite.user.sect.email.send.forward.html" title="E-mailberichten doorsturen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">E-mailberichten versturen</h2>
+<h2 class="sr-only">e-mails verzenden</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.reply">
 <div class="titlepage"><div><div><h3 class="title">Beantwoorden van e-mailberichten</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.13.2"></a><p id="ox.appsuite.user.concept.email.send.reply">Als u een e-mailbericht beantwoordt worden een aantal velden automatisch ingevuld: </p>
@@ -70,13 +70,13 @@
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">E-mailberichten doorsturen</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Verstuur een automatische afwezigheidsmelding</a></p>
 </li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.11.13.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">AI functies gebruiken bij het beantwoorden van e-mailberichten</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.reply">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p id="ox.appsuite.user.parent.email.send.reply">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.replyto.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.replyto.html
index 981723d93..875072c16 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.replyto.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.replyto.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="Een afzenderadres selecteren">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="Bijlagen toevoegen">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="selecteer een verzendadres">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="bijlagen toevoegen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">E-mailberichten versturen</h2>
+<h2 class="sr-only">e-mails verzenden</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.replyto">
 <div class="titlepage"><div><div><h3 class="title">Antwoordadres instellen</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.7.2"></a><p id="ox.appsuite.user.concept.email.send.replyto">Wanneer een ontvanger op uw e-mail reageert, wordt het antwoord standaard verzonden naar het e-mailaccount van waaruit u de e-mail hebt verzonden. U kunt ook het e-mailbewerkingsvenster gebruiken om de e-mailadressen op te geven waarnaar het antwoord op de verzonden e-mail zal worden verzonden.</p>
@@ -43,11 +43,11 @@
 <p class="title">Een antwoordadres selecteren in het e-mailbewerkingsvenster:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Klik in het e-mailbewerkingsvenster op <span class="guibutton"><strong>RE</strong></span> naast het afzenderadres. Het invoerveld <span class="guibutton"><strong>Antwoorden naar</strong></span> wordt weergegeven.</p>
+<p role="presentation">Klik in het e-mailbewerkingsvenster klikt u op <span class="guibutton"><strong>RE</strong></span> naast het afzenderadres. Het invoerveld <span class="guibutton"><strong>Antwoorden naar</strong></span> wordt weergegeven.</p>
 <p role="presentation">Als u standaard antwoordadressen heeft opgegeven tijdens het bewerken van uw primaire e-mailaccount, wordt het invoerveld <span class="guibutton"><strong>Antwoorden naar</strong></span> automatisch weergegeven. Het invoerveld bevat de vooraf ingestelde antwoordadressen.</p>
 </li>
 <li class="step">
-<p role="presentation">Voer in <span class="guibutton"><strong>Antwoorden naar</strong></span> de e-mailadressen in waarnaar u het antwoord op uw e-mail wilt sturen. <ul class="itemizedlist" style="list-style-type: disc; ">
+<p role="presentation">Voer in <span class="guibutton"><strong>Antwoorden naar</strong></span> de e-mailadressen in waarop u het antwoord op uw e-mail wilt ontvangen. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Terwijl u de ontvangers invoert, worden suggesties getoond. Om een suggestie te accepteren, klikt u er op.</p></li>
 <li class="listitem"><p role="presentation">Om contacten uit een adresboek te selecteren, klikt u het <span class="guibutton"><strong>Selecteer contact</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.replyto.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span> aan de rechterzijde van het invoerveld.</p></li>
 </ul></p>
@@ -57,11 +57,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.replyto"></p>
 <p class="title">Bovenliggende functies:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p></li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">Bewerk het primaire e-mailaccount</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.replyto">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p id="ox.appsuite.user.parent.email.send.replyto">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.sender.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.sender.html
index dcd4f1bfb..1a5890617 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.sender.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.sender.html
@@ -1,12 +1,12 @@
 <html lang="nl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Een afzenderadres selecteren</title>
+<title>selecteer een verzendadres</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Versturen van een nieuw e-mailbericht">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Nieuwe e-mailberichten versturen">
 <link rel="next" href="ox.appsuite.user.sect.email.send.replyto.html" title="Antwoordadres instellen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,9 +35,9 @@
     
     
   </h1>
-<h2 class="sr-only">E-mailberichten versturen</h2>
+<h2 class="sr-only">e-mails verzenden</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.sender">
-<div class="titlepage"><div><div><h3 class="title">Een afzenderadres selecteren</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">selecteer een verzendadres</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.6.2"></a><p id="ox.appsuite.user.concept.email.send.sender">Als u een e-mailbericht verstuurd, kan u het verzendadres dat de ontvanger ziet aanpassen vanuit het bewerkingsscherm.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.sender">
 <p class="title">Zo selecteert u uw afzenderadres in het e-mailbewerkingsvenster:</p>
@@ -59,11 +59,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.sender"></p>
 <p class="title">Bovenliggende functies:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p></li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">E-mailaccounts toevoegen</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.sender">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p id="ox.appsuite.user.parent.email.send.sender">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.signatures.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.signatures.html
index affb488b4..a8e115a71 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.signatures.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.signatures.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.templates.html" title="Sjablonen gebruiken">
 <link rel="next" href="ox.appsuite.user.sect.email.send.reply.html" title="Beantwoorden van e-mailberichten">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">E-mailberichten versturen</h2>
+<h2 class="sr-only">e-mails verzenden</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.signatures">
 <div class="titlepage"><div><div><h3 class="title">Ondertekeningen gebruiken</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.12.2"></a><a class="indexterm" name="id-1.7.11.12.3"></a><p id="ox.appsuite.user.concept.email.send.signatures">Een e-mailondertekening is tekst die automatisch in de e-mail wordt ingevoerd bij het opstellen, beantwoorden of doorsturen.Het wordt meestal gebruikt voor het invoegen van de naam, het bedrijf en het contactadres onder aan de e-mailtekst. U kunt ondertekeningen maken in platte tekst of html-indeling. De volgende functies zijn beschikbaar: </p>
@@ -91,7 +91,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.signatures"></p>
 <p class="title">Bovenliggende functies:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p></li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -99,7 +99,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">E-mailaccounts toevoegen</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Sjablonen gebruiken</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.signatures">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p id="ox.appsuite.user.parent.email.send.signatures">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.templates.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.templates.html
index 2b9d9f712..47cb3f073 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.templates.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.templates.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Bijlagen versturen als link">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="bijlagen verzenden als link">
 <link rel="next" href="ox.appsuite.user.sect.email.send.signatures.html" title="Ondertekeningen gebruiken">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">E-mailberichten versturen</h2>
+<h2 class="sr-only">e-mails verzenden</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.templates">
 <div class="titlepage"><div><div><h3 class="title">Sjablonen gebruiken</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.11.2"></a><a class="indexterm" name="id-1.7.11.11.3"></a><p id="ox.appsuite.user.concept.email.send.templates">Sjablonen zijn tekstblokken die u éénmaal schrijft en daarna zo vaak u wilt kan insluiten in e-mailberichten. Hierdoor hoeft u e zinnen maar één keer te schrijven. Sjablonen, ondertekeningen en concepten verschillen op de volgende manieren: </p>
@@ -88,7 +88,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.templates"></p>
 <p class="title">Bovenliggende functies:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p></li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -96,7 +96,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Ondertekeningen gebruiken</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Concept e-mailberichten gebruiken</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.templates">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p id="ox.appsuite.user.parent.email.send.templates">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.vacationnotice.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.vacationnotice.html
index 135cb43f1..1e22dea9c 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.vacationnotice.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.send.vacationnotice.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-mailberichten versturen">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-mails verzenden">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attendees.html" title="Versturen van een e-mailbericht naar afspraakdeelnemers">
 <link rel="next" href="ox.appsuite.user.sect.email.openai.html" title="De AI integratie gebruiken">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -35,7 +35,7 @@
     
     
   </h1>
-<h2 class="sr-only">E-mailberichten versturen</h2>
+<h2 class="sr-only">e-mails verzenden</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.vacationnotice">
 <div class="titlepage"><div><div><h3 class="title">Verstuur een automatische afwezigheidsmelding</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.17.2"></a><a class="indexterm" name="id-1.7.11.17.3"></a><p id="ox.appsuite.user.concept.email.send.vacationnotice">Een afwezigheidsmelding informeert de zender van een e-mailbericht dat u geen e-mail zal ophalen voor een bepaalde tijd. U kan het volgende instellen: </p>
@@ -81,14 +81,14 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Beantwoorden van e-mailberichten</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">E-mailberichten doorsturen</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatisch e-mailberichten doorsturen</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">E-mailfilters gebruiken</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.vacationnotice">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">E-mailberichten versturen</a></p>
+<p id="ox.appsuite.user.parent.email.send.vacationnotice">Zie ook: <a class="xref" href="ox.appsuite.user.sect.email.send.html">e-mails verzenden</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.settings.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.settings.html
index 70c094472..726619b04 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.settings.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.settings.html
@@ -55,8 +55,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.composereply">Opstellen &amp; Antwoorden</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.20.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">Sjablonen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.rules">Regels</a></p></li>
-<li class="listitem feat-zoom" id="id-1.7.20.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">AI integratie</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.7.20.5.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Geavanceerde instellingen</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">AI integratie</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Geavanceerde instellingen</a></p></li>
 </ul>
 <p>Zie ook: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Zoeken naar instellingen</a></p>
 <p id="ox.appsuite.user.reference.email.settings.reading"></p>
@@ -64,31 +64,32 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>opmaak. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Definieert de opmaak van het lijstoverzicht en de detailweergave in het hoofdgebied.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>Opmaak. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Definieert de opmaak van het lijstoverzicht en de detailweergave in het hoofdgebied.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>berichtenlijst. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a>
+<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>Berichtenlijst. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.list"><b>Contactafbeeldingen, aankruisvakjes, eenvoudig. </b>Geeft aan of contactafbeeldingen, selectievakjes of geen van deze elementen worden weergegeven in het lijstoverzicht.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.preview"><b>Tekstvoorbeeld tonen. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.2.1.2"></a>Geeft aan of de eerste woorden van een e-mailbericht worden getoond in de e-maillijstweergave.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Altijd de volledige datum en tijd tonen. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Geeft aan of de eerste woorden van een e-mailbericht worden getoond in de e-maillijstweergave.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Berichtgrootte tonen. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Geeft aan of de grootte van het e-mailbericht in de e-maillijstweergave getoond wordt.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.20.6.2.1.2.1.3.1.3"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>Toon categorieën. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Geeft aan of de categorieën toegewezen aan een e-mailbericht worden getoond in de e-maillijst.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Altijd de volledige datum en tijd tonen. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Geeft aan of de eerste woorden van een e-mailbericht worden getoond in de e-maillijstweergave.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Berichtgrootte tonen. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.5.1.2"></a>Geeft aan of de grootte van het e-mailbericht in de e-maillijstweergave getoond wordt.</p></li>
 </ul>
 <p>
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>leesvenster. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a>
+<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>Leesvenster. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a>
                 </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>geef geciteerde tekst weer in een andere kleur. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Bepaalt of de originele berichten gemarkeerd en voorafgegaan moeten worden met een verticale lijn. Deze optie gaat ervan uit dat het oorspronkelijke e-mailbericht niet als bijlage wordt toegevoegd.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>Toon geciteerde tekst in een andere kleur. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Bepaalt of de originele berichten gemarkeerd en voorafgegaan moeten worden met een verticale lijn. Deze optie gaat ervan uit dat het oorspronkelijke e-mailbericht niet als bijlage wordt toegevoegd.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.fixedfont"><b>Gebruik lettertype met vaste breedte voor plattetekst-berichten. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.2.1.2"></a>Geeft aan of een lettertype met vaste breedte wordt gebruikt bij het tonen van een platte tekst e-mailbericht.</p></li>
 </ul>
 <p>
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>markeren als gelezen. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Definieert de periode waarna een e-mailbericht automatisch als gelezen wordt gemarkeerd bij het selecteren van de e-mail. </p>
+<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>Markeer als gelezen. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Definieert de periode waarna een e-mailbericht automatisch als gelezen wordt gemarkeerd bij het selecteren van de e-mail. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.immediately"><b>Onmiddellijk. </b>Het e-mailbericht wordt onmiddellijk gemarkeerd als gelezen.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.seconds"><b>Na 5 seconden, na 20 seconden. </b>Het e-mailbericht wordt gemarkeerd als gelezen na de gedefinieerde periode.</p></li>
@@ -126,7 +127,7 @@
 <p role="presentation">Opmerking: De naam van de verzender wordt getoond vóór het e-mailadres. Als u een naam ingeeft in het <span class="guibutton"><strong>Uw naam</strong></span> veld van de Account instellingen, overschrijft deze naam de vooraf ingestelde verzender.</p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>berichtformaat. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Bepaalt in welk formaat e-mailberichten worden verstuurd: </p>
+<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>Berichtindeling. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Bepaalt in welk formaat e-mailberichten worden verstuurd: </p>
 <ul class="itemizedlist" style="list-style-type: square; ">
 <li class="listitem"><p><b>HTML. </b>De e-mail wordt verzonden met html-opmaak. U kan de e-mailtekst opmaken.</p></li>
 <li class="listitem"><p><b>Platte tekst. </b>De e-mailtekst wordt verzonden als platte tekst zonder opmaak.</p></li>
@@ -173,10 +174,10 @@
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.html"><b>HTML geformatteerde e-mailberichten toestaan. </b><a class="indexterm" name="id-1.7.20.12.2.1.1.1.2"></a>Geeft aan of het tonen van HTML e-mailberichten is toegestaan.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>toon verzoeken om leesbevestigingen. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Geeft aan of een ontvangstbevestiging wordt getoond als een ontvangen e-mailbericht een ontvangstbevestigingsverzoek heeft.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>Toon verzoeken om ontvangstbevestigingen. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Geeft aan of een ontvangstbevestiging wordt getoond als een ontvangen e-mailbericht een ontvangstbevestigingsverzoek heeft.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>verwijderde e-mailberichten permanent wissen. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Bepaalt of verwijderde e-mailberichten permanent worden verwijderd of dat deze naar de prullenbakmap gaan.</p>
-<p role="presentation"><span class="phrase"><strong>Waarschuwing:</strong></span> Permanent verwijderde e-mailberichten kunnen niet hersteld worden.</p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>Verwijderde e-mailberichten permanent wissen. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Bepaalt of verwijderde e-mailberichten permanent worden verwijderd of dat deze naar de prullenbakmap gaan.</p>
+<p role="presentation"><span class="phrase"><strong>Waarschuwing:</strong></span> Afhankelijk van de configuratie kunnen permanent verwijderde e-mailberichten <span class="bold">niet</span> hersteld worden.</p>
 <p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-mailberichten verwijderen</a></p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.selectrecent"><b>Selecteer automatisch het nieuwste gelezen bericht bij het starten. </b><a class="indexterm" name="id-1.7.20.12.2.1.4.1.2"></a>Definieert of het laatst gelezen bericht automatisch bij het starten van de app heropend moet worden het starten van de app.</p></li>
@@ -187,7 +188,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.mailinglist"><b>Bevestiging vragen voordat u op een mailinglijst reageert. </b><a class="indexterm" name="id-1.7.20.12.2.1.9.1.2"></a>Definieert of u een ontvangstbevestiging wilt ontvangen als u reageert naar een mailinglijst.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.appendvcard"><b>Altijd mijn contactgegevens koppelen als een vCard. </b><a class="indexterm" name="id-1.7.20.12.2.1.10.1.2"></a>Bepaalt of uw contactgegevens worden meegestuurd als vCard met een nieuw E-mail bericht.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>e-mails doorsturen als. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Geeft aan hoe een e-mailbericht wordt gestuurd als deze wordt doorgestuurd, </p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>E-mails doorsturen als. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Geeft aan hoe een e-mailbericht wordt gestuurd als deze wordt doorgestuurd, </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p><b>Inline. </b>De tekst wordt opgenomen in de tekst van het nieuwe e-mailbericht.</p></li>
 <li class="listitem"><p><b>Bijlage. </b>De tekst wordt verzonden als een bijlage bij een nieuw e-mailbericht.</p></li>
@@ -204,7 +205,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
@@ -224,7 +225,7 @@
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-mailinstellingen</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">E-mailberichten bekijken</a>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.email.view.html b/help/l10n/nl_NL/ox.appsuite.user.sect.email.view.html
index 97430d919..619acf374 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.email.view.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.email.view.html
@@ -82,11 +82,10 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Het <span class="phrase">E-mail</span> lijstoverzicht</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Het <span class="phrase">E-mail</span> detailoverzicht</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Werken met Postvak IN-categorieën</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Tonen of opslaan van e-mailbijlagen</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">E-mailbron weergeven</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Markeren van e-mailberichten als gelezen of ongelezen</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.firststeps.gui.notificationarea.html b/help/l10n/nl_NL/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
index 56bac8919..e2bdcb17b 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
@@ -83,7 +83,7 @@
               <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Algemene instellingen aanpassen</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Gebruik het meldingengebied</a>
+              <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">gebruik het meldingengebied</a>
             </p>
 <p role="presentation" class="cap-calendar">
               <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Beantwoorden van Afspraakuitnodigingen</a>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.createencrypted.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.createencrypted.html
index 6743b2541..0bc92cfdd 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.createencrypted.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.createencrypted.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office-documenten coderen">
-<link rel="prev" href="ox.appsuite.user.sect.guard.documents.html" title="Office-documenten coderen">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Officedocumenten Coderen">
+<link rel="prev" href="ox.appsuite.user.sect.guard.documents.html" title="Officedocumenten Coderen">
 <link rel="next" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html" title="Geselecteerde documenten opslaan in een gecodeerd formaat">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Gegevens Coderen met <span class="phrase">Guard</span>
 </h1>
-<h2 class="sr-only">Office-documenten coderen</h2>
+<h2 class="sr-only">Officedocumenten Coderen</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.createencrypted">
 <div class="titlepage"><div><div><h3 class="title">Nieuwe gecodeerde bestanden aanmaken</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.8.2"></a><a class="indexterm" name="id-1.14.10.8.3"></a><a class="indexterm" name="id-1.14.10.8.4"></a><p id="ox.appsuite.user.concept.guard.documents.createencrypted">Als u een nieuw document maakt heeft u de optie om een document te maken dat gecodeerd wordt opgeslagen.. De volgende opties zijn beschikbaar: </p>
@@ -84,7 +84,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.guard.documents.createencrypted">Zie ook: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office-documenten coderen</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.createencrypted">Zie ook: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Officedocumenten Coderen</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.html
index 160a7294e..7629a3de8 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.html
@@ -1,7 +1,7 @@
 <html lang="nl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Office-documenten coderen</title>
+<title>Officedocumenten Coderen</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
@@ -32,7 +32,7 @@
   <h1 class="sr-only">Gegevens Coderen met <span class="phrase">Guard</span>
 </h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.documents">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Office-documenten coderen</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Officedocumenten Coderen</h2></div></div></div>
 <a class="indexterm" name="id-1.14.10.2"></a><a class="indexterm" name="id-1.14.10.3"></a><a class="indexterm" name="id-1.14.10.4"></a><a class="indexterm" name="id-1.14.10.5"></a><p id="ox.appsuite.user.concept.guard.documents">De volgende opties zijn beschikbaar:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.createencrypted.html">Nieuwe gecodeerde bestanden aanmaken</a></p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.open.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.open.html
index a8d05a125..71c8d686b 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.open.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.open.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office-documenten coderen">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Officedocumenten Coderen">
 <link rel="prev" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html" title="Geselecteerde documenten opslaan in een gecodeerd formaat">
 <link rel="next" href="ox.appsuite.user.sect.guard.logout.html" title="Afmelden uit Guard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Gegevens Coderen met <span class="phrase">Guard</span>
 </h1>
-<h2 class="sr-only">Office-documenten coderen</h2>
+<h2 class="sr-only">Officedocumenten Coderen</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.open">
 <div class="titlepage"><div><div><h3 class="title">Gecodeerde documenten openen</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.10.2"></a><a class="indexterm" name="id-1.14.10.10.3"></a><p id="ox.appsuite.user.concept.guard.documents.open">U kan een gecodeerd document openen om het volgende te doen:</p>
@@ -75,7 +75,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.guard.documents.open">Zie ook: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office-documenten coderen</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.open">Zie ook: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Officedocumenten Coderen</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.saveencrypted.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.saveencrypted.html
index 1391c93cd..0c7686ac4 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.saveencrypted.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.documents.saveencrypted.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office-documenten coderen">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Officedocumenten Coderen">
 <link rel="prev" href="ox.appsuite.user.sect.guard.documents.createencrypted.html" title="Nieuwe gecodeerde bestanden aanmaken">
 <link rel="next" href="ox.appsuite.user.sect.guard.documents.open.html" title="Gecodeerde documenten openen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Gegevens Coderen met <span class="phrase">Guard</span>
 </h1>
-<h2 class="sr-only">Office-documenten coderen</h2>
+<h2 class="sr-only">Officedocumenten Coderen</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.saveencrypted">
 <div class="titlepage"><div><div><h3 class="title">Geselecteerde documenten opslaan in een gecodeerd formaat</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.9.2"></a><a class="indexterm" name="id-1.14.10.9.3"></a><p id="ox.appsuite.user.concept.guard.documents.saveencrypted">Als u een tekstdocument, rekenblad of presentatie heeft geopend, kan u dit document openen in een gecodeerd formaat.</p>
@@ -68,7 +68,7 @@
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.guard.documents.saveencrypted">Zie ook: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office-documenten coderen</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.saveencrypted">Zie ook: <a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Officedocumenten Coderen</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.drive.decrypt.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.drive.decrypt.html
index c7856896a..183497b31 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.drive.decrypt.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.drive.decrypt.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.guard.drive.html" title="Bestanden Coderen of Decoderen">
 <link rel="prev" href="ox.appsuite.user.sect.guard.drive.download.html" title="Gecodeerde bestanden downloaden">
-<link rel="next" href="ox.appsuite.user.sect.guard.documents.html" title="Office-documenten coderen">
+<link rel="next" href="ox.appsuite.user.sect.guard.documents.html" title="Officedocumenten Coderen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.email.send.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.email.send.html
index 168ba7791..d7503a9b8 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.email.send.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.email.send.html
@@ -49,7 +49,7 @@
 <p role="presentation">U kunt ook op <span class="guibutton"><strong>Instellingen</strong></span> klikken in de App Launcher.</p>
 <p role="presentation">Het <span class="guilabel"><strong>Instellingen</strong></span> venster wordt geopend.</p>
 </li>
-<li class="step"><p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linkerpaneel.</p></li>
+<li class="step"><p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linker paneel. Klik op <span class="guibutton"><strong>S/MIME</strong></span> in het rechter paneel.</p></li>
 <li class="step">
 <p role="presentation">Activeer <span class="guibutton"><strong>S/MIME inschakelen</strong></span>.</p>
 <p role="presentation">Als S/MIME codering de standaard moet zijn schakelt u <span class="guibutton"><strong>Standaard S/MIME gebruiken voor ondertekenen en coderen</strong></span> in, onder <span class="guibutton"><strong>Standaard instellingen</strong></span>.</p>
@@ -75,7 +75,7 @@
 <li class="listitem"><p role="presentation">Om de e-mailontvanger in staat te stellen gecodeerde antwoorden te sturen, moet deze uw publieke sleutel hebben. U kan uw publieke sleutel als een bijlage sturen. Om dit te doen schakelt u <span class="guibutton"><strong>Mijn publieke sleutel toevoegen</strong></span> in.</p></li>
 <li class="listitem">
 <p role="presentation">Als u PGP gebruikt heeft u de volgende mogelijkheden:</p>
-<p role="presentation">Als <span class="guibutton"><strong>Toon geavanceerde instellingen</strong></span> is ingeschakeld in de <span class="phrase">Guard</span> instellingen, kan u het PGP formaat instellen.</p>
+<p role="presentation">U kan het PGP formaat instellen als de <span class="guibutton"><strong>Toon geavanceerde instellingen bij het opstellen van e-mailberichten</strong></span> is ingeschakeld in de <span class="phrase">Guard</span> instellingen onder <span class="guibutton"><strong>Geavanceerd</strong></span>.</p>
 <p role="presentation">Standaard worden gecodeerde e–mailberichten verstuurd met <span class="guibutton"><strong>Mime</strong></span> codering. Sommige oudere e-mailclients ondersteunen alleen PGP/Inline. Als de ontvanger een dergelijke client gebruikt schakelt u <span class="guibutton"><strong>Inline</strong></span> in.</p>
 <p role="presentation">Opmerking: Als u <span class="guibutton"><strong>Inline</strong></span> gebruikt, kan u e-mails niet in html formaat sturen.</p>
 </li>
@@ -98,7 +98,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.read.html">Gecodeerde e-mailberichten lezen</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.external.html">Hoe kan een externe ontvanger een gecodeerd bericht lezen?</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Versturen van een nieuw e-mailbericht</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Nieuwe e-mailberichten versturen</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Instellingen</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.email.send">Zie ook: <a class="xref" href="ox.appsuite.user.sect.guard.email.html">E-mailconversaties Coderen</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.html
index a1c982580..76bdc5d59 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Gegevens Coderen met Guard">
-<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Wachtwoordbeheer">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="De wachtwoordherstelfunctie verwijderen">
 <link rel="next" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Eigen PGP sleutels beheren">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Volgende</a></li>
@@ -44,9 +44,24 @@
 <p id="ox.appsuite.user.possibilities.guard.keys">U heeft de volgende mogelijkheden: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Eigen PGP sleutels beheren</a></p></li>
-<li class="listitem cap-smime" id="id-1.14.13.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Eigen S/MIME sleutels beheren</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Publieke sleutels beheren</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">PGP sleutels van ontvangers beheren</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Eigen S/MIME sleutels beheren</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">S/MIME sleutels van ontvangers beheren</a></p></li>
 </ul>
+<p id="ox.appsuite.user.related.guard.keys">
+      </p>
+<p class="title">Zie ook:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Instellingen</a>
+          </p></li>
+</ul>
+<p>
+    </p>
+<p id="ox.appsuite.user.parent.guard.keys">Zie ook: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Gegevens Coderen met <span class="phrase">Guard</span></i></a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.pgppublickeys.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
index e40ac32c4..778fcfefb 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
@@ -1,13 +1,13 @@
 <html lang="nl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Publieke sleutels beheren</title>
+<title>PGP sleutels van ontvangers beheren</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Sleutelbeheer">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Eigen S/MIME sleutels beheren">
-<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="GuardInstellingen">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Eigen PGP sleutels beheren">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Eigen S/MIME sleutels beheren">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Volgende</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Volgende</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,55 +33,36 @@
 </h1>
 <h2 class="sr-only">Sleutelbeheer</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.pgppublickeys">
-<div class="titlepage"><div><div><h3 class="title">Publieke sleutels beheren</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">Op de <span class="phrase"><span class="guilabel"><strong>Guard beveiligingsinstellingen</strong></span></span> pagina kan u: </p>
+<div class="titlepage"><div><div><h3 class="title">PGP sleutels van ontvangers beheren</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.8.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">U heeft de volgende mogelijkheden: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">publieke sleutels tonen</p></li>
+<li class="listitem"><p role="presentation">toon of verwijder publieke sleutels</p></li>
 <li class="listitem"><p role="presentation">upload publieke sleutel</p></li>
-<li class="listitem"><p role="presentation">verwijder een eigen publieke sleutel</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.guard.pgppublickeys">
-<p class="title">U kan de sleutels beheren met de volgende beheerfuncties:</p>
+<p class="title">Een lijst van PGP-sleutels van verzenders toont u als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
-<p role="presentation">U kunt ook op <span class="guibutton"><strong>Instellingen</strong></span> klikken in de App Launcher.</p>
-<p role="presentation">Het <span class="guilabel"><strong>Instellingen</strong></span> venster wordt geopend.</p>
+<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
+<p role="presentation">Klik op Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linker paneel. Klik op <span class="guibutton"><strong>Ontvanger PGP sleutels</strong></span> in het rechter paneel.</p>
+<p role="presentation">De publieke PGP sleutels van ontvangers worden getoond.</p>
 </li>
 <li class="step">
-<p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linkerpaneel.</p>
-<p role="presentation">De <span class="phrase"><span class="guilabel"><strong>Guard beveiligingsinstellingen</strong></span></span> pagina wordt getoond.</p>
-</li>
-<li class="step">
-<p role="presentation">Schakel <span class="guibutton"><strong>Toon geavanceerde instellingen</strong></span> in.</p>
-<p role="presentation">De sleutelbeheerfuncties worden getoond.</p>
+<p role="presentation">Om de details van een sleutel te zien klikt u op een sleutel ID.</p>
+<p role="presentation">Om een sleutel te verwijderen klikt u het <span class="guibutton"><strong>Verwijderen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> naast de sleutel.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.display">
-<p class="title">U kunt uw publieke sleutel als volgt tonen:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
+<p class="title">Uploaden van de publieke sleutel van een ontvanger gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Klik op <span class="guibutton"><strong>Publieke sleutels van ontvangers</strong></span>. Het <span class="guilabel"><strong>Publieke Sleutels</strong></span> scherm opent.</p>
-<p role="presentation">De publieke sleutels die door u en andere gebruikers worden gedeeld worden getoond. Als de publieke sleutel van een gebruiker in de lijst staat kan u gecodeerde e-mailberichten naar deze gebruiker sturen en controleren of de ondertekening van de gebruiker correct is.</p>
-</li>
-<li class="step">
-<p role="presentation">Om de details van een sleutel te tonen klikt u het <span class="guibutton"><strong>Details</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> naast de sleutel. Het <span class="guilabel"><strong>Publieke Sleutel Details</strong></span> scherm opent.</p>
-<p role="presentation">U kan publieke sleutels delen door <span class="guibutton"><strong>Sleutels delen</strong></span> in te schakelen. Andere gebruikers kunnen uw gedeelde sleutels zien en downloaden. Publieke sleutels zijn alleen beschikbaar voor groupware gebruikers.</p>
+<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
+<p role="presentation">Klik op Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linker paneel. Klik op <span class="guibutton"><strong>Ontvanger PGP sleutels</strong></span> in het rechter paneel.</p>
 </li>
+<li class="step"><p role="presentation">Klik op <span class="guibutton"><strong>Publieke ontvanger sleutel uploaden</strong></span>. Selecteer een bestand met een publieke sleutel.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
-<p class="title">Uploaden van de publieke sleutel van een ontvanger in het <span class="guilabel"><strong>Publieke Sleutels</strong></span> scherm gaat als volgt:</p>
-<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Klik op het <span class="guibutton"><strong>Toevoegen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.upload.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> naast <span class="guilabel"><strong>PGP Publieke Sleutellijst</strong></span>. Selecteer een bestand met een publieke sleutel.</p></li></ul></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.delete">
-<p class="title">Een publieke sleutel verwijderen uit het <span class="guilabel"><strong>Publieke Sleutels</strong></span> scherm gaat als volgt:</p>
-<div class="procedure"><ul class="procedure"><li class="step">
-<p role="presentation">Klik het <span class="guibutton"><strong>Verwijderen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> naast een publieke sleutel.</p>
-<p role="presentation">Bevestig het verwijderen van de publieke sleutel.</p>
-</li></ul></div>
-</div>
 <p id="ox.appsuite.user.related.guard.keys.pgppublickeys">
         </p>
 <p class="title">Zie ook:</p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.smimepublickeys.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
new file mode 100644
index 000000000..240a3938c
--- /dev/null
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
@@ -0,0 +1,85 @@
+<html lang="nl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>S/MIME sleutels van ontvangers beheren</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Gebruikershandleiding">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Sleutelbeheer">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Eigen S/MIME sleutels beheren">
+<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="GuardInstellingen">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Terug</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Volgende</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Gegevens Coderen met <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Sleutelbeheer</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.keys.smimepublickeys">
+<div class="titlepage"><div><div><h3 class="title">S/MIME sleutels van ontvangers beheren</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.10.2"></a><p id="ox.appsuite.user.concept.guard.keys.smimepublickeys">U heeft de volgende mogelijkheden: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">publieke sleutels tonen</p></li>
+<li class="listitem"><p role="presentation">upload publieke sleutel</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.smimepublickeys">
+<p class="title">U kunt de S/MIME sleutels van ontvangers als volgt tonen:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
+<p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linker paneel. Klik op <span class="guibutton"><strong>S/MIME ontvangers</strong></span> in het rechter paneel.</p>
+</li>
+<li class="step">
+<p role="presentation">Geef een e-mailadres in <span class="guibutton"><strong>Zoek een certificaat</strong></span>. Klik op <span class="guibutton"><strong>Zoeken</strong></span>.</p>
+<p role="presentation">Als een certificaat gevonden is, worden de gegevens van het certificaat getoond.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.guard.keys.smimepublickeys.upload">
+<p class="title">Uploaden van de publieke sleutel van een ontvanger gaat als volgt:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
+<p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linker paneel. Klik op <span class="guibutton"><strong>S/MIME ontvangers</strong></span> in het rechter paneel.</p>
+</li>
+<li class="step"><p role="presentation">Klik op <span class="guibutton"><strong>Publieke ontvanger sleutel uploaden</strong></span>. Selecteer een bestand met een publieke sleutel.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.keys.smimepublickeys">
+        </p>
+<p class="title">Zie ook:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Eigen PGP sleutels beheren</a>
+            </p>
+<p role="presentation" class="cap-smime">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Eigen S/MIME sleutels beheren</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a>
+            </p>
+</li></ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.keys.smimepublickeys">Overkoepelend thema: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
index 345b66bc7..7fb465ce3 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Sleutelbeheer">
 <link rel="prev" href="ox.appsuite.user.sect.guard.keys.html" title="Sleutelbeheer">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Eigen S/MIME sleutels beheren">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="PGP sleutels van ontvangers beheren">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Volgende</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Volgende</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,121 +34,93 @@
 <h2 class="sr-only">Sleutelbeheer</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yourpgpkeys">
 <div class="titlepage"><div><div><h3 class="title">Eigen PGP sleutels beheren</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.5.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">Op de <span class="phrase"><span class="guilabel"><strong>Guard beveiligingsinstellingen</strong></span></span>    pagina kan u: </p>
+<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">U heeft de volgende mogelijkheden: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">nieuwe PGP sleutel toevoegen</p></li>
 <li class="listitem"><p role="presentation">toon eigen PGP sleutels, toon details</p></li>
-<li class="listitem">
-<p role="presentation">nieuwe PGP sleutel toevoegen</p>
-<p role="presentation">Als u meerdere sleutels heeft, kan u opgeven welke sleutel de huidige is. De huidige sleutel wordt gebruikt voor het coderen.</p>
-</li>
-<li class="listitem">
-<p role="presentation">GebruikersID´s toevoegen</p>
-<p role="presentation">Als u meerdere gebruikersID's aan een sleutel koppelt kan u de sleutel voor meerdere e-mailaccounts gebruiken.</p>
-</li>
-<li class="listitem"><p role="presentation">sleutels downloaden</p></li>
-<li class="listitem"><p role="presentation">verwijder sleutels</p></li>
+<li class="listitem"><p role="presentation">eigen PGP sleutels beheren: zet actief, bewerk ID's, intrekken, downloaden en verwijderen. </p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys">
-<p class="title">U kan de PGP sleutels beheren met de volgende beheerfuncties:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.add">
+<p class="title">Een nieuwe PGP sleutel toevoegen gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
-<p role="presentation">U kunt ook op <span class="guibutton"><strong>Instellingen</strong></span> klikken in de App Launcher.</p>
-<p role="presentation">Het <span class="guilabel"><strong>Instellingen</strong></span> venster wordt geopend.</p>
+<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.addkey"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
+<p role="presentation">Klik op Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linker paneel. Klik op <span class="guibutton"><strong>Uw PGP sleutels</strong></span> in het rechter paneel.</p>
 </li>
 <li class="step">
-<p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linkerpaneel.</p>
-<p role="presentation">De <span class="phrase"><span class="guilabel"><strong>Guard beveiligingsinstellingen</strong></span></span> pagina wordt getoond.</p>
+<p role="presentation">U heeft de volgende mogelijkheden: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">Om een nieuw sleutelpaar te maken klikt u op <span class="guibutton"><strong>Nieuw aanmaken</strong></span>. Het <span class="phrase"><span class="guilabel"><strong>GuardBeveiligingssleutels aanmaken</strong></span></span> scherm wordt geopend.</p>
+<p role="presentation">Geef een wachtwoord voor de nieuwe sleutel. Bevestig dit wachtwoord.</p>
+<p role="presentation">De nieuwe sleutel bestaat uit een hoofdsleutel en een subsleutel.</p>
 </li>
-<li class="step">
-<p role="presentation">Schakel <span class="guibutton"><strong>Toon geavanceerde instellingen</strong></span> in.</p>
-<p role="presentation">De sleutelbeheerfuncties worden getoond.</p>
+<li class="listitem">
+<p role="presentation">Om een bestaande privé sleutel toe te voegen, klikt u op <span class="guibutton"><strong>Privésleutel uploaden</strong></span>. Selecteer het bestand dat de privésleutel bevat. Het <span class="guilabel"><strong>Privésleutel uploaden</strong></span> scherm wordt geopend.</p>
+<p role="presentation">Om een nieuwe sleutel te uploaden geeft u uw <span class="phrase">Guard</span> beveiligingswachtwoord. Geef een nieuwe wachtwoord voor de nieuwe sleutel.</p>
+</li>
+<li class="listitem"><p role="presentation">Om een bestaande publieke sleutel toe te voegen klikt u op <span class="guibutton"><strong>Publieke sleutel uploaden</strong></span>. Selecteer het bestand met een publieke sleutel.</p></li>
+</ul></p>
+<p role="presentation">De nieuwe sleutel wordt boven aan de lijst toegevoegd. De nieuwe sleutel wordt de huidige sleutel.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.display">
-<p class="title">Uw eigen PGP sleutel tonen of één PGP sleutel als standaard instellen gaat als volgt:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.display">
+<p class="title">Uw bestaande PGP sleutels toont u als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Klik op <span class="guibutton"><strong>Uw sleutels</strong></span> onder <span class="guilabel"><strong>Sleutels</strong></span>.</p>
-<p role="presentation" class="cap-smime">Afhankelijk van de configuratie opent het <span class="guilabel"><strong>Selecteer sleuteltypen om te wijzigen</strong></span> scherm. Selecteert <span class="guibutton"><strong>PGP</strong></span>.</p>
-<p role="presentation">Het <span class="guilabel"><strong>Uw sleutels</strong></span> venster wordt geopend.</p>
-<p role="presentation">
-              <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">De PGP sleutels worden getoond. Elke PGP sleutel bestaat uit een hoofdsleutel en een subsleutel. <ul class="itemizedlist" style="list-style-type: circle; ">
+<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
+<p role="presentation">Klik op Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linker paneel. Klik op <span class="guibutton"><strong>Uw PGP sleutels</strong></span> in het rechter paneel.</p>
+<p role="presentation">Uw PGP sleutels worden getoond. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Elke PGP sleutel bestaat uit een hoofdsleutel en een subsleutel. <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">De hoofdsleutel wordt onder andere gebruikt voor het ondertekenen van e-mailberichten.</p></li>
 <li class="listitem"><p role="presentation">De subsleutel wordt gebruikt voor het coderen en decoderen.</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">Afhankelijk van de eisen gebruikt <span class="phrase">Guard</span> automatisch de hoofd- of de subsleutel.</p></li>
-</ul>
-            </p>
+</ul></p>
 </li>
-<li class="step"><p role="presentation">As uw sleutellijst meer dan één sleutel bevat kan u de huidige sleutel aanwijzen. Om dit te doen schakelt u het <span class="guibutton"><strong>Huidig</strong></span> aankruisvakje naast de hoofd sleutel aan. Vanaf dit moment zal de huidige sleutel gebruikt worden voor codering.</p></li>
-<li class="step"><p role="presentation">Om de details van een sleutel te tonen klikt u het <span class="guibutton"><strong>Details</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> naast de sleutel. Het <span class="guilabel"><strong>Sleutel Details</strong></span> scherm opent. Om de handtekening van de sleutel te zien klikt u op <span class="guibutton"><strong>Handtekeningen</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addkey">
-<p class="title">Een nieuwe PGP sleutel toevoegen aan het <span class="guilabel"><strong>Uw Sleutels</strong></span> scherm gaat als volgt:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Klik het <span class="guibutton"><strong>Gebruikers sleutel toevoegen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> naast <span class="guibutton"><strong>Uw sleutellijst</strong></span>. Het <span class="guilabel"><strong>Sleutels toevoegen</strong></span> scherm opent.</p></li>
 <li class="step">
-<p role="presentation">U heeft de volgende mogelijkheden: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-<p role="presentation">Om een privé sleutel toe te voegen, klikt u op <span class="guibutton"><strong>Privésleutel uploaden</strong></span>. Selecteer het bestand dat de privésleutel bevat. Het <span class="guilabel"><strong>Privésleutel uploaden</strong></span> scherm wordt geopend.</p>
-<p role="presentation">Om een nieuwe sleutel te uploaden geeft u uw <span class="phrase">Guard</span> beveiligingswachtwoord. Geef een nieuwe wachtwoord voor de nieuwe sleutel.</p>
-</li>
-<li class="listitem"><p role="presentation">Om een publieke sleutel toe te voegen klikt u op <span class="guibutton"><strong>Alleen Publieke sleutel uploaden</strong></span>. Selecteer het bestand met een publieke sleutel.</p></li>
-<li class="listitem">
-<p role="presentation">Om een nieuw sleutelpaar te maken klikt u op <span class="guibutton"><strong>Nieuwe Sleutels Aanmaken</strong></span>. Het <span class="phrase"><span class="guilabel"><strong>GuardBeveiligingssleutels aanmaken</strong></span></span>  scherm wordt geopend.</p>
-<p role="presentation">Geef een wachtwoord voor de nieuwe sleutel. Bevestig dit wachtwoord.</p>
-<p role="presentation">De nieuwe sleutel bestaat uit een hoofdsleutel en een subsleutel.</p>
-</li>
-</ul></p>
-<p role="presentation">De nieuwe sleutel wordt boven aan de lijst toegevoegd. De nieuwe sleutel wordt de huidige sleutel.</p>
+<p role="presentation">Om de details van een sleutel te tonen klikt u het <span class="guibutton"><strong>Sleutels beheren</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> naast de hoofdsleutel. Het <span class="guilabel"><strong>Sleutel details</strong></span> scherm opent.</p>
+<p role="presentation">Om de bevestig van de sleutel te zien klikt u op <span class="guibutton"><strong>Handtekeningen</strong></span>.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addaccount">
-<p class="title">Een extra sleutel toevoegen aan het <span class="guilabel"><strong>Uw Sleutels</strong></span>scherm gaat als volgt:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.manage">
+<p class="title">Uw bestaande PGP sleutels beheert u als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Klik op het <span class="guibutton"><strong>Bewerk ID's</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addaccount.edit"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> naast een sleutel. Het <span class="guilabel"><strong>Voeg gebruikers-ID toe</strong></span> scherm opent.</p></li>
 <li class="step">
+<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
+<p role="presentation">Klik op Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linker paneel. Klik op <span class="guibutton"><strong>Uw PGP sleutels</strong></span> in het rechter paneel.</p>
+<p role="presentation">Uw PGP sleutels worden getoond.</p>
+</li>
+<li class="step"><p role="presentation">Klik het <span class="guibutton"><strong>Beheer sleutels</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> naast de hoofdsleutel. Gebruik de volgende functies. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">As uw sleutellijst meer dan één sleutel bevat kan u de huidige sleutel aanwijzen. Om dit te doen schakelt u het <span class="guibutton"><strong>Markeer als huidig</strong></span> aankruisvakje aan. Vanaf dit moment zal de huidige sleutel gebruikt worden voor codering. </p></li>
+<li class="listitem">
+<p role="presentation">Als u de sleutel wil gebruiken voor een andere e-mailaccount, klikt u op <span class="guibutton"><strong>Bewerk IDs</strong></span>. Het <span class="guilabel"><strong>Gebruiker ID toevoegen</strong></span> scherm opent.</p>
 <p role="presentation">Geef een naam voor de gebruikers ID. Geef het e-mailadres welke u wilt gebruiken voor deze sleutel.</p>
 <p role="presentation">Geef uw wachtwoord voor deze sleutel.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.download">
-<p class="title">Een sleutel downloaden uit het <span class="guilabel"><strong>Uw Sleutels</strong></span> scherm gaat als volgt:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Klik het <span class="guibutton"><strong>Downloaden</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> naast de sleutel.</p></li>
-<li class="step">
+<li class="listitem">
+<p role="presentation">Om een privésleutel te downloaden klikt u op <span class="guibutton"><strong>Downloaden</strong></span>.</p>
 <p role="presentation">Geef aan of u alleen uw privésleutel, alleen uw publieke sleutel of beide sleutels wilt downloaden.</p>
 <p role="presentation"><span class="phrase"><strong>Opgepast:</strong></span> Uw privésleutel wordt in gecodeerde vorm gedownload. U moet echter niet uw privésleutel downloaden naar een openbare machine.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.delete">
-<p class="title">Een nieuwe sleutel verwijderen uit het <span class="guilabel"><strong>Uw Sleutels</strong></span>scherm gaat als volgt:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Waarschuwing:</strong></span> Als u uw privésleutel verwijderd, kan u met deze sleutel gecodeerde objecten niet meer decoderen. Als u twijfelt moet u de sleutel niet verwijderen maar ongeldig verklaren (intrekken). Een ingetrokken sleutel kan niet meer gebruikt worden om te coderen, maar nog wel voor het decoderen van objecten die eerder gecodeerd zijn met de sleutel.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Klik op het <span class="guibutton"><strong>Verwijderen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> naast een sleutel. Het <span class="guilabel"><strong>Verwijder Privé Sleutel</strong></span> scherm opent.</p></li>
-<li class="step"><p role="presentation">U heeft de volgende mogelijkheden:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Om een privésleutel in te trekken of te verwijderen klikt u op <span class="guibutton"><strong>Verwijderen</strong></span>. Het <span class="guilabel"><strong>Privésleutel verwijderen</strong></span> scherm opent. Opmerkingen: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">als u een sleutel intrekt, kan deze niet meer gebruikt worden. U kan nog wel objecten decoderen die zijn gecodeerd met deze sleutel. Daarom is het intrekken van een sleutel beter dan het verwijderen van een sleutel.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Waarschuwing:</strong></span> Als u een privésleutel verwijderd kan u met deze sleutel gecodeerde objecten niet meer decoderen.</p></li>
+</ul> <p role="presentation">U heeft de volgende mogelijkheden:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
-<p role="presentation">Om een privésleutel in te trekken klikt u op <span class="guibutton"><strong>Intrekken</strong></span>.  </p>
-<p role="presentation">als u een sleutel intrekt, kan deze niet meer gebruikt worden. U kan nog wel objecten decoderen die zijn gecodeerd met deze sleutel. Daarom is het intrekken van een sleutel beter dan het verwijderen van een sleutel.</p>
+<p role="presentation">Om een privésleutel in te trekken klikt u op <span class="guibutton"><strong>Intrekken</strong></span>.</p>
 <p role="presentation">Geef het wachtwoord van de privésleutel. Indien nodig geeft u de reden op waarom u de sleutel intrekt.</p>
-<p role="presentation">Klik op <span class="guibutton"><strong>Intrekken</strong></span>.</p>
+<p role="presentation">Klik op <span class="guibutton"><strong>Intrekken</strong></span>. </p>
+<p role="presentation">U kan ook klikken op <span class="guibutton"><strong>Intrekken</strong></span> vanuit het menu.</p>
 </li>
 <li class="listitem">
-<p role="presentation">Om een privésleutel te verwijderen klikt u op <span class="guibutton"><strong>Verwijderen</strong></span>. </p>
-<p role="presentation"><span class="phrase"><strong>Waarschuwing:</strong></span> Als u een privésleutel verwijderd kan u met deze sleutel gecodeerde objecten niet meer decoderen.</p>
-<p role="presentation">Geef het wachtwoord van de privésleutel.</p>
-<p role="presentation">Klik op de <span class="guibutton"><strong>Verwijderen</strong></span> knop.</p>
+<p role="presentation">Om de privésleutel te verwijderen klikt u op <span class="guibutton"><strong>Verwijderen</strong></span>.</p>
+<p role="presentation">Geef het wachtwoord van de privésleutel. </p>
+<p role="presentation">Klik de <span class="guibutton"><strong>Verwijderen</strong></span> knop.</p>
 </li>
-</ul>Als u een hoofdsleutel verwijderd worden de overeenkomstige subsleutels ook verwijderd.</p></li>
+</ul> Als u een hoofdsleutel wordt verwijderd worden de overeenkomstige subsleutels ook verwijderd.</p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yourpgpkeys">
@@ -156,7 +128,7 @@
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Publieke sleutels beheren</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">PGP sleutels van ontvangers beheren</a>
             </p>
 <p role="presentation" class="cap-smime">
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Eigen S/MIME sleutels beheren</a>
@@ -167,7 +139,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yourpgpkeys">Overkoepelend thema: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yourpgpkeys">Overkoepelend thema: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
index ef296039d..8ab19474d 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Sleutelbeheer">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Eigen PGP sleutels beheren">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Publieke sleutels beheren">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="PGP sleutels van ontvangers beheren">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="S/MIME sleutels van ontvangers beheren">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Volgende</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Volgende</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,46 +34,27 @@
 <h2 class="sr-only">Sleutelbeheer</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yoursmimekeys">
 <div class="titlepage"><div><div><h3 class="title">Eigen S/MIME sleutels beheren</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.6.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">Op de <span class="phrase"><span class="guilabel"><strong>Guard beveiligingsinstellingen</strong></span></span>    pagina kan u: </p>
+<a class="indexterm" name="id-1.14.13.9.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">U heeft de volgende mogelijkheden: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">nieuwe S/MIME sleutel toevoegen</p>
 <p role="presentation">Als u meerdere sleutels heeft, kan u opgeven welke sleutel de huidige is. De huidige sleutel wordt gebruikt voor het coderen.</p>
 </li>
 <li class="listitem"><p role="presentation">toon eigen S/MIME sleutels, toon details</p></li>
-<li class="listitem"><p role="presentation">sleutels downloaden</p></li>
-<li class="listitem"><p role="presentation">verwijder sleutels</p></li>
+<li class="listitem"><p role="presentation">eigen S/MIME sleutels beheren: zet actief, bewerk ID's, intrekken, downloaden en verwijderen.</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys">
-<p class="title">U kan de S/MIME sleutels beheren met de volgende beheerfuncties:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.add">
+<p class="title">Een nieuwe S/MIME sleutel toevoegen gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
-<p role="presentation">U kunt ook op <span class="guibutton"><strong>Instellingen</strong></span> klikken in de App Launcher.</p>
-<p role="presentation">Het <span class="guilabel"><strong>Instellingen</strong></span> venster wordt geopend.</p>
-</li>
-<li class="step">
-<p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linkerpaneel.</p>
-<p role="presentation">De <span class="phrase"><span class="guilabel"><strong>Guard beveiligingsinstellingen</strong></span></span> pagina wordt getoond.</p>
-</li>
-<li class="step">
+<p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linker paneel. Klik op <span class="guibutton"><strong>S/MIME</strong></span> in het rechter paneel.</p>
 <p role="presentation">Activeer <span class="guibutton"><strong>S/MIME inschakelen</strong></span>.</p>
-<p role="presentation">Schakel <span class="guibutton"><strong>Toon geavanceerde instellingen</strong></span> in.</p>
-<p role="presentation">De sleutelbeheerfuncties worden getoond.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.addkey">
-<p class="title">Een nieuwe S/MIME sleutel toevoegen gaat als volgt:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Klik op <span class="guibutton"><strong>Uw sleutels</strong></span> onder <span class="guibutton"><strong>Sleutels</strong></span>. Het <span class="guilabel"><strong>Selecteer sleuteltypen om te wijzigen</strong></span> scherm opent.</p>
-<p role="presentation">Selecteer <span class="guibutton"><strong>S/MIME</strong></span>. Het <span class="guilabel"><strong>Uw Certificaten</strong></span> venster wordt geopend.</p>
 </li>
-<li class="step"><p role="presentation">Klik het <span class="guibutton"><strong>Toevoegen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> naast de <span class="guilabel"><strong>Uw Sleutel lijst</strong></span>. Het <span class="guilabel"><strong>Upload S/MIME sleutels</strong></span> scherm opent.</p></li>
 <li class="step">
+<p role="presentation">Klik op <span class="guibutton"><strong>Privé certificaat uploaden</strong></span>. Het <span class="guilabel"><strong>Upload S/MIME sleutels</strong></span> scherm opent.</p>
 <p role="presentation">Geef de volgende wachtwoorden: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Om een nieuwe sleutel te uploaden geeft u uw <span class="phrase">Guard</span> beveiligingswachtwoord. Geef een nieuwe wachtwoord voor de nieuwe sleutel.</p></li>
+<li class="listitem"><p role="presentation">Geef uw <span class="phrase">Guard</span> beveiligingswachtwoord om de nieuwe sleutel te uploaden.</p></li>
 <li class="listitem">
 <p role="presentation">Een nieuw wachtwoord voor gecodeerde e-mailberichten.</p>
 <p role="presentation">Bevestig het nieuwe wachtwoord.</p>
@@ -85,48 +66,51 @@
 </ol></div>
 </div>
 <div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.display">
-<p class="title">Uw eigen S/MIME sleutel tonen of er één als standaard instellen gaat als volgt:</p>
+<p class="title">Uw eigen S/MIME sleutels toont u als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Klik op <span class="guibutton"><strong>Uw sleutels</strong></span> onder <span class="guilabel"><strong>Sleutels</strong></span>. Het <span class="guilabel"><strong>Selecteer sleuteltypen om te wijzigen</strong></span> scherm opent.</p>
-<p role="presentation">Selecteer <span class="guibutton"><strong>S/MIME</strong></span>.</p>
-<p role="presentation">Het <span class="guilabel"><strong>Uw certificaten</strong></span> venster wordt geopend. Uw S/MIME sleutels worden getoond.</p>
+<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
+<p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linker paneel. Klik op <span class="guibutton"><strong>S/MIME</strong></span> in het rechter paneel.</p>
+<p role="presentation">Activeer <span class="guibutton"><strong>S/MIME inschakelen</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Om de details van een sleutel te tonen klikt u het <span class="guibutton"><strong>Sleutels beheren</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> naast een sleutel. Het <span class="guilabel"><strong>Sleutel details</strong></span> scherm opent.</p>
+<p role="presentation">Om de bevestig van de sleutel te zien klikt u op <span class="guibutton"><strong>Handtekeningen</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">As uw sleutellijst meer dan één sleutel bevat kan u de huidige sleutel aanwijzen. Om dit te doen schakelt u het <span class="guibutton"><strong>Huidig</strong></span> aankruisvakje naast de hoofd sleutel aan. Vanaf dit moment zal de huidige sleutel gebruikt worden voor codering.</p></li>
-<li class="step"><p role="presentation">Om de details van een sleutel te tonen klikt u het <span class="guibutton"><strong>Details</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> naast de sleutel. Het <span class="guilabel"><strong>Sleutel Details</strong></span> scherm opent. Om de handtekening van de sleutel te zien klikt u op <span class="guibutton"><strong>Handtekeningen</strong></span>.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.download">
-<p class="title">Een sleutel downloaden uit het <span class="guilabel"><strong>Uw Sleutels</strong></span> scherm gaat als volgt:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.manage">
+<p class="title">Uw bestaande S/MIME sleutels beheert u als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Klik het <span class="guibutton"><strong>Downloaden</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> naast de sleutel.</p></li>
 <li class="step">
+<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
+<p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linker paneel. Klik op <span class="guibutton"><strong>S/MIME</strong></span> in het rechter paneel.</p>
+<p role="presentation">Activeer <span class="guibutton"><strong>S/MIME inschakelen</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Klik het <span class="guibutton"><strong>Beheer sleutels</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> naast een sleutel. Gebruik de volgende functies. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">As uw sleutellijst meer dan één sleutel bevat kan u de huidige sleutel aanwijzen. Om dit te doen schakelt u het <span class="guibutton"><strong>Markeer als huidig</strong></span> aankruisvakje aan. Vanaf dit moment zal de huidige sleutel gebruikt worden voor codering. </p></li>
+<li class="listitem">
+<p role="presentation">Om een privésleutel te downloaden klikt u op <span class="guibutton"><strong>Downloaden</strong></span>.</p>
 <p role="presentation">Geef aan of u alleen uw privésleutel, alleen uw publieke sleutel of beide sleutels wilt downloaden.</p>
 <p role="presentation"><span class="phrase"><strong>Opgepast:</strong></span> Uw privésleutel wordt in gecodeerde vorm gedownload. U moet echter niet uw privésleutel downloaden naar een openbare machine.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.delete">
-<p class="title">Een nieuwe sleutel verwijderen uit het <span class="guilabel"><strong>Uw Sleutels</strong></span>scherm gaat als volgt:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Waarschuwing:</strong></span> Als u uw privésleutel verwijderd, kan u met deze sleutel gecodeerde objecten niet meer decoderen. Als u twijfelt moet u de sleutel niet verwijderen maar ongeldig verklaren (intrekken). Een ingetrokken sleutel kan niet meer gebruikt worden om te coderen, maar nog wel voor het decoderen van objecten die eerder gecodeerd zijn met de sleutel.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Klik op het <span class="guibutton"><strong>Verwijderen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> naast een sleutel. Het <span class="guilabel"><strong>Verwijder Privé Sleutel</strong></span> scherm opent.</p></li>
-<li class="step"><p role="presentation">U heeft de volgende mogelijkheden: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Om een privésleutel te verwijderen of in te trekken, klikt u op <span class="guibutton"><strong>Verwijderen</strong></span>. Het <span class="guilabel"><strong>Verwijder privésleutel</strong></span> scherm opent. Opmerking: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Als u een sleutel intrekt wordt deze niet meer gebruikt. U kan nog wel berichten decoderen die zijn gecodeerd met deze sleutel. Daarom is een sleutel intrekken beter dan verwijderen.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Waarschuwing:</strong></span> Als u een privésleutel verwijderd, kan u met deze sleutel gecodeerde objecten niet meer decoderen.</p></li>
+</ul> <p role="presentation">U heeft de volgende mogelijkheden:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">Om de sleutel in te trekken, schakel <span class="guibutton"><strong>Intrekken</strong></span> in.</p>
-<p role="presentation">Als u een sleutel intrekt wordt deze niet meer gebruikt. U kan nog wel berichten decoderen die zijn gecodeerd met deze sleutel. Daarom is een sleutel intrekken beter dan verwijderen.</p>
 <p role="presentation">Geef het wachtwoord voor de privésleutel. Indien gewenst kiest u een reden voor het intrekken van de sleutel.</p>
 <p role="presentation">Klik op <span class="guibutton"><strong>Intrekken</strong></span>.</p>
+<p role="presentation">U kan ook klikken op <span class="guibutton"><strong>Intrekken</strong></span> in het menu.</p>
 </li>
 <li class="listitem">
 <p role="presentation">Om een privésleutel te verwijderen, klikt u op <span class="guibutton"><strong>Verwijderen</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Waarschuwing:</strong></span> Als u een privésleutel verwijderd, kan u met deze sleutel gecodeerde objecten niet meer decoderen.</p>
 <p role="presentation">Geef het wachtwoord voor de privésleutel.</p>
 <p role="presentation">Klik op de <span class="guibutton"><strong>Verwijderen</strong></span> knop.</p>
 </li>
 </ul></p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yoursmimekeys">
@@ -137,7 +121,7 @@
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Eigen PGP sleutels beheren</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Publieke sleutels beheren</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">PGP sleutels van ontvangers beheren</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a>
@@ -145,7 +129,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yoursmimekeys">Overkoepelend thema: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yoursmimekeys">Overkoepelend thema: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.change.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.change.html
new file mode 100644
index 000000000..c38199c52
--- /dev/null
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.change.html
@@ -0,0 +1,75 @@
+<html lang="nl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Het wachtwoord wijzigen</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Gebruikershandleiding">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Wachtwoordbeheer">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Wachtwoordbeheer">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.reset.html" title="Herstel het wachtwoord">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Terug</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.reset.html">Volgende</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Gegevens Coderen met <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Wachtwoordbeheer</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.change">
+<div class="titlepage"><div><div><h3 class="title">Het wachtwoord wijzigen</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.6.2"></a><a class="indexterm" name="id-1.14.12.6.3"></a><p role="presentation" class="cap-smime">Afhankelijk van de configuratie kan u ook S/MIME gebruiken voor codering in plaats van PGP. Voor PGP en S/MIME worden verschillende wachtwoorden gebruikt.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.change">
+<p class="title">Verander het <span class="phrase">Guard</span> wachtwoord als volgt:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.change"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
+<p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linkerpaneel. Klik op<span class="guibutton"><strong>Wachtwoord beheer (PGP)</strong></span><span class="cap-smime"> of op <span class="guibutton"><strong>Wachtwoord beheer (S/MIME)</strong></span></span> in het rechter paneel.</p>
+</li>
+<li class="step">
+<p role="presentation">In het <span class="guibutton"><strong>Oude wachtwoord</strong></span> veld geeft u het wachtwoord op wat u eerder heeft gebruikt voor het coderen van uw gegevens.</p>
+<p role="presentation">In het <span class="guibutton"><strong>Nieuw wachtwoord</strong></span> veld geeft u het wachtwoord op welke u in de toekomst wilt gebruiken voor het coderen van uw gegevens.</p>
+<p role="presentation">Bevestig het nieuwe wachtwoord in het <span class="guibutton"><strong>Bevestiging nieuw wachtwoord</strong></span> veld.</p>
+</li>
+<li class="step"><p role="presentation">Klik op <span class="guibutton"><strong>Wachtwoord wijzigen</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.change">
+        </p>
+<p class="title">Zie ook:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">Herstel het wachtwoord</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">De wachtwoordherstelfunctie verwijderen</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.change">Overkoepelend thema: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.deleterecovery.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.deleterecovery.html
new file mode 100644
index 000000000..743597558
--- /dev/null
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.deleterecovery.html
@@ -0,0 +1,74 @@
+<html lang="nl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>De wachtwoordherstelfunctie verwijderen</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Gebruikershandleiding">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Wachtwoordbeheer">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.reset.html" title="Herstel het wachtwoord">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Sleutelbeheer">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.reset.html">Terug</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Volgende</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Gegevens Coderen met <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Wachtwoordbeheer</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.deleterecovery">
+<div class="titlepage"><div><div><h3 class="title">De wachtwoordherstelfunctie verwijderen</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.8.2"></a><p id="ox.appsuite.user.concept.guard.password.deleterecovery">Om uw wachtwoord indien nodig te herstellen wordt uw wachtwoord versleuteld opgeslagen op de server. Als u dit niet wilt kan u de herstelfunctie verwijderen.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
+<p class="title">Het verwijderen van de optie voor het herstellen van het wachtwoord gaat als volgt:</p>
+<div class="taskprerequisites">
+          <p><span class="phrase"><strong>Waarschuwing:</strong></span> Als u de functie voor het herstellen van het wachtwoord uitschakelt, is het niet meer mogelijk om uw wachtwoord te herstellen. Als u daarna uw wachtwoord vergeet is er geen mogelijkheid om uw gecodeerde gegevens te decoderen.</p>
+        </div>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.remove"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
+<p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linker paneel. Klik op <span class="guibutton"><strong>Geavanceerd</strong></span> in het rechter paneel.</p>
+</li>
+<li class="step"><p role="presentation">Onder <span class="guibutton"><strong>Herstel opties</strong></span>, klik op <span class="guibutton"><strong>Verwijder wachtwoord herstel</strong></span>. Het <span class="guilabel"><strong>Verwijder herstel</strong></span> scherm opent.</p></li>
+<li class="step"><p role="presentation">Klik op de <span class="guibutton"><strong>Verwijderen</strong></span> knop.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.deleterecovery">
+        </p>
+<p class="title">Zie ook:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Het wachtwoord wijzigen</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">Herstel het wachtwoord</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.deleterecovery">Overkoepelend thema: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.html
index dc4950ac1..5ff5458a9 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Gegevens Coderen met Guard">
 <link rel="prev" href="ox.appsuite.user.sect.guard.logout.html" title="Afmelden uit Guard">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Sleutelbeheer">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.change.html" title="Het wachtwoord wijzigen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.logout.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Volgende</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.change.html">Volgende</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,102 +33,24 @@
 </h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.password">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Wachtwoordbeheer</h2></div></div></div>
-<a class="indexterm" name="id-1.14.12.2"></a><a class="indexterm" name="id-1.14.12.3"></a><a class="indexterm" name="id-1.14.12.4"></a><a class="indexterm" name="id-1.14.12.5"></a><a class="indexterm" name="id-1.14.12.6"></a><p id="ox.appsuite.user.concept.guard.password">De volgende opties zijn beschikbaar:</p>
+<a class="indexterm" name="id-1.14.12.2"></a><p id="ox.appsuite.user.concept.guard.password">De volgende opties zijn beschikbaar:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Het <span class="phrase">Guard</span> beveiligingswachtwoord wijzigen</p></li>
-<li class="listitem"><p role="presentation">Als u uw <span class="phrase">Guard</span>  beveiligingswachtwoord bent verloren, kan u een tijdelijk <span class="phrase">Guard</span> beveiligingswachtwoord aanvragen door het <span class="phrase">Guard</span> beveiligingswachtwoord te herstellen.</p></li>
-<li class="listitem"><p role="presentation">Een e-mailadres configureren voor het herstellen van het wachtwoord.</p></li>
-<li class="listitem"><p role="presentation">Om uw wachtwoord te herstellen als het nodig is, moet uw wachtwoord gecodeerd op de server opgeslagen worden. Als u niet wilt dat het wachtwoord op de server opgeslagen wordt, kan u het wachtwoordherstel verwijderen.</p></li>
-<li class="listitem cap-smime" id="id-1.14.12.7.1.5"><p role="presentation">Afhankelijk van de configuratie kan u ook S/MIME gebruiken voor de codering in plaats van PGP. In dit geval worden gescheiden wachtwoorden gebruikt voor PGP en S/MIME.</p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Het wachtwoord wijzigen</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">Herstel het wachtwoord</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">De wachtwoordherstelfunctie verwijderen</a></p></li>
 </ul>
-<p>Opmerking: Afhankelijk van de configuratie zijn sommige functies mogelijk niet beschikbaar.</p>
-<div class="task help-hide-inline" id="ox.appsuite.user.task.guard.password">
-<p class="title">U kan de wachtwoordbeheerfuncties als volgt openen:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
-<p role="presentation">U kunt ook op <span class="guibutton"><strong>Instellingen</strong></span> klikken in de App Launcher.</p>
-<p role="presentation">Het <span class="guilabel"><strong>Instellingen</strong></span> venster wordt geopend.</p>
-</li>
-<li class="step">
-<p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linkerpaneel.</p>
-<p role="presentation">De <span class="phrase"><span class="guilabel"><strong>Guard beveiligingsinstellingen</strong></span></span> pagina wordt getoond.</p>
-<p role="presentation">De wachtwoordbeheerfuncties worden getoond.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.change">
-<p class="title">Verander het <span class="phrase">Guard</span> wachtwoord als volgt:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Klik op <span class="guibutton"><strong>Wachtwoord wijzigen</strong></span>.</p>
-<p role="presentation" class="cap-smime">Afhankelijk van de configuratie opent het <span class="guilabel"><strong>Selecteer sleuteltypen om te wijzigen</strong></span> scherm. Afhankelijk van de codering waarvoor u het wachtwoord wilt aanpassen, selecteert u <span class="guibutton"><strong>PGP</strong></span> of <span class="guibutton"><strong>S/MIME</strong></span>. Het <span class="guilabel"><strong>Wachtwoord wijzigen</strong></span> scherm opent.</p>
-</li>
-<li class="step">
-<p role="presentation">In het <span class="phrase"><span class="guibutton"><strong>Geef huidig Guard beveiligingswachtwoord op </strong></span></span>veld geeft u het wachtwoord opwaarmee u tot nu toe uw gegevens heeft gecodeerd.</p>
-<p role="presentation">In het <span class="phrase"><span class="guibutton"><strong>Geef nieuw Guard beveiligingswachtwoord op </strong></span></span> veld, geeft u het wachtwoord op dat u wilt gebruiken om vanaf nu uw gegevens te coderen.</p>
-<p role="presentation">Bevestig het wachtwoord in het  <span class="phrase"><span class="guibutton"><strong>Bevestig nieuw Guard beveiligingswachtwoord</strong></span></span> veld door het nogmaals in te voeren.</p>
-</li>
-<li class="step"><p role="presentation">Klik op <span class="guibutton"><strong>wijzigen</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.reset">
-<p class="title">U kan het <span class="phrase">Guard</span> wachtwoord als volgt herstellen:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Klik op <span class="guibutton"><strong>Wachtwoord wijzigen</strong></span>.</p>
-<p role="presentation" class="cap-smime">Afhankelijk van de configuratie opent het <span class="guilabel"><strong>Selecteer sleuteltypen om te wijzigen</strong></span> scherm. Afhankelijk van de codering waarvoor u het wachtwoord wilt aanpassen, selecteert u <span class="guibutton"><strong>PGP</strong></span> of <span class="guibutton"><strong>S/MIME</strong></span>. Het <span class="guilabel"><strong>Wachtwoord wijzigen</strong></span> scherm opent.</p>
-<p role="presentation">Klik op <span class="guibutton"><strong>Herstellen</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Een nieuw wachtwoord wordt naar uw alternatieve e-mailadres gestuurd.</p>
-<p role="presentation">Als u geen alternatief e-mailadres heeft opgegeven wordt het nieuwe wachtwoord naar uw primaire e-mailadres gestuurd.</p>
-<p role="presentation">Dit nieuwe wachtwoord is nu uw huidige <span class="phrase">Guard</span> beveiligingswachtwoord. U moet direct dit wachtwoord <a class="link" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.task.guard.settings">wijzigen</a>.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.secondarymail">
-<p class="title">Het wijzigen van uw alternatieve e-mailadres voor het herstellen van het wachtwoord gaat als volgt:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Klik op <span class="guibutton"><strong>Stel het e-mailadres in voor herstel</strong></span>.</p>
-<p role="presentation" class="cap-smime">Afhankelijk van de configuratie opent het <span class="guilabel"><strong>Selecteer sleuteltypen om te wijzigen</strong></span> scherm. Afhankelijk van de codering waarvoor u het wachtwoord wilt aanpassen, selecteert u <span class="guibutton"><strong>PGP</strong></span> of <span class="guibutton"><strong>S/MIME</strong></span>. Het <span class="guilabel"><strong>Secundair E-mailadres</strong></span> scherm opent.</p>
-</li>
-<li class="step">
-<p role="presentation">In het <span class="phrase"><span class="guibutton"><strong>Geef huidig Guard beveiligingswachtwoord op </strong></span></span>veld geeft u het wachtwoord opwaarmee u tot nu toe uw gegevens heeft gecodeerd.</p>
-<p role="presentation">In het <span class="guibutton"><strong>Geef nieuw alternatief e-mailadres</strong></span> veld geeft u het e-mailadres op waar u het tijdelijke wachtwoord wilt ontvangen voor het herstellen van uw <span class="phrase">Guard</span> beveiligingswachtwoord.</p>
-<p role="presentation">Voer het e-mailadres nog een keer in in het <span class="guibutton"><strong>Controle e-mailadres</strong></span> veld in.</p>
-<p role="presentation">Klik op <span class="guibutton"><strong>E-mailadres wijzigen</strong></span>.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
-<p class="title">Het verwijderen van de optie voor het herstellen van het wachtwoord gaat als volgt:</p>
-<div class="taskprerequisites">
-        <p><span class="phrase"><strong>Waarschuwing:</strong></span> Als u de functie voor het herstellen van het wachtwoord uitschakelt, is het niet meer mogelijk om uw wachtwoord te herstellen. Als u daarna uw wachtwoord vergeet is er geen mogelijkheid om uw gecodeerde gegevens te decoderen.</p>
-      </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Schakel <span class="guibutton"><strong>Toon geavanceerde instellingen</strong></span> in.</p>
-<p role="presentation">Klik op <span class="guibutton"><strong>Verwijder wachtwoord herstel</strong></span>. Het <span class="guilabel"><strong>Verwijder herstel</strong></span> scherm opent.</p>
-</li>
-<li class="step"><p role="presentation">Klik op de <span class="guibutton"><strong>Verwijderen</strong></span> knop.</p></li>
-</ol></div>
-</div>
+<p> Opmerking: Afhankelijk van de configuratie zijn sommige functies niet beschikbaar.</p>
 <p id="ox.appsuite.user.related.guard.password">
       </p>
 <p class="title">Zie ook:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Eigen PGP sleutels beheren</a>
-          </p>
-<p role="presentation" class="cap-smime">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Eigen S/MIME sleutels beheren</a>
-          </p>
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Publieke sleutels beheren</a>
-          </p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Instellingen</a>
+          </p></li>
+</ul>
 <p>
     </p>
 <p id="ox.appsuite.user.parent.guard.password">Zie ook: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Gegevens Coderen met <span class="phrase">Guard</span></i></a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.reset.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.reset.html
new file mode 100644
index 000000000..ec8b757c5
--- /dev/null
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.password.reset.html
@@ -0,0 +1,91 @@
+<html lang="nl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Herstel het wachtwoord</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Gebruikershandleiding">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Wachtwoordbeheer">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.change.html" title="Het wachtwoord wijzigen">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="De wachtwoordherstelfunctie verwijderen">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.change.html">Terug</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Volgende</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Gegevens Coderen met <span class="phrase">Guard</span>
+</h1>
+<h2 class="sr-only">Wachtwoordbeheer</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.reset">
+<div class="titlepage"><div><div><h3 class="title">Herstel het wachtwoord</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.7.2"></a><a class="indexterm" name="id-1.14.12.7.3"></a><p id="ox.appsuite.user.concept.guard.password.reset">U heeft de volgende mogelijkheden: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Als u uw <span class="phrase">Guard</span> wachtwoord kwijt bent, kan u een tijdelijk <span class="phrase">Guard</span> wachtwoord aanvragen door het <span class="phrase">Guard</span> password te herstellen.</p></li>
+<li class="listitem"><p role="presentation">U kan een e-mailadres opgeven voor wachtwoordherstel.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.password.reset">
+<p class="title">U kan het <span class="phrase">Guard</span> wachtwoord als volgt herstellen:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Klik op het <span class="guibutton"><strong>Instellingen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.reset"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in de menubalk. Klik op <span class="guibutton"><strong>Alle instellingen</strong></span>.</p>
+<p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linkerpaneel. Klik op<span class="guibutton"><strong>Wachtwoord beheer (PGP)</strong></span><span class="cap-smime"> of op <span class="guibutton"><strong>Wachtwoord beheer (S/MIME)</strong></span></span> in het rechter paneel.</p>
+</li>
+<li class="step">
+<p role="presentation">Om een alternatief e-mailadres op te geven waar een tijdelijk wachtwoord naar wordt verzonden klikt u op <span class="guibutton"><strong>Stel e-mailadres in voor herstel</strong></span>. Het <span class="guilabel"><strong>Alternatief e-mailadres</strong></span> scherm opent.</p>
+<p role="presentation">Voer uw huidige wachtwoord in. Geef het e-mailadres welke u wilt gebruiken voor het herstellen van het wachtwoord.</p>
+</li>
+<li class="step">
+<p role="presentation">Klik op <span class="guibutton"><strong>Herstel wachtwoord</strong></span>. Het <span class="guilabel"><strong>Herstel wachtwoord</strong></span> scherm opent.</p>
+<p role="presentation">Klik op <span class="guibutton"><strong>Herstellen</strong></span>.</p>
+</li>
+</ol></div>
+<div class="taskrelated">
+          <p>Resultaat: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">Een nieuw wachtwoord wordt naar uw alternatieve e-mailadres gestuurd.</p>
+<p role="presentation">Als u geen alternatief e-mailadres heeft opgegeven wordt het nieuwe wachtwoord naar uw primaire e-mailadres gestuurd.</p>
+</li>
+<li class="listitem"><p role="presentation">Dit nieuwe wachtwoord is nu uw huidige <span class="phrase">Guard</span> beveiligingswachtwoord. U wordt aangeraden direct dit wachtwoord wijzigen.</p></li>
+</ul>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.reset">
+        </p>
+<p class="title">Zie ook:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Het wachtwoord wijzigen</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">De wachtwoordherstelfunctie verwijderen</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.reset">Overkoepelend thema: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.settings.html b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.settings.html
index 3584c9513..79f32b159 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.guard.settings.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.guard.settings.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Gegevens Coderen met Guard">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Publieke sleutels beheren">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="S/MIME sleutels van ontvangers beheren">
 <link rel="next" href="ox.appsuite.user.index.html" title="Register">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.index.html">Volgende</a></li>
@@ -44,84 +44,170 @@
 </li>
 <li class="step"><p role="presentation">Klik op <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in het linkerpaneel.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>De <span class="phrase"><span class="guilabel"><strong>Guard beveiligingsinstellingen</strong></span></span> pagina wordt getoond.</p>
-      </div>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings">De volgende opties zijn beschikbaar:</p>
+<p id="ox.appsuite.user.reference.guard.settings">Afhankelijk van de configuratie zijn de volgende instellingen beschikbaar.</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.default"><span class="phrase">Guard</span>standaard instellingen</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.pgppasswords">Wachtwoordbeheer (PGP)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.smimepasswords">Wachtwoordbeheer (S/MIME)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yourpgpkeys">Uw PGP sleutels</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientpgpkeys">Ontvanger PGP sleutels</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yoursmime">S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientsmime">S/MIME Ontvangers</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.advanced">Geavanceerd</a></p></li>
+</ul>
+<p>Zie ook: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Zoeken naar instellingen</a></p>
 <p id="ox.appsuite.user.reference.guard.settings.default"></p>
-<h3 class="title">standaardinstellingen</h3>
+<h3 class="title">
+<span class="phrase">Guard</span>standaard instellingen</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.encrypt"><b>Standaard bij het opstellen van gecodeerde e-mailberichten. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>Geeft aan of een nieuw e-mailbericht standaard wordt gecodeerd.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.sign"><b>Standaard ondertekening toevoegen aan uitgaande e-mailberichten. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Geeft aan of een nieuw e-mailbericht standaard wordt gecodeerd.</p></li>
-<li class="listitem cap-smime" id="id-1.14.14.7.2.1.3">
-<p id="ox.appsuite.user.task.guard.settings.default.smime"><b>Standaard S/MIME gebruiken voor ondertekenen en coderen. </b><a class="indexterm" name="id-1.14.14.7.2.1.3.1.2"></a>
+<li class="listitem">
+<p id="ox.appsuite.user.reference.guard.settings.default.create"><b>Opties voor samenstellen. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>
                 </p>
-<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p role="presentation">Geeft aan of S/MIME wordt gebruikt als standaard voor ondertekenen en coderen. </p></li></ul>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.encrypt"><b>Standaard bij het opstellen van gecodeerde e-mailberichten. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.1.1.2"></a>Geeft aan of een nieuw e-mailbericht standaard wordt gecodeerd.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.sign"><b>Standaard ondertekening toevoegen aan uitgaande e-mailberichten. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.2.1.2"></a>Geeft aan of een nieuw e-mailbericht standaard wordt gecodeerd.</p></li>
+<li class="listitem cap-smime" id="id-1.14.14.7.2.1.1.1.3.1.3">
+<p id="ox.appsuite.user.task.guard.settings.default.create.smime"><b>Standaard S/MIME gebruiken voor ondertekenen en coderen. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.3.1.2"></a>
+                        </p>
+<ul class="itemizedlist" style="list-style-type: square; "><li class="listitem"><p role="presentation">Geeft aan of S/MIME wordt gebruikt als standaard voor ondertekenen en coderen.</p></li></ul>
 <p>
-              </p>
+                      </p>
 </li>
-<li class="listitem">
-<p id="ox.appsuite.user.task.guard.settings.default.inline"><b>PGP inline standaard ingesteld voor nieuwe berichten. </b><a class="indexterm" name="id-1.14.14.7.2.1.4.1.2"></a>Opmerking: Deze functionaliteit is alleen beschikbaar als u <span class="guibutton"><strong>Geavanceerde instellingen</strong></span> heeft ingeschakeld. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">Geeft aan of PGP/Inline standaard wordt gebruikt voor coderen.</p></li>
-<li class="listitem"><p role="presentation">Gebruik deze instellingen alleen als de e-mailclient van een ontvanger PGP niet ondersteunt. Met PGP/Inline kan de ontvanger het bericht toch ontsleutelen.</p></li>
-<li class="listitem"><p role="presentation">Als u deze instelling gebruikt, kunt u geen e-mails in html-indeling verzenden.</p></li>
 </ul>
+<p>
+              </p>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Onthoud standaard wachtwoord. </b><a class="indexterm" name="id-1.14.14.7.2.1.5.1.2"></a>Bepaalt de standaard tijdsduur om <span class="phrase">Guard</span> het wachtwoord te onthouden. U kan deze standaard aanpassen als om uw <span class="phrase">Guard</span> wachtwoord gevraagd wordt.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Onthoud standaard wachtwoord. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Bepaalt de standaard tijdsduur om <span class="phrase">Guard</span> het wachtwoord te onthouden. U kan deze standaard aanpassen als om uw <span class="phrase">Guard</span> wachtwoord gevraagd wordt.</p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.pgppasswords"></p>
+<h3 class="title">Wachtwoordbeheer (PGP)</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Bevat functies voor het aanpassen of herstellen van het PGP wachtwoord.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a></p></li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.reference.guard.settings.password"></p>
-<h3 class="title">Wachtwoordbeheer</h3>
+<div id="ox.appsuite.user.reference.guard.settings.smimepasswords" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.smimepasswords"></p>
+<h3 class="title">Wachtwoordbeheer (S/MIME)</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">Bevat functies voor het aanpassen of herstellen van het wachtwoord.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Bevat functies voor het aanpassen of herstellen van het S/MIME wachtwoord.</p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Wachtwoordbeheer</a></p></li>
 </ul>
 <p>
       </p>
-<div id="ox.appsuite.user.reference.guard.settings.smime" class="cap-smime">
-<p id="ox.appsuite.user.reference.guard.settings.smime"></p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.yourpgpkeys"></p>
+<h3 class="title">Uw PGP sleutels</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Bevat functies voor het beheren van uw PGP sleutels.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Eigen PGP sleutels beheren</a></p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.recipientpgpkeys"></p>
+<h3 class="title">Ontvanger PGP sleutels</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Bevat functies voor het beheren van PGP sleutels van ontvangers.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">PGP sleutels van ontvangers beheren</a></p></li>
+</ul>
+<p>
+      </p>
+<div id="ox.appsuite.user.reference.guard.settings.yoursmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.yoursmime"></p>
 <h3 class="title">S/MIME</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.smime.enable"><b>Activeer S/MIME. </b><a class="indexterm" name="id-1.14.14.9.2.1.1.1.2"></a>Geeft aan of u e-mailbericht kunt ontvangen en verzenden met S/MIME codering.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">Bevat functies voor het beheren van S/MIME codering.</p>
+<p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a></p>
+</li></ul>
 <p>
       </p>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings.extended"></p>
+<div id="ox.appsuite.user.reference.guard.settings.recipientsmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.recipientsmime"></p>
+<h3 class="title">S/MIME Ontvangers</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Bevat functies voor het tonen en toevoegen van S/MIME onvanger certificaten. </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a></p></li>
+</ul>
+<p>
+      </p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.advanced"></p>
 <h3 class="title">Geavanceerd</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<p id="ox.appsuite.user.reference.guard.settings.extended.advanced"><b>Geavanceerde instellingen. </b><a class="indexterm" name="id-1.14.14.10.2.1.1.1.2"></a>Als het <span class="guibutton"><strong>Toon geavanceerde instellingen</strong></span> selectievakje is ingeschakeld, zijn de volgende opties en functies beschikbaar. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
+<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>E-mail cache</strong></span></p>
-<p role="presentation">Geeft aan of een gedecodeerd e-mailbericht wordt behouden in de browser-cache in een leesbaar formaat als u een ander e-mailbericht toont of wisselt naar een andere groupware app.</p>
-<p role="presentation">Om de gedecodeerde e-mailberichten te verwijderen uit de cache schakelt u <span class="guibutton"><strong>Verwijder gedecodeerde e-mails</strong></span> in.</p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.email"><b>Toon geavanceerde instellingen bij het opstellen van een e-mailbericht. </b>
+                </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<a class="indexterm" name="id-1.14.14.14.2.1.1.1.2.1.1.1"></a><p role="presentation">Als deze optie is ingeschakeld kan u extra opties gebruiken bij het verzenden van gecodeerde e-mailberichten.</p>
+<p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Gecodeerde e-mailberichten verzenden</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Sleutels</strong></span> sectie</p>
-<p role="presentation">Beheer uw eigen sleutels, publieke sleutels of Autocrypt-sleutels.</p>
-<p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Sleutelbeheer</a></p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.inline"><b>PGP inline standaard ingesteld voor nieuwe berichten. </b><a class="indexterm" name="id-1.14.14.14.2.1.2.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Geeft aan of PGP/Inline standaard wordt gebruikt voor coderen.</p></li>
+<li class="listitem"><p role="presentation">Gebruik deze instellingen alleen als de e-mailclient van een ontvanger PGP niet ondersteunt. Met PGP/Inline kan de ontvanger het bericht toch ontsleutelen.</p></li>
+<li class="listitem"><p role="presentation">Als u deze instelling gebruikt, kunt u geen e-mails in html-indeling verzenden.</p></li>
+</ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Autocrypt</strong></span> sectie</p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.autocrypt"><b>Autocrypt instelling. </b><a class="indexterm" name="id-1.14.14.14.2.1.3.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
 <p role="presentation">Configureert het gebruik van Autocrypt voor ingekomen e-mailberichten. Maakt het mogelijk om Autocrypt-sleutels over te dragen naar andere clients.</p>
 <p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">E-mailconversaties Coderen met Autocrypt</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Als u gecodeerde e-mailberichten verzend, zijn er extra opties.</p>
-<p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Gecodeerde e-mailberichten verzenden</a></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.cache"><b>E-mail cache. </b><a class="indexterm" name="id-1.14.14.14.2.1.4.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation">Geeft aan of een gedecodeerd e-mailbericht wordt behouden in de browser-cache in een leesbaar formaat als u een ander e-mailbericht toont of wisselt naar een andere groupware app.</p>
+<p role="presentation">Om de gedecodeerde e-mailberichten te verwijderen uit de cache schakelt u <span class="guibutton"><strong>Verwijder gedecodeerde e-mails</strong></span> in.</p>
+</li></ul>
+<p>
+              </p>
 </li>
-</ul>
+<li class="listitem">
+<p id="ox.appsuite.user.task.guard.settings.advanced.reset"><b>Opties herstellen. </b><a class="indexterm" name="id-1.14.14.14.2.1.5.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation"><span class="guibutton"><strong>Verwijder wachtwoord herstel</strong></span>. Verwijderd de functie voor het herstellen van een verloren wachtwoord.</p>
+<p role="presentation"><span class="phrase"><strong>Waarschuwing:</strong></span> Als u de functie voor het herstellen van het wachtwoord uitschakelt, is het niet meer mogelijk om uw wachtwoord te herstellen. Als u daarna uw wachtwoord vergeet is er geen mogelijkheid om uw gecodeerde gegevens te decoderen.</p>
+<p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">De wachtwoordherstelfunctie verwijderen</a></p>
 </li></ul>
+<p>
+              </p>
+</li>
+</ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.guard.settings">Zie ook: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Gegevens Coderen met <span class="phrase">Guard</span></i></a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.settings.commonsettings.html b/help/l10n/nl_NL/ox.appsuite.user.sect.settings.commonsettings.html
index bebe1d671..409f467ed 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.settings.commonsettings.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.settings.commonsettings.html
@@ -165,9 +165,9 @@
               </p>
 </li>
 <li class="listitem cap-deputy" id="id-1.4.6.11.2.1.3">
-<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Vertegenwoordigers beheren. </b>
+<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Beheer vertegenwoordigers. </b>
                 </p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vertegenwoordigers beheren</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Zie <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">beheer vertegenwoordigers</a></p></li></ul>
 <p>
               </p>
 </li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.settings.countdown.html b/help/l10n/nl_NL/ox.appsuite.user.sect.settings.countdown.html
index ce9807bc5..be8ce6ef7 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.settings.countdown.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.settings.countdown.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Aangepaste Instellingen">
 <link rel="prev" href="ox.appsuite.user.sect.settings.notifications.html" title="Meldingen aanpassen">
-<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Gebruik het meldingengebied">
+<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="gebruik het meldingengebied">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.settings.notificationarea.html b/help/l10n/nl_NL/ox.appsuite.user.sect.settings.notificationarea.html
index 2cb6921ae..ea86bda1d 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.settings.notificationarea.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.settings.notificationarea.html
@@ -1,7 +1,7 @@
 <html lang="nl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Gebruik het meldingengebied</title>
+<title>gebruik het meldingengebied</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Aangepaste Instellingen</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.notificationarea">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Gebruik het meldingengebied</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">gebruik het meldingengebied</h2></div></div></div>
 <a class="indexterm" name="id-1.4.9.2"></a><a class="indexterm" name="id-1.4.9.3"></a><p id="ox.appsuite.user.concept.settings.notificationarea">U krijgt een notificatie in het meldingengebied voor de volgende gebeurtenissen: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Herinneringen voor aanstaande afspraken of taken</p></li>
@@ -61,10 +61,10 @@
 <li class="listitem"><p role="presentation">Om een afspraakuitnodiging te zien in de agenda, klikt u op de datum.</p></li>
 <li class="listitem"><p role="presentation">Om een uitnodiging te accepteren of af te wijzen klikt u op de respectievelijke knoppen.</p></li>
 </ul></p>
-<p role="presentation" class="feat-io-ox-core-managedResources">Als u reserveringsverzoeken voor beheerder bronnen ontvangt, kunt u de volgende functies gebruiken: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Om een reserveringsverzoek te zien in de bron-agenda, klikt u op de datum.</p></li>
-<li class="listitem"><p role="presentation">Om een reservering te accepteren of af te wijzen klikt u op de respectievelijke knoppen.</p></li>
-</ul></p>
+<p role="presentation" class="feat-io-ox-core-managedResources">Als u reserveringen ontvangt voor bronnen kan u de volgende functies gebruiken:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Om het reserveringsverzoek te zien in de agenda klikt u op de datum.</p></li>
+<li class="listitem"><p role="presentation">Om een reserveringsverzoek te accepteren of af te wijzen klikt u op de overeenkomstige knop.</p></li>
+</ul> </p>
 <p role="presentation">Als er achterstallige taken zijn, kunt u de volgende functies gebruiken: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Om de details in een pop-up te tonen, klikt u op de herinnering.</p></li>
 <li class="listitem"><p role="presentation">Om de taak te bewerken gebruikt u de functies in de pop-up.</p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.settings.notifications.html b/help/l10n/nl_NL/ox.appsuite.user.sect.settings.notifications.html
index bc9aa840f..14272acff 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.settings.notifications.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.settings.notifications.html
@@ -60,7 +60,7 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>toon desktopmeldingen. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Geeft aan of u een bureaubladmelding voor inkomende e-mails wilt ontvangen als de groupware op de achtergrond is.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>Toon desktopkennisgevingen. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Geeft aan of u een bureaubladmelding voor inkomende e-mails wilt ontvangen als de groupware op de achtergrond is.</p></li>
 <li class="listitem">
 <p role="presentation">Afhankelijk van de instellingen van de webbrowser wordt de <span class="guibutton"><strong>Beheer browser toestemmingen</strong></span> knop getoond. Klik op de knop. De browser vraagt u of deze meldingen getoond mogen worden. Geef hiervoor toestemming.</p>
 <p role="presentation">Opmerking: Afhankelijk van de browser moet u misschien de ontvangst van meldingen toestaan in de browserinstellingen voordat dit werkt. Informatie hierover kan u vinden in de help pagina's van de browser.</p>
@@ -74,7 +74,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.show"><b>Automatisch het meldingengebied openen als er nieuwe herinneringen zijn. </b><a class="indexterm" name="id-1.4.7.8.2.1.1.1.2"></a>Geeft aan of het meldingengebied automatisch geopend moet worden als er nieuwe herinnering voor een afspraak of een taak wordt ontvangen.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.birthdays"><b>Verjaardagen weergeven in kennisgevingengebied. </b>Geeft aan of het notificatiegebied ook aankomende verjaardagen bevat.</p></li>
 </ul>
-<p>Zie <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Gebruik het meldingengebied</a></p>
+<p>Zie <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">gebruik het meldingengebied</a></p>
 <p id="ox.appsuite.user.reference.settings.notifications.email"></p>
 <h3 class="title">E-mail</h3>
 <p>
@@ -98,9 +98,9 @@
 <p id="ox.appsuite.user.reference.settings.notifications.calendar.email"><b>E-mailmeldingen. </b>Definieert of u een e-mailmelding krijgt als het volgende waar is: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.changes"><b>Ontvang meldingen als een afspraak waar u deelnemer van bent wordt aangemaakt, aangepast of wordt verwijderd. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.1.1.2"></a>Een afspraak waarvan u een deelnemer bent is opnieuw gemaakt, veranderd of verwijderd.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>ontvang een e-mailmelding voor u als organisator als een deelnemer accepteert of weigert. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Een deelnemer heeft de door u gemaakte afspraak geaccepteerd of afgewezen. </p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>Ontvang een e-mailmeldingen voor u als deelnemer als andere deelnemers accepteren of weigeren. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>Een andere deelnemer heeft de afspraak waar u aan deelneemt geaccepteerd of afgewezen.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>automatisch uitnodigingsberichten verwijderen als de afspraak is geaccepteerd of afgewezen. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Geeft aan of de e-mailmelding voor de uitnodiging van een afspraak automatisch verwijderd moet worden als de afspraak geaccepteerd of afgewezen wordt. Zie <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Beantwoorden van Afspraakuitnodigingen</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>Ontvang een e-mailkennisgeving voor u als organisator als een deelnemer accepteert of weigert. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Een deelnemer heeft de door u gemaakte afspraak geaccepteerd of afgewezen. </p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>Ontvang een e-mailkennisgeving voor u als deelnemer als andere deelnemers accepteren of weigeren. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>Een andere deelnemer heeft de afspraak waar u aan deelneemt geaccepteerd of afgewezen.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>Automatisch uitnodigingsberichten verwijderen als de afspraak is geaccepteerd of afgewezen. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Geeft aan of de e-mailmelding voor de uitnodiging van een afspraak automatisch verwijderd moet worden als de afspraak geaccepteerd of afgewezen wordt. Zie <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Beantwoorden van Afspraakuitnodigingen</a></p></li>
 </ul>
 </li>
 </ul>
@@ -148,7 +148,7 @@
           </p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Gebruik het meldingengebied</a>
+            <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">gebruik het meldingengebied</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.settings.personaldata.html b/help/l10n/nl_NL/ox.appsuite.user.sect.settings.personaldata.html
index 166a90ac7..87267f2fa 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.settings.personaldata.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.settings.personaldata.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Aangepaste Instellingen">
-<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Gebruik het meldingengebied">
+<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="gebruik het meldingengebied">
 <link rel="next" href="ox.appsuite.user.sect.settings.wizard.html" title="Gebruik een Wizard om Lokale Apps te Configureren">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.settings.search.html b/help/l10n/nl_NL/ox.appsuite.user.sect.settings.search.html
index fd2520f43..8ad4e956f 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.settings.search.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.settings.search.html
@@ -80,6 +80,9 @@
 <p role="presentation" class="cap-infostore">
             <a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Bestanden</span> Instellingen</a>
           </p>
+<p role="presentation" class="cap-guard">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Instellingen</a>
+          </p>
 </li>
 </ul>
 <p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.add.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.add.html
index 8beefe394..28ca732ef 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.add.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.add.html
@@ -52,7 +52,7 @@
             <a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importeren van taken</a>
           </p>
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">afspraken maken</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Afspraken maken</a>
           </p>
 </li></ul>
 <p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.detailview.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.detailview.html
index 1637f97bd..d7cdc4289 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.detailview.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.detailview.html
@@ -53,7 +53,7 @@
 <li class="listitem"><p role="presentation">Het onderwerp van de taak</p></li>
 <li class="listitem"><p role="presentation">De herinneringsdatum van de taak, indien ingesteld</p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.7.10.4.1.5">
-<p role="presentation">De toegewezen categorieën</p>
+<p role="presentation">de toegewezen categorieën</p>
 <p role="presentation">Door op een categorie te klikken, wordt gezocht naar taken waaraan die categorie is toegewezen.</p>
 </li>
 <li class="listitem"><p role="presentation">Als de taak terugkerend is, worden de herhalingseigenschappen getoond.</p></li>
@@ -68,7 +68,7 @@
 <li class="listitem"><p role="presentation">startdatum</p></li>
 <li class="listitem"><p role="presentation">definitie</p></li>
 <li class="listitem"><p role="presentation">facturatie-informatie</p></li>
-<li class="listitem"><p role="presentation">bijlagen</p></li>
+<li class="listitem"><p role="presentation">Bijlagen</p></li>
 <li class="listitem">
 <p role="presentation">de namen van de deelnemers</p>
 <p role="presentation">Als u op een naam klikt wordt een pop-up geopend. Het toont de informatie van het contact als <span class="guibutton"><strong>Halo Overzicht</strong></span>.</p>
@@ -85,14 +85,11 @@
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Het <span class="phrase">Taken</span> lijstoverzicht</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.create.html">Het bewerkingsscherm</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Tonen van Taken</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Tonen of opslaan van taakbijlagen</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">Taakdeelnemer bellen</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Taken beheren</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Contacten tonen in het halo overzicht</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.gui.detailview">Zie ook: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">De  <span class="phrase">Taken</span> Componenten</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.foldertree.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.foldertree.html
index 77070dce5..854900469 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.foldertree.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.foldertree.html
@@ -57,6 +57,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Tonen van Taken</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Takenlijsten toevoegen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Taken beheren</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Gegevens Beheren met Mappen</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.list.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.list.html
index 2b8b15954..6e0992d63 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.list.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.list.html
@@ -57,17 +57,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.list.html">Het lijstoverzicht</a></p></li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.settingsmenu.html">Het <span class="phrase">Taken</span> instellingenmenu</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.detailview.html">Het <span class="phrase">Taken</span> detailoverzicht</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Tonen van Taken</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Tonen of opslaan van taakbijlagen</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Taken beheren</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.list">Zie ook: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">De  <span class="phrase">Taken</span> Componenten</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.settingsmenu.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
index fbe10d9a8..5e15a494a 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
@@ -51,10 +51,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.menubar.html">De menu balk</a></p></li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Het <span class="phrase">Taken</span> lijstoverzicht</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Tonen van publieke en gedeelde takenlijsten</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Tonen van publieke en gedeelde takenlijsten</a></p></li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.settingsmenu">Zie ook: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">De  <span class="phrase">Taken</span> Componenten</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.toolbar.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.toolbar.html
index e3af8c106..54ff882bf 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.toolbar.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.gui.toolbar.html
@@ -58,13 +58,7 @@
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Taken bewerken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">De vervaldatum van de taak veranderen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Taken markeren als voltooid</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Taken verplaatsen naar een andere map</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Taakbevestigingen aanpassen</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Taken exporteren</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.print.html">Taken afdrukken</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.delete.html">Taken verwijderen</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Taken beheren</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.toolbar">Zie ook: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">De  <span class="phrase">Taken</span> Componenten</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.categories.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.categories.html
new file mode 100644
index 000000000..f75b2ed7e
--- /dev/null
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="nl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Categorieën gebruiken voor taken</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Gebruikershandleiding">
+<link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Taken beheren">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="De vervaldatum van de taak veranderen">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Taken verplaatsen naar een andere map">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Terug</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Volgende</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Taken</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Taken beheren</h2>
+<div class="sect2" id="ox.appsuite.user.sect.tasks.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Categorieën gebruiken voor taken</h3></div></div></div>
+<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.categories">Om taken onafhankelijk van mappen te organiseren kan u gebruik maken van categorieën. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">U kan taken markeren met categorieën.</p></li>
+<li class="listitem"><p role="presentation">U kan alle contacten tonen die zijn gemarkeerd met een specifieke categorie.</p></li>
+</ul>
+<p> U kan uw eigen categorieën maken, bewerken en verwijderen, zie <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>.</p>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories">
+<p class="title">Taken toewijzen aan een categorie gaat als volgt:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Selecteer een taak. Klik op het <span class="guibutton"><strong>Bewerk taak</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.mark.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in de werkbalk.</p>
+<p role="presentation">Het taak bewerkingscherm opent.</p>
+</li>
+<li class="step">
+<p role="presentation">Om dit te doen klikt u op <span class="guibutton"><strong>Categorie toevoegen</strong></span> naast <span class="guibutton"><strong>Categorieën</strong></span>. Selecteer een categorie.</p>
+<p role="presentation">Om een categorie van een taak te verwijderen, klikt u op het <span class="guibutton"><strong>Categorie verwijderen</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> naast de categorie.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories.view">
+<p class="title">Taken toont u op de volgende manier met een specifieke categorie:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Selecteer een taak welke is gemarkeerd met een categorie.</p></li>
+<li class="step"><p role="presentation">Klik op de categorie in het detailoverzicht.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Resultaat: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Het lijstoverzicht toont alle taken die zijn gemarkeerd met deze categorie.</p></li>
+<li class="listitem"><p role="presentation">Om vorige lijst te tonen, klikt u op het <span class="guibutton"><strong>Zoeken annuleren</strong></span> pictogram <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in het zoekveld.</p></li>
+</ul>
+          <p>Tip: U kan ook de zoekfunctie gebruiken om te zoeken naar een categorie met de zoekfunctie.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.tasks.manage.categories">
+        </p>
+<p class="title">Zie ook:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Zoeken naar Taken</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">PGP inline standaard ingesteld voor nieuwe berichten</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Categorieën gebruiken voor afspraken</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Categorieën gebruiken voor contacten</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.tasks.manage.categories">Zie ook: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Taken beheren</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.changeduedate.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.changeduedate.html
index 88a89eea2..80d5005a4 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.changeduedate.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.changeduedate.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Taken beheren">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="Taken markeren als voltooid">
-<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Taken verplaatsen naar een andere map">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Categorieën gebruiken voor taken">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Volgende</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Volgende</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -48,7 +48,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changeduedate"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">De <span class="phrase">Taken</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">De <span class="phrase">Taken</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Het <span class="phrase">Taken</span> lijstoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.changestatus.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.changestatus.html
index bcfb9ac53..d834bfebb 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.changestatus.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.changestatus.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Taken beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.changestatus">
 <div class="titlepage"><div><div><h3 class="title">Taakbevestigingen aanpassen</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.10.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Als u een deelnemer bent van de taak, kan u de bevestiging later aanpassen. U kan commentaar toevoegen welke zichtbaar is voor andere taakdeelnemers.</p>
+<a class="indexterm" name="id-1.10.15.11.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Als u een deelnemer bent van de taak, kan u de bevestiging later aanpassen. U kan commentaar toevoegen welke zichtbaar is voor andere taakdeelnemers.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.changestatus">
 <p class="title">U kan als volgt een bevestiging wijzigen:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changestatus"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">De <span class="phrase">Taken</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">De <span class="phrase">Taken</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Het <span class="phrase">Taken</span> lijstoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.delete.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.delete.html
index 088ac88ba..c60556843 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.delete.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Taken beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Taken verwijderen</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Waarschuwing:</strong></span> Verwijderde taken kunnen <span class="phrase"><strong>niet</strong></span> hersteld worden.</p>
+<a class="indexterm" name="id-1.10.15.15.2"></a><a class="indexterm" name="id-1.10.15.15.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Waarschuwing:</strong></span> Verwijderde taken kunnen <span class="phrase"><strong>niet</strong></span> hersteld worden.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.delete">
 <p class="title">Het verwijderen van een taak gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -50,9 +50,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.delete">
         </p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">De <span class="phrase">Taken</span> werkbalk</a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Het <span class="phrase">Taken</span> lijstoverzicht</a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.delete">Zie ook: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Taken beheren</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.export.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.export.html
index 3754fc378..5e2387941 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.export.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Taken beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Taken exporteren</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">U kan taken exporteren in het iCal formaat. U kan dit formaat bijvoorbeeld gebruiken om taken uit te wisselen met andere agenda applicaties. U kan een individuele taak of alle taken uit een map exporteren.</p>
+<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><a class="indexterm" name="id-1.10.15.13.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">U kan taken exporteren in het iCal formaat. U kan dit formaat bijvoorbeeld gebruiken om taken uit te wisselen met andere agenda applicaties. U kan een individuele taak of alle taken uit een map exporteren.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.export.selected">
 <p class="title">U kunt een individuele taak als volgt exporteren:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -63,12 +63,16 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.export"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">De <span class="phrase">Taken</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">Het <span class="phrase">Taken</span> mappenoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">De <span class="phrase">Taken</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Het <span class="phrase">Taken</span> lijstoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importeren van taken</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.10.15.12.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Persoonlijke Gegevens Downloaden</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.10.15.13.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Persoonlijke Gegevens Downloaden</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.manage.export">Zie ook: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Taken beheren</a></p>
 </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.html
index cfe6ef969..47f1762ae 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Taken markeren als voltooid</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">De vervaldatum van de taak veranderen</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Categorieën gebruiken voor taken</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Taken verplaatsen naar een andere map</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Taakbevestigingen aanpassen</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importeren van taken</a></p></li>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.import.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.import.html
index f3490fea2..4ef975efa 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.import.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Taken beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importeren van taken</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.11.2"></a><a class="indexterm" name="id-1.10.15.11.3"></a><a class="indexterm" name="id-1.10.15.11.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">U kan taken importeren vanuit bestanden in het iCal formaat.</p>
+<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">U kan taken importeren vanuit bestanden in het iCal formaat.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.import">
 <p class="title">Importeren van taken vanuit een iCal bestand gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,19 +54,15 @@
           <p>Resultaat: De taken worden toegevoegd aan de map.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.tasks.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.tasks.manage.import"></p>
+<p class="title">Gebruikersinterface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">Het <span class="phrase">Taken</span> mappenoverzicht</a></p></li></ul>
+<p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Taken exporteren</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Taken Aanmaken</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Taken exporteren</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Taken Aanmaken</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.tasks.manage.import">Zie ook: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Taken beheren</a></p>
 </div>
           </div>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.markasdone.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.markasdone.html
index 6a5128a0e..81121fe82 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.markasdone.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.markasdone.html
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.markasdone"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">De <span class="phrase">Taken</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">De <span class="phrase">Taken</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Het <span class="phrase">Taken</span> lijstoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.move.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.move.html
index 3d9e1787c..d426a48d4 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.move.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.move.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Gebruikershandleiding">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Taken beheren">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="De vervaldatum van de taak veranderen">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Categorieën gebruiken voor taken">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.changestatus.html" title="Taakbevestigingen aanpassen">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Juridische kennisgeving">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigatie Aan/Uit</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Terug</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Terug</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Begin</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Inhoudsopgave</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Volgende</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Taken beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Taken verplaatsen naar een andere map</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">U kan taken in één keer verplaatsen naar een andere map.</p>
+<a class="indexterm" name="id-1.10.15.10.2"></a><a class="indexterm" name="id-1.10.15.10.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">U kan taken in één keer verplaatsen naar een andere map.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.move">
 <p class="title">Het verplaatsen van taken naar een andere map gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 <p id="ox.appsuite.user.tip.tasks.manage.move">Tip: U kan ook de geselecteerde objecten verplaatsen door deze uit het mappenoverzicht naar een andere map te slepen.</p>
 <p id="ox.appsuite.user.related.tasks.manage.move"></p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">De <span class="phrase">Taken</span> werkbalk</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">Het <span class="phrase">Taken</span> mappenoverzicht</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">De <span class="phrase">Taken</span> werkbalk</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Het <span class="phrase">Taken</span> lijstoverzicht</a></p>
+</li></ul>
 <p> </p>
 <p class="title">Zie ook:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">Persoonlijke takenlijsten toevoegen</a></p></li></ul>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.print.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.print.html
index 5ae73d795..1cdd7ac94 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.print.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Taken beheren</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Taken afdrukken</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">Tip: U kan ook de gegevens van één of meerdere taken tegelijk afdrukken</p>
+<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">Tip: U kan ook de gegevens van één of meerdere taken tegelijk afdrukken</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.print.data">
 <p class="title">Het afdrukken van taakgegevens gaat als volgt:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,9 +51,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.print">
         </p>
 <p class="title">Gebruikersinterface:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">De <span class="phrase">Taken</span> werkbalk</a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Het <span class="phrase">Taken</span> lijstoverzicht</a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.print">Zie ook: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Taken beheren</a></p>
diff --git a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.search.html b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.search.html
index b94e41fdb..01f14b334 100644
--- a/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.search.html
+++ b/help/l10n/nl_NL/ox.appsuite.user.sect.tasks.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Tonen van Taken</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Categorieën beheren</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Categorieën gebruiken voor taken</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/pl_PL/bk01-toc.html b/help/l10n/pl_PL/bk01-toc.html
index 57a0dad2e..3d207e66a 100644
--- a/help/l10n/pl_PL/bk01-toc.html
+++ b/help/l10n/pl_PL/bk01-toc.html
@@ -134,7 +134,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.new.html">Przycisk Nowa wiadomość</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">E-mail</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">Pasek kart skrzynki odbiorczej aplikacji <span class="phrase">E-mail</span></a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">Pasek kategorii skrzynki odbiorczej</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">E-mail</span></a></li>
@@ -145,12 +145,12 @@
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.attachments.html">Wyświetlanie lub zapisywanie załączników wiadomości e-mail</a></li>
 <li class="sect1 cap-webmail">
 <a href="ox.appsuite.user.sect.email.send.html">Wysyłanie wiadomości e-mail</a><ul>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">Wybieranie adresu nadawcy</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.replyto.html">Ustawianie adresu Odpowiedz do</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">Dodawanie załączników</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Dodawanie załączników z już istniejących wiadomości e-mail</a></li>
-<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">Wysyłanie załącznika jako linku</a></li>
+<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">Wysyłanie załączników jako linków</a></li>
 <li class="sect2 feat-io-ox-core-templates"><a href="ox.appsuite.user.sect.email.send.templates.html">Korzystanie z szablonów</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.signatures.html">Korzystanie z podpisów</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.reply.html">Odpowiadanie na wiadomości e-mail</a></li>
@@ -174,6 +174,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.movecopy.html">Przenoszenie lub kopiowanie wiadomości e-mail</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.mark.html">Oznaczanie wiadomości e-mail jako przeczytanych lub nieprzeczytanych</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.collectaddress.html">Gromadzenie adresów</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.label.html">Kategoryzowanie wiadomości e-mail</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.source.html">Wyświetlanie źródła wiadomości e-mail</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.draft.html">Korzystanie z wersji roboczych wiadomości e-mail</a></li>
@@ -185,6 +186,9 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.print.html">Drukowanie wiadomości e-mail</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.archive.html">Archiwizacja wiadomości e-mail</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.delete.html">Usuwanie wiadomości e-mail</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.recover.html">Odzyskiwanie wiadomości e-mail</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.deleteforever.html">Usuwanie wiadomości e-mail</a></li>
+<li class="sect2 cap-dumpster"><a href="ox.appsuite.user.sect.email.manage.undelete.html">Odzyskiwanie trwale usuniętych wiadomości e-mail</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.expungefolder.html">Czyszczenie folderów poczty e-mail</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Korzystanie z ujednoliconej poczty</a></li>
 </ul>
@@ -249,7 +253,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attachments.html">Dodawanie załączników</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.scheduling.html">Korzystanie z widoku planowania</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.followup.html">Tworzenie kolejnego spotkania</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników na nowe spotkanie</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników do nowego spotkania</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.recipients.html">Zapraszanie adresatów wiadomości e-mail na nowe spotkania</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Tworzenie spotkań z załączników iCal</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Usuwanie konfliktów</a></li>
@@ -273,6 +277,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Zmiana przypomnień o spotkaniach</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Zmienianie organizatora</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.timezones.html">ZarzÄ…dzanie ulubionymi strefami czasowymi</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">używanie kategorii w odniesieniu do spotkań</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.colors.html">Używanie kolorów kalendarza</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.move.html">Przenoszenie spotkań do innego kalendarza</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.import.html">Importowanie spotkań</a></li>
@@ -360,6 +365,7 @@
 <a href="ox.appsuite.user.sect.contacts.manage.html">ZarzÄ…dzanie kontaktami</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Wysyłanie wiadomości e-mail z poziomu książki adresowej</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Zapraszanie kontaktów na spotkanie</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">Używanie kategorii w odniesieniu do kontaktów</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Przenoszenie lub kopiowanie kontaktów</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Wysyłanie kontaktów jako wizytówki</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.import.html">Importowanie kontaktów</a></li>
@@ -413,6 +419,7 @@
 <a href="ox.appsuite.user.sect.tasks.manage.html">ZarzÄ…dzanie zadaniami</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Oznaczanie zadań jako wykonanych</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Zmienianie terminu zadania</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">Używanie kategorii w odniesieniu do zadań</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.move.html">Przenoszenie zadań do innego folderu</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Zmienianie potwierdzeń zadań</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.import.html">Importowanie zadań</a></li>
@@ -584,12 +591,19 @@
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.logout.html">Wylogowywanie się z aplikacji <span class="phrase">Strażnik</span></a></li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a></li>
+<li class="sect1 cap-guard">
+<a href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a><ul>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.change.html">Zmiana hasła</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.reset.html">Resetowanie hasła</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Usuwanie funkcji resetowania hasła</a></li>
+</ul>
+</li>
 <li class="sect1 cap-guard">
 <a href="ox.appsuite.user.sect.guard.keys.html">ZarzÄ…dzanie kluczami</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Zarządzanie własnymi kluczami PGP</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Zarządzanie kluczami PGP odbiorców</a></li>
 <li class="sect2 cap-smime"><a href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Zarządzanie własnymi kluczami S/MIME</a></li>
-<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">ZarzÄ…dzanie kluczami publicznymi</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Zarządzanie kluczami S/MIME odbiorców</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji <span class="phrase">Strażnik</span></a></li>
diff --git a/help/l10n/pl_PL/index.html b/help/l10n/pl_PL/index.html
index ab4b98ec9..64a300e28 100644
--- a/help/l10n/pl_PL/index.html
+++ b/help/l10n/pl_PL/index.html
@@ -34,7 +34,7 @@
 </h3></div></div>
 <div><p class="copyright">Copyright ©  OX Software GmbH </p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">Informacja Prawna</a></div>
-<div><p class="pubdate">wtorek, 21. listopad 2023 Version 8.19.0 </p></div>
+<div><p class="pubdate">czwartek, 21. grudzień 2023 Version 8.20.0 </p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">Przegląd tematów pomocy</h2>
@@ -97,6 +97,19 @@
               </p></li>
 </ul>
 </li>
+<li class="listitem" id="ox.appsuite.user.startpage.toc.keyboard" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.chap.keyboard.html"><i>Obsługa za pomocą klawiatury</i></a>
+            </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.navigation.html">Korzystanie z nawigacji przy użyciu klawiatury</a>
+              </p></li>
+<li class="listitem"><p role="presentation">
+                <a class="xref" href="ox.appsuite.user.sect.keyboard.shortkeys.html">Korzystanie ze skrótów klawiaturowych</a>
+              </p></li>
+</ul>
+</li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.portal" style="list-style-type: none">
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.chap.portal.html"><i>
@@ -137,10 +150,10 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.send.html">Wysyłanie wiadomości e-mail</a>
               </p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.5.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.6.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Korzystanie z integracji z AI</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.5.1.6"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.call.html">Łączenie z nadawcą lub innym adresatem</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -155,13 +168,13 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.search.html">Wyszukiwanie wiadomości e-mail</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.5.1.11"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.11"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Wysyłanie lub odbieranie wiadomości e-mail jako zastępca</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Dodawanie kont e-mail</a>
               </p></li>
-<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.5.1.13"><p role="presentation">
+<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
               </p></li>
 </ul>
@@ -191,7 +204,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edycja spotkań</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.7"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Łączenie się z uczestnikami spotkania</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -200,25 +213,25 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">ZarzÄ…dzanie spotkaniami</a>
               </p></li>
-<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.6.1.10"><p role="presentation">
+<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.7.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Korzystanie z kalendarzy zasobów</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Wyszukiwanie spotkań</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.12"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.7.1.12"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Tworzenie i edytowanie spotkań oraz zarządzanie nimi jako zastępca</a>
               </p></li>
-<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation">
+<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.7.1.13"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">Korzystanie z grup</a>
               </p></li>
-<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.6.1.14"><p role="presentation">
+<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">Korzystanie z zasobów</a>
               </p></li>
-<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.6.1.15"><p role="presentation">
+<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.7.1.15"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">Korzystanie z zasobów zarządzanych</a>
               </p></li>
-<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.6.1.16"><p role="presentation">
+<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.7.1.16"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
               </p></li>
 </ul>
@@ -242,7 +255,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatyczne dodawanie kontaktów lub zasobów z książki adresowej</a>
               </p></li>
-<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.7.1.5"><p role="presentation">
+<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.8.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatyczne dodawanie kontaktów lub zasobów z katalogu adresów</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -254,7 +267,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Edycja kontaktów i list dystrybucyjnych</a>
               </p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.9"><p role="presentation">
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.8.1.9"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Łączenie się z kontaktami</a>
               </p></li>
 <li class="listitem"><p role="presentation">
@@ -269,7 +282,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Wyszukiwanie kontaktów</a>
               </p></li>
-<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation">
+<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.8.1.14"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Ustawienia książki adresowej</a>
               </p></li>
 </ul>
@@ -344,7 +357,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Dodawanie kont magazynów</a>
               </p></li>
-<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.9.1.10"><p role="presentation">
+<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.10.1.10"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.drive.settings.html">Ustawienia aplikacji <span class="phrase">Pliki</span></a>
               </p></li>
 </ul>
@@ -357,19 +370,19 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">ZarzÄ…dzanie danymi z folderami</a>
               </p></li>
-<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.10.1.3"><p role="presentation">
+<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.11.1.3"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Udostępnianie danych</a>
               </p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.10.1.4"><p role="presentation">
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.11.1.4"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Zarządzanie zastępcami</a>
               </p></li>
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">ZarzÄ…dzanie kontami</a>
               </p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.10.1.6"><p role="presentation">
+<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.11.1.6"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">ZarzÄ…dzanie kategoriami</a>
               </p></li>
-<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.10.1.7"><p role="presentation">
+<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.11.1.7"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Pobieranie danych osobowych</a>
               </p></li>
 </ul>
@@ -388,7 +401,7 @@
 <li class="listitem"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.sessions.html">Wyświetlanie aktywnych klientów lub wylogowywanie się z nich</a>
               </p></li>
-<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.11.1.5"><p role="presentation">
+<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.12.1.5"><p role="presentation">
                 <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Uwierzytelnianie wieloskładnikowe</a>
               </p></li>
 </ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.chap.calendar.html b/help/l10n/pl_PL/ox.appsuite.user.chap.calendar.html
index 26735e425..3497b28c1 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.chap.calendar.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.chap.calendar.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="index.html" title="podręcznik użytkownika">
-<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="Ustawienia poczty e-mail">
+<link rel="prev" href="ox.appsuite.user.sect.email.mailfilter.apply.html" title="Stosowanie reguły do już istniejących wiadomości e-mail">
 <link rel="next" href="ox.appsuite.user.sect.calendar.gui.html" title="Składniki aplikacji Kalendarz">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.mailfilter.apply.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.gui.html">Dalej</a></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/pl_PL/ox.appsuite.user.chap.dataorganisation.html
index f8195b550..37b1366db 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.chap.dataorganisation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="index.html" title="podręcznik użytkownika">
-<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="Konfiguracja WebDAV w systemie Windows">
+<link rel="prev" href="ox.appsuite.user.sect.drive.settings.html" title="Ustawienia aplikacji Pliki">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.folder.html" title="ZarzÄ…dzanie danymi z folderami">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.settings.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.folder.html">Dalej</a></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.chap.drive.html b/help/l10n/pl_PL/ox.appsuite.user.chap.drive.html
index 4ee615146..79f3c277a 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.chap.drive.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="index.html" title="podręcznik użytkownika">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.search.html" title="Wyszukiwanie zadań">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.delete.html" title="Usuwanie zadań">
 <link rel="next" href="ox.appsuite.user.sect.drive.gui.html" title="Składniki aplikacji Pliki">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.search.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.delete.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.drive.gui.html">Dalej</a></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.chap.guard.html b/help/l10n/pl_PL/ox.appsuite.user.chap.guard.html
index 46a58060e..30cb71dfb 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.chap.guard.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="index.html" title="podręcznik użytkownika">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="ZarzÄ…dzanie metodami weryfikacji">
+<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="Automatyczne wylogowywanie">
 <link rel="next" href="ox.appsuite.user.sect.guard.setup.html" title="Konfigurowanie aplikacji Strażnik">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.autologout.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.setup.html">Dalej</a></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.chap.security.html b/help/l10n/pl_PL/ox.appsuite.user.chap.security.html
index 5d0027885..62a1fb8c4 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.chap.security.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.chap.security.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="index.html" title="podręcznik użytkownika">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="Wyświetlanie, edytowanie lub usuwanie kont">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="Pobieranie danych osobowych">
 <link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="Wyświetlanie aktywnych klientów lub wylogowywanie się z nich">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">Dalej</a></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.chap.tasks.html b/help/l10n/pl_PL/ox.appsuite.user.chap.tasks.html
index 80ee18106..03a86f0b7 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.chap.tasks.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.chap.tasks.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="index.html" title="podręcznik użytkownika">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="Ustawienia książki adresowej">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.delete.html" title="Usuwanie kontaktów">
 <link rel="next" href="ox.appsuite.user.sect.tasks.gui.html" title="Składniki aplikacji Zadania">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.settings.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.delete.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.gui.html">Dalej</a></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.index.html b/help/l10n/pl_PL/ox.appsuite.user.index.html
index b5e419994..83160b276 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.index.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="index.html" title="podręcznik użytkownika">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="Ustawienia aplikacji Strażnik">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Zarządzanie kluczami S/MIME odbiorców">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -21,7 +21,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.settings.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 </ul></div>
@@ -131,7 +131,7 @@
 <dd><dl>
 <dt class="cap-contacts">eksport, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.export.html">Eksportowanie kontaktów</a>
 </dt>
-<dt class="cap-contacts">importowanie, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importowanie kontaktów</a>
+<dt class="cap-contacts">import, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importowanie kontaktów</a>
 </dt>
 </dl></dd>
 </dl>
@@ -211,140 +211,40 @@
   </a>
 </dt>
 <dd><dl>
-<dt class="cap-webmail">archiwizacja, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">Archiwizacja wiadomości e-mail</a>
-</dt>
 <dt class="feat-io-ox-core-enterprisePicker">automatyczne dodawanie z katalogu adresów, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatyczne dodawanie kontaktów lub zasobów z katalogu adresów</a>
 </dt>
 <dt class="cap-contacts">automatyczne dodawanie z książki adresowej, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatyczne dodawanie kontaktów lub zasobów z książki adresowej</a>
 </dt>
-<dt class="cap-webmail">automatyczne przesyłanie dalej, <a class="indexterm" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatyczne przesyłanie wiadomości e-mail dalej</a>
-</dt>
-<dt class="cap-webmail">czyszczenie folderów, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Czyszczenie folderów poczty e-mail</a>
-</dt>
-<dt class="cap-portal">dodawanie do portalu, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.addportal.html">Dodawanie wiadomości e-mail do portalu</a>
-</dt>
-<dt class="cap-webmail">dodawanie folderu, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Dodawanie folderów poczty e-mail</a>
-</dt>
-<dt class="cap-webmail">dodawanie konta e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Dodawanie kont e-mail</a>
-</dt>
-<dt class="cap-webmail">dodawanie załączników, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Dodawanie załączników</a>
-</dt>
-<dt class="cap-webmail">dodawanie załączników z już istniejących wiadomości e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Dodawanie załączników z już istniejących wiadomości e-mail</a>
-</dt>
-<dt class="cap-webmail">drukowanie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Drukowanie wiadomości e-mail</a>
-</dt>
-<dt class="cap-deputy">edytowanie, zarządzanie jako zastępca, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Wysyłanie lub odbieranie wiadomości e-mail jako zastępca</a>
-</dt>
-<dt class="feat-io-ox-core-mailPDFExport">eksportuj jako PDF, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Eksportuj wiadomości e-mail w formacie PDF</a>
-</dt>
-<dt class="cap-webmail">filtry, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Korzystanie z filtrów poczty e-mail</a>
-</dt>
-<dt class="cap-webmail">gromadzenie adresów, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Gromadzenie adresów</a>
-</dt>
 <dt class="cap-guard">importowanie kluczy Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importowanie kluczy Autocrypt</a>
 </dt>
-<dt class="cap-webmail">importowanie z pliku EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importowanie wiadomości e-mail</a>
-</dt>
-<dt class="cap-webmail">Kategorie skrzynki odbiorczej, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Praca z kategoriami skrzynki odbiorczej</a>
-</dt>
-<dt class="cap-webmail">kategoryzowanie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Kategoryzowanie wiadomości e-mail</a>
-</dt>
-<dt class="cap-webmail">kopiowanie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Przenoszenie lub kopiowanie wiadomości e-mail</a>
-</dt>
-<dt class="feat-io-ox-core-openai">korzystanie z funkcji AI do tworzenia wiadomości e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Korzystanie z funkcji AI podczas tworzenia wiadomości e-mail</a>
-</dt>
-<dt class="feat-io-ox-core-openai">korzystanie z funkcji AI w przypadku odpowiedzi, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">Korzystanie z funkcji AI podczas odpowiadania na wiadomości e-mail</a>
-</dt>
-<dt class="feat-io-ox-core-openai">korzystanie z integracji z AI, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Korzystanie z integracji z AI</a>
-</dt>
-<dt class="cap-webmail">korzystanie z podpisów, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Korzystanie z podpisów</a>
-</dt>
-<dt class="feat-io-ox-core-templates">korzystanie z szablonów, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Korzystanie z szablonów</a>
-</dt>
-<dt class="cap-webmail">korzystanie z wersji roboczej, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">Korzystanie z wersji roboczych wiadomości e-mail</a>
-</dt>
 <dt class="cap-webmail">menu Ustawienia, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">Menu ustawień aplikacji E-mail</a>
 </dt>
-<dt class="cap-webmail">odpowiadanie, <a class="indexterm" href="ox.appsuite.user.sect.email.send.reply.html">Odpowiadanie na wiadomości e-mail</a>
-</dt>
 <dt class="cap-webmail">okno edycji, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.create.html">Okno edycji wiadomości e-mail</a>
 </dt>
-<dt class="cap-webmail">oznaczanie folderu jako przeczytanego, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Oznaczanie wiadomości e-mail jako przeczytanych lub nieprzeczytanych</a>
-</dt>
-<dt class="cap-webmail">oznaczanie jako nieprzeczytane, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Oznaczanie wiadomości e-mail jako przeczytanych lub nieprzeczytanych</a>
-</dt>
-<dt class="cap-webmail">oznaczanie jako przeczytane, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Oznaczanie wiadomości e-mail jako przeczytanych lub nieprzeczytanych</a>
-</dt>
-<dt class="cap-webmail">oznaczanie jako przeczytane, ustawienie, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
-</dt>
-<dt class="cap-webmail">pasek kart, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">Pasek kart skrzynki odbiorczej aplikacji E-mail</a>
+<dt class="cap-webmail">pasek kategorii skrzynki odbiorczej, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">Pasek kategorii skrzynki odbiorczej</a>
 </dt>
 <dt class="cap-webmail">pasek narzędzi, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji E-mail</a>
 </dt>
-<dt class="cap-webmail cap-switchboard">połączenie z nadawcą lub innym adresatem, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Łączenie z nadawcą lub innym adresatem</a>
-</dt>
-<dt class="cap-webmail">przenoszenie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Przenoszenie lub kopiowanie wiadomości e-mail</a>
-</dt>
-<dt class="cap-webmail">przesyłanie dalej, <a class="indexterm" href="ox.appsuite.user.sect.email.send.forward.html">Przesyłanie wiadomości e-mail dalej</a>
-</dt>
 <dt class="cap-guard">przesyłanie kluczy Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Przesyłanie kluczy Autocrypt do innych klientów</a>
 </dt>
 <dt class="cap-webmail">Przycisk Nowa wiadomość, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.new.html">Przycisk Nowa wiadomość</a>
 </dt>
-<dt class="cap-webmail">przypisywanie kolorów, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Kategoryzowanie wiadomości e-mail</a>
-</dt>
 <dt class="cap-webmail">składniki, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.html">Składniki aplikacji E-mail</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">udostępnij, patrz udostępnianie, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Udostępnianie danych</a>
 </dt>
-<dt class="cap-webmail">ujednolicona poczta, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Korzystanie z ujednoliconej poczty</a>
-</dt>
-<dt class="cap-webmail">ustawianie adresu Odpowiedz do, <a class="indexterm" href="ox.appsuite.user.sect.email.send.replyto.html">Ustawianie adresu Odpowiedz do</a>
-</dt>
-<dt class="cap-webmail">ustawienia, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
-</dt>
-<dt class="cap-webmail">usuń, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Usuwanie wiadomości e-mail</a>
-</dt>
-<dt class="cap-tasks">utwórz przypomnienie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.reminder.html">Tworzenie przypomnień o wiadomościach e-mail</a>
-</dt>
 <dt class="cap-webmail">widok folderów, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">Widok folderów w aplikacji E-mail</a>
 </dt>
 <dt class="cap-webmail">widok listy, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji E-mail</a>
 </dt>
 <dt class="cap-webmail">widok szczegółów, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji E-mail</a>
 </dt>
-<dt class="cap-webmail">wybieranie adresu nadawcy, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">Wybieranie adresu nadawcy</a>
-</dt>
 <dt class="cap-webmail">wyłączanie lub włączanie funkcyjnych kont e-mail, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Wyłączanie lub włączanie funkcyjnych kont e-mail</a>
 </dt>
 <dt class="cap-webmail">wyskakujÄ…ce okienko, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.popup.html">WyskakujÄ…ce okienko w aplikacji E-mail</a>
 </dt>
-<dt class="cap-webmail">wyświetlanie, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Wyświetlanie wiadomości e-mail</a>
-</dt>
-<dt class="cap-webmail">wyświetlanie załącznika, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Wyświetlanie lub zapisywanie załączników wiadomości e-mail</a>
-</dt>
-<dt class="cap-webmail">wyświetlanie źródła wiadomości e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Wyświetlanie źródła wiadomości e-mail</a>
-</dt>
-<dt class="cap-webmail">wysyłanie, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a>
-</dt>
-<dt class="cap-calendar">wysyłanie do uczestników spotkania, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attendees.html">Wysyłanie wiadomości e-mail do uczestników spotkania</a>
-</dt>
-<dt class="cap-deputy">wysyłanie jako zastępca, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Wysyłanie lub odbieranie wiadomości e-mail jako zastępca</a>
-</dt>
 <dt class="cap-webmail">wysyłanie z poziomu książki adresowej, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Wysyłanie wiadomości e-mail z poziomu książki adresowej</a>
 </dt>
-<dt class="cap-infostore">Wysyłanie załącznika jako linku, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Wysyłanie załącznika jako linku</a>
-</dt>
-<dt class="cap-webmail">wysyłanie zawiadomienia o urlopie, <a class="indexterm" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Automatyczne wysyłanie zawiadomienia o urlopie</a>
-</dt>
-<dt class="cap-webmail">wyszukiwanie, <a class="indexterm" href="ox.appsuite.user.sect.email.search.html">Wyszukiwanie wiadomości e-mail</a>
-</dt>
-<dt class="cap-webmail">zapisywanie w formacie EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">Zapisywanie wiadomości</a>
-</dt>
-<dt class="cap-webmail">zapisywanie załącznika, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Wyświetlanie lub zapisywanie załączników wiadomości e-mail</a>
-</dt>
-<dt class="cap-webmail">zarządzanie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a>
-</dt>
 </dl></dd>
 <dt class="cap-webmail">E-mail, zobacz E-mail, <a class="indexterm" href="ox.appsuite.user.chap.email.html">
     E-mail
@@ -460,7 +360,7 @@
 </dt>
 <dt class="">uprawnienia, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">Do czego służą uprawnienia?</a>
 </dt>
-<dt class="">zmienianie nazwy, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Zmiana nazw folderów</a>
+<dt class="">Zmień nazwę, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Zmiana nazw folderów</a>
 </dt>
 </dl></dd>
 <dt class="feat-io-ox-core-openai">funkcje AI, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Korzystanie z integracji z AI</a>
@@ -478,7 +378,7 @@
 <dl>
 <dt class="feat-io-ox-core-resourceCalendars">Grupa kalendarzy zasobów</dt>
 <dd><dl>
-<dt class="feat-io-ox-core-resourceCalendars">Dodaj kalendarze zasobów, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Tworzenie kalendarzy zasobów i grup kalendarzy zasobów</a>
+<dt class="feat-io-ox-core-resourceCalendars">dodawanie kalendarze zasobów, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Tworzenie kalendarzy zasobów i grup kalendarzy zasobów</a>
 </dt>
 <dt class="feat-io-ox-core-resourceCalendars">tworzenie, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Tworzenie kalendarzy zasobów i grup kalendarzy zasobów</a>
 </dt>
@@ -495,11 +395,11 @@
 <dd><dl>
 <dt class="">korzystanie z haseł do aplikacji, <a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">Korzystanie z haseł do aplikacji</a>
 </dt>
-<dt class="cap-guard">Resetowanie hasła do aplikacji Strażnik, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a>
+<dt class="cap-guard">Resetowanie hasła do aplikacji Strażnik, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">Resetowanie hasła</a>
 </dt>
 <dt class="">zmienianie, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.changepassword.html">Zmiana hasła</a>
 </dt>
-<dt class="cap-guard">Zmienianie hasła do aplikacji Strażnik, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a>
+<dt class="cap-guard">Zmienianie hasła do aplikacji Strażnik, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Zmiana hasła</a>
 </dt>
 </dl></dd>
 </dl>
@@ -521,9 +421,10 @@
 </dt>
 </dl></dd>
 <dt class="cap-webmail">importowanie</dt>
+<dd><dl><dt class="cap-webmail">wiadomość e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importowanie wiadomości e-mail</a>
+</dt></dl></dd>
+<dt class="cap-calendar">Importowanie</dt>
 <dd><dl>
-<dt class="cap-webmail">e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importowanie wiadomości e-mail</a>
-</dt>
 <dt class="cap-calendar">kalendarz, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importowanie kalendarzy z plików</a>
 </dt>
 <dt class="cap-contacts">kontakty w formacie CSV, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importowanie kontaktów</a>
@@ -532,10 +433,9 @@
 </dt>
 <dt class="cap-calendar">spotkania, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importowanie spotkań</a>
 </dt>
+<dt class="cap-tasks">zadania, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importowanie zadań</a>
+</dt>
 </dl></dd>
-<dt class="cap-tasks">Importowanie</dt>
-<dd><dl><dt class="cap-tasks">zadania, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importowanie zadań</a>
-</dt></dl></dd>
 <dt class="">Interfejs użytkownika</dt>
 <dd><dl>
 <dt class="feat-io-ox-core-navigation">korzystanie z przycisków przeglądarki, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.browserbuttons.html">Korzystanie z przycisków przeglądarki</a>
@@ -628,11 +528,13 @@
 </dt>
 <dt class="cap-calendar">składniki, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.html">Składniki aplikacji Kalendarz</a>
 </dt>
+<dt class="cap-share_links cap-share_mail_attachments">udostępnij, patrz udostępnianie, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Udostępnianie danych</a>
+</dt>
 <dt class="cap-calendar">widok folderów, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Widok folderów w aplikacji Kalendarz</a>
 </dt>
 <dt class="cap-calendar">widok kalendarza, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.calendarview.html">Widok kalendarza Dzień, Tydzień roboczy, Tydzień, Miesiąc lub Rok.</a>
 </dt>
-<dt class="cap-calendar">Widok listy, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">Widok listy w aplikacji Kalendarz</a>
+<dt class="cap-calendar">widok listy, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">Widok listy w aplikacji Kalendarz</a>
 </dt>
 <dt class="cap-calendar">widok planowania, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.scheduling.html">Widok planowania</a>
 </dt>
@@ -657,18 +559,18 @@
 </dt>
 <dt class="cap-calendar">narzędzie wyboru daty, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">Narzędzie wyboru daty</a>
 </dt>
-<dt class="cap-calendar_google">subskrybowanie kalendarzy Google, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Subskrybowanie kalendarzy Google</a>
-</dt>
 <dt class="cap-calendar">subskrybowanie kalendarzy iCal, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subskrybowanie kalendarzy zewnętrznych za pomocą adresu URL iCal</a>
 </dt>
 <dt class="cap-calendar">subskrybowanie publicznych i udostępnionych kalendarzy, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subskrybowanie publicznych i udostępnionych kalendarzy</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">tworzenie spotkań przy użyciu kalendarza zasobu, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Tworzenie spotkań przy użyciu kalendarza zasobu</a>
+<dt class="cap-calendar_google">Subskrybuj kalendarze Google, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Subskrybowanie kalendarzy Google</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">udostępnij, patrz udostępnianie, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Udostępnianie danych</a>
+<dt class="feat-io-ox-core-resourceCalendars">tworzenie spotkań przy użyciu kalendarza zasobu, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Tworzenie spotkań przy użyciu kalendarza zasobu</a>
 </dt>
 <dt class="cap-calendar">ustawienia, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
+<dt class="feat-io-ox-core-categories">używanie kategorii, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">używanie kategorii w odniesieniu do spotkań</a>
+</dt>
 <dt class="cap-calendar">używanie kolorów kalendarza, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Używanie kolorów kalendarza</a>
 </dt>
 </dl></dd>
@@ -697,9 +599,22 @@
 <dt class="feat-io-ox-core-enterprisePicker">wyświetlanie kontaktów, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Wyświetlanie kontaktów na liście adresów</a>
 </dt>
 </dl></dd>
+<dt class="feat-io-ox-core-categories">kategorie</dt>
+<dd><dl>
+<dt class="feat-io-ox-core-categories">używanie w odniesieniu do kontaktów, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Używanie kategorii w odniesieniu do kontaktów</a>
+</dt>
+<dt class="feat-io-ox-core-categories">używanie w odniesieniu do spotkań, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">używanie kategorii w odniesieniu do spotkań</a>
+</dt>
+<dt class="feat-io-ox-core-categories">używanie w przypadku wiadomości e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail</a>
+</dt>
+</dl></dd>
 <dt class="feat-io-ox-core-categories">Kategorie</dt>
-<dd><dl><dt class="feat-io-ox-core-categories">zarzÄ…dzanie, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">ZarzÄ…dzanie kategoriami</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="feat-io-ox-core-categories">używanie w odniesieniu do zadań, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Używanie kategorii w odniesieniu do zadań</a>
+</dt>
+<dt class="feat-io-ox-core-categories">zarzÄ…dzanie, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">ZarzÄ…dzanie kategoriami</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">Kategorie skrzynki odbiorczej</dt>
 <dd><dl><dt class="cap-webmail">praca z, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Praca z kategoriami skrzynki odbiorczej</a>
 </dt></dl></dd>
@@ -755,6 +670,8 @@
 </dt>
 <dt class="cap-contacts">usuń, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.delete.html">Usuwanie kontaktów</a>
 </dt>
+<dt class="feat-io-ox-core-categories">używanie kategorii, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Używanie kategorii w odniesieniu do kontaktów</a>
+</dt>
 <dt class="cap-contacts">wyświetlanie, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.html">Wyświetlanie kontaktów</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Wyświetlanie kontaktów z książki adresowej</a>
 </dt>
 <dt class="feat-io-ox-core-enterprisePicker">wyświetlanie na liście adresów, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Wyświetlanie kontaktów na liście adresów</a>
@@ -850,7 +767,7 @@
 </dt>
 <dt class="cap-contacts">ustawienia, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Ustawienia książki adresowej</a>
 </dt>
-<dt class="cap-contacts">widok folderów, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">Widok folderów w aplikacji Książka adresowa</a>
+<dt class="cap-contacts">Widok folderów, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">Widok folderów w aplikacji Książka adresowa</a>
 </dt>
 <dt class="cap-contacts">widok listy, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.list.html">Widok listy w aplikacji Książka adresowa</a>
 </dt>
@@ -927,7 +844,7 @@
 </dt>
 <dt class="cap-infostore">Foldery aplikacji Pliki, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.html">Pliki: dodawanie folderów</a>, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.personal.html">Pliki: tworzenie folderów</a>
 </dt>
-<dt class="cap-webmail">Foldery poczty e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Dodawanie folderów poczty e-mail</a>
+<dt class="cap-webmail">foldery poczty e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Dodawanie folderów poczty e-mail</a>
 </dt>
 <dt class="cap-calendar">kalendarz, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Dodawanie kalendarzy</a>
 </dt>
@@ -947,7 +864,7 @@
 </dt>
 <dt class="cap-calendar">spotkania, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.create.html">Tworzenie nowych spotkań</a>
 </dt>
-<dt class="cap-webmail">wiadomość e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a>
+<dt class="cap-webmail">wiadomość e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a>
 </dt>
 <dt class="cap-tasks">zadanie, <a class="indexterm" href="ox.appsuite.user.sect.tasks.add.create.html">Tworzenie nowego zadania</a>
 </dt>
@@ -993,9 +910,16 @@
 </dt>
 <dt class="">obszar wyświetlania, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.content.html">Obszar wyświetlania</a>
 </dt>
+<dt class="cap-webmail">odzyskiwanie</dt>
+<dd><dl>
+<dt class="cap-dumpster">trwale usunięte wiadomości e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Odzyskiwanie trwale usuniętych wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">wiadomość e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Odzyskiwanie wiadomości e-mail</a>
+</dt>
+</dl></dd>
 <dt class="">okno edycji, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.create.html">Okno edycji</a>
 </dt>
-<dt class="">osobiste dane kontaktowe, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Zmienianie osobistych danych kontaktowych</a>
+<dt class="">Osobiste dane kontaktowe, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Zmienianie osobistych danych kontaktowych</a>
 </dt>
 <dt class="">Osobisty obraz kontaktu, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Zmienianie osobistych danych kontaktowych</a>
 </dt>
@@ -1180,7 +1104,7 @@
 </dt>
 <dt class="">pojęcia, <a class="indexterm" href="ox.appsuite.user.sect.about.glossary.html">Pojęcia</a>
 </dt>
-<dt class="">Pokazuj powiadomienia na pulpicie, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
+<dt class="">Pokaż powiadomienia na pulpicie, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
 </dt>
 <dt class="cap-webmail cap-switchboard">Połączenie</dt>
 <dd><dl>
@@ -1239,12 +1163,14 @@
 </dt>
 <dt class="">korzystanie z obszaru powiadomień, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Korzystanie z obszaru powiadomień</a>
 </dt>
-<dt class="">Używanie odliczania dla spotkań, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Używanie odliczania dla spotkań</a>
-</dt>
 </dl></dd>
 <dt class="">Powiadomienia</dt>
-<dd><dl><dt class="">Pokazuj powiadomienia na pulpicie, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="">pokaż powiadomienia na pulpicie, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
+</dt>
+<dt class="">używanie odliczania dla spotkań, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Używanie odliczania dla spotkań</a>
+</dt>
+</dl></dd>
 <dt class="cap-infostore">Prezentacje</dt>
 <dd><dl><dt class="cap-infostore">przedstawianie, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.presentation.html">Przedstawianie prezentacji</a>
 </dt></dl></dd>
@@ -1314,6 +1240,8 @@
 </dt>
 <dt class="cap-calendar">usuwanie konfliktów, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Usuwanie konfliktów</a>
 </dt>
+<dt class="feat-io-ox-core-categories">używanie kategorii, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">używanie kategorii w odniesieniu do spotkań</a>
+</dt>
 <dt class="cap-calendar">używanie kolorów kalendarza, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Używanie kolorów kalendarza</a>
 </dt>
 <dt class="">używanie odliczania, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Używanie odliczania dla spotkań</a>
@@ -1332,7 +1260,7 @@
 </dt>
 <dt class="cap-calendar">zapraszanie adresatów wiadomości e-mail na nowe spotkania, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.recipients.html">Zapraszanie adresatów wiadomości e-mail na nowe spotkania</a>
 </dt>
-<dt class="cap-calendar">zapraszanie uczestników na nowe spotkanie, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników na nowe spotkanie</a>
+<dt class="cap-calendar">zapraszanie uczestników na nowe spotkanie, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników do nowego spotkania</a>
 </dt>
 <dt class="cap-calendar">zapraszanie z poziomu książki adresowej, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Zapraszanie kontaktów na spotkanie</a>
 </dt>
@@ -1375,7 +1303,7 @@
 </dt>
 <dt class="cap-guard">Przesyłanie kluczy Autocrypt do innych klientów, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Przesyłanie kluczy Autocrypt do innych klientów</a>
 </dt>
-<dt class="cap-guard">resetowanie hasła, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a>
+<dt class="cap-guard">resetowanie hasła, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">Resetowanie hasła</a>
 </dt>
 <dt class="cap-guard">Szyfrowanie dokumentów Office, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Szyfrowanie dokumentów pakietu Office</a>
 </dt>
@@ -1391,6 +1319,8 @@
 </dt>
 <dt class="cap-guard">ustawienia, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
 </dt>
+<dt class="cap-guard">usuwanie funkcji resetowania hasła, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Usuwanie funkcji resetowania hasła</a>
+</dt>
 <dt class="cap-guard">usuwanie kluczy Autocrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">ZarzÄ…dzanie kluczami Autocrypt</a>
 </dt>
 <dt class="cap-guard">utwórz nowy zaszyfrowany plik, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.upload.html">Bezpieczne przesyłanie plików przy użyciu funkcji szyfrowania</a>
@@ -1409,13 +1339,15 @@
 </dt>
 <dt class="cap-guard">zarzÄ…dzanie kluczami, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">ZarzÄ…dzanie kluczami</a>
 </dt>
-<dt class="cap-guard">zarzÄ…dzanie kluczami publicznymi, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">ZarzÄ…dzanie kluczami publicznymi</a>
+<dt class="cap-guard">zarządzanie kluczami PGP odbiorców, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Zarządzanie kluczami PGP odbiorców</a>
+</dt>
+<dt class="cap-guard">zarządzanie kluczami S/MIME odbiorców, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Zarządzanie kluczami S/MIME odbiorców</a>
 </dt>
 <dt class="cap-guard">zarządzanie własnymi kluczami PGP, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Zarządzanie własnymi kluczami PGP</a>
 </dt>
 <dt class="cap-smime">zarządzanie własnymi kluczami S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Zarządzanie własnymi kluczami S/MIME</a>
 </dt>
-<dt class="cap-guard">zmiana hasła, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a>
+<dt class="cap-guard">zmiana hasła, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Zmiana hasła</a>
 </dt>
 </dl></dd>
 <dt class="cap-calendar">Strefa czasowa</dt>
@@ -1431,7 +1363,7 @@
 </dt>
 <dt class="">ukrywanie folderów, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.hide.html">Ukrywanie folderów</a>
 </dt>
-<dt class="">Ulubione, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Dodawanie folderów do ulubionych</a>
+<dt class="">ulubione, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Dodawanie folderów do ulubionych</a>
 </dt>
 </dl></dd>
 <dt class="cap-portal">Subskrybowanie</dt>
@@ -1546,18 +1478,21 @@
 <dt class="cap-calendar">ulubione strefy czasowe, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.timezones.html">ZarzÄ…dzanie ulubionymi strefami czasowymi</a>
 </dt>
 </dl></dd>
-<dt class="">uprawnienia</dt>
+<dt class="">Uprawnienia</dt>
 <dd><dl>
 <dt class="cap-share_links cap-share_mail_attachments">administrator, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Jakich uprawnień można używać?</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">aplikacja, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Jakich uprawnień można używać?</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">autor, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Jakich uprawnień można używać?</a>
-</dt>
 <dt class="">definicja, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">Do czego służą uprawnienia?</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">obserwator, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Jakich uprawnień można używać?</a>
 </dt>
+</dl></dd>
+<dt class="cap-share_links cap-share_mail_attachments">uprawnienia</dt>
+<dd><dl>
+<dt class="cap-share_links cap-share_mail_attachments">autor, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Jakich uprawnień można używać?</a>
+</dt>
 <dt class="cap-share_links cap-share_mail_attachments">przykłady, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">Zastosowania uprawnień</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">recenzent, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Jakich uprawnień można używać?</a>
@@ -1583,16 +1518,16 @@
 </dt>
 <dt class="">osobiste dane kontaktowe, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Zmienianie osobistych danych kontaktowych</a>
 </dt>
-<dt class="cap-dataexport">pobieranie danych osobowych, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Pobieranie danych osobowych</a>
-</dt>
-<dt class="">powiadomienia, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
-</dt>
-<dt class="cap-guard">
-        Strażnik
+<dt class="cap-infostore">
+        Pliki
         
         
         
-      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
+      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Ustawienia aplikacji Pliki</a>
+</dt>
+<dt class="cap-dataexport">pobieranie danych osobowych, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Pobieranie danych osobowych</a>
+</dt>
+<dt class="">powiadomienia, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
 </dt>
 <dt class="cap-switchboard">ustawianie statusu obecności, <a class="indexterm" href="ox.appsuite.user.sect.settings.presencestatus.html">Ustawianie statusu obecności</a>
 </dt>
@@ -1602,73 +1537,74 @@
 </dt>
 <dt class="">wyszukiwanie, <a class="indexterm" href="ox.appsuite.user.sect.settings.search.html">Wyszukiwanie ustawień</a>
 </dt>
-<dt class="cap-deputy">zarządzaj zastępcami, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Zarządzanie zastępcami</a>
+<dt class="cap-deputy">zarządzanie zastępcami, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Zarządzanie zastępcami</a>
 </dt>
 <dt class="">zmiana hasła, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.changepassword.html">Zmiana hasła</a>
 </dt>
 </dl></dd>
 <dt class="cap-portal">ustawienia</dt>
 <dd><dl>
-<dt class="cap-infostore">
-        Pliki
+<dt class="cap-portal">portal, <a class="indexterm" href="ox.appsuite.user.sect.portal.settings.html">Ustawienia portalu</a>
+</dt>
+<dt class="cap-guard">
+        Strażnik
         
         
         
-      , <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Ustawienia aplikacji Pliki</a>
-</dt>
-<dt class="cap-portal">portal, <a class="indexterm" href="ox.appsuite.user.sect.portal.settings.html">Ustawienia portalu</a>
+      , <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
 </dt>
 </dl></dd>
 <dt class="cap-calendar">Ustawienia aplikacji Jitsi</dt>
-<dd><dl><dt class="cap-calendar">Automatycznie skopiuj link do lokalizacji, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
+<dd><dl><dt class="cap-calendar">automatyczne kopiowanie linku do lokalizacji, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt></dl></dd>
 <dt class="cap-infostore">ustawienia aplikacji Pliki</dt>
 <dd><dl>
-<dt class="cap-infostore">dodawanie plików, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Ustawienia aplikacji Pliki</a>
+<dt class="cap-infostore">Dodaj pliki, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Ustawienia aplikacji Pliki</a>
 </dt>
 <dt class="cap-infostore">historia wersji, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Ustawienia aplikacji Pliki</a>
 </dt>
-<dt class="cap-infostore">pokaz slajdów z obrazów, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Ustawienia aplikacji Pliki</a>
+<dt class="cap-infostore">Pokaz slajdów w przypadku obrazów, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Ustawienia aplikacji Pliki</a>
 </dt>
 <dt class="cap-infostore">pokazywanie ukrytych plików i folderów, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Ustawienia aplikacji Pliki</a>
 </dt>
 </dl></dd>
+<dt class="cap-guard">Ustawienia aplikacji Strażnik</dt>
+<dd><dl><dt class="cap-guard">opcje tworzenia, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
+</dt></dl></dd>
 <dt class="cap-calendar">Ustawienia aplikacji Zoom</dt>
 <dd><dl>
-<dt class="cap-calendar">Automatycznie skopiuj link do lokalizacji, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
+<dt class="cap-calendar">automatyczne kopiowanie linku do lokalizacji, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
-<dt class="cap-calendar">kopiowanie do opisu informacju o telefonicznym uczestnictwie w spotkaniu, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
+<dt class="cap-calendar">Skopiuj do opisu informacje o telefonicznym uczestnictwie w spotkaniu, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
 <dt class="cap-calendar">Zawsze dodawaj losowe hasło do spotkania, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
 </dl></dd>
 <dt class="">Ustawienia kalendarza</dt>
 <dd><dl>
-<dt class="">automatyczne usuwanie wiadomości e-mail z zaproszeniem po jego przyjęciu lub odrzuceniu, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
-</dt>
 <dt class="cap-calendar">automatycznie wprowadzaj zmiany w spotkaniach otrzymane e-mailem do kalendarza, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
 <dt class="cap-calendar">Czas pracy, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
 <dt class="cap-calendar">koniec, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
-<dt class="">otrzymuj powiadomienia jako uczestnik spotkania po przyjęciu lub odrzuceniu zaproszenia przez innego uczestnika, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
+<dt class="">Otrzymuj powiadomienia jako twórca spotkania po przyjęciu lub odrzuceniu zaproszenia przez uczestnika, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
 </dt>
-<dt class="">otrzymuj powiadomienia o utworzeniu, zmodyfikowaniu lub usunięciu spotkania, w którym uczestniczysz, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
+<dt class="">Otrzymuj powiadomienia jako uczestnik spotkania po przyjęciu lub odrzuceniu zaproszenia przez innego uczestnika, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
 </dt>
-<dt class="">otrzymywanie powiadomienia jako twórca spotkania po przyjęciu lub odrzuceniu zaproszenia przez uczestnika, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
+<dt class="">otrzymuj powiadomienia o utworzeniu, zmodyfikowaniu lub usunięciu spotkania, w którym uczestniczysz, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
 </dt>
 <dt class="cap-calendar">oznacz automatycznie spotkania całodniowe jako „Wolne”, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
 <dt class="cap-calendar">poczÄ…tek, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
-<dt class="cap-calendar">Pokaż kalendarz urodzin, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
+<dt class="cap-calendar">pokaż kalendarz urodzin, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
 <dt class="cap-calendar">Pokaż odrzucone spotkania, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
-<dt class="cap-calendar">pokazywanie przypomnień dotyczących spotkań z przeszłości, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
+<dt class="cap-calendar">Pokaż przypomnienia dotyczące spotkań z przeszłości, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
-<dt class="cap-calendar">Przypomnienia o spotkaniach, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
+<dt class="cap-calendar">przypomnienia o spotkaniach, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
 <dt class="cap-calendar">skala czasu, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
@@ -1684,7 +1620,9 @@
 </dt>
 <dt class="cap-portal">ustawienia zaawansowane, <a class="indexterm" href="ox.appsuite.user.sect.portal.settings.html">Ustawienia portalu</a>, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Ustawienia książki adresowej</a>
 </dt>
-<dt class="cap-calendar">używanie koloru pierwszej kategorii dla spotkań, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
+<dt class="">Usuń automatycznie wiadomość e-mail z zaproszeniem po jego przyjęciu lub odrzuceniu, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
+</dt>
+<dt class="cap-calendar">Użyj koloru pierwszej kategorii dla spotkań, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
 <dt class="cap-calendar">widoczność „wolny/zajęty”, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Ustawienia kalendarza</a>
 </dt>
@@ -1754,23 +1692,25 @@
 </dt>
 <dt class="cap-webmail">Pokaż folder ze wszystkimi oflagowanymi wiadomościami, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
 </dt>
+<dt class="cap-webmail">Pokaż kategorie, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
+</dt>
 <dt class="cap-webmail">Pokaż podgląd tekstu, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
 </dt>
 <dt class="cap-webmail">pokaż rozmiar wiadomości, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
 </dt>
-<dt class="cap-webmail">pokaż żądania potwierdzeń zwrotnych, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
+<dt class="cap-webmail">Pokaż żądania potwierdzeń zwrotnych, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
 </dt>
 <dt class="cap-webmail">Pokazuj cytowany tekst w innym kolorze, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
 </dt>
-<dt class="cap-webmail">przesyłaj wiadomości dalej jako, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
+<dt class="cap-webmail">Przesyłaj wiadomości dalej jako, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
 </dt>
 <dt class="cap-webmail">Pytaj, zanim wyślesz odpowiedź do listy adresowej, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">Subskrypcja folderu IMAP, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Subskrybowanie udostępnionych lub osobistych folderów poczty e-mail</a>
 </dt>
-<dt class="cap-webmail">trwale usuwaj kasowane wiadomości e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
+<dt class="cap-webmail">Trwale usuwaj kasowane wiadomości e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
 </dt>
-<dt class="cap-webmail">układ, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
+<dt class="cap-webmail">Układ, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
 </dt>
 <dt class="cap-webmail">wstaw oryginalną wiadomość do odpowiedzi, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
 </dt>
@@ -1802,22 +1742,28 @@
 </dl></dd>
 <dt class="cap-guard">ustawienia zabezpieczeń aplikacji Strażnik</dt>
 <dd><dl>
+<dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
+</dt>
 <dt class="cap-guard">domyślne dodawanie podpisu do wychodzących wiadomości e-mail, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
 </dt>
 <dt class="cap-guard">domyślnie podczas tworzenia wiadomości do wysłania w formie zaszyfrowanej, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
 </dt>
-<dt class="cap-guard">S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
-</dt>
 <dt class="cap-guard">ustaw domyślnie w nowych wiadomościach PGP w tekście, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
 </dt>
-<dt class="cap-guard">ustawienia zaawansowane, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
-</dt>
 <dt class="cap-guard">Zapamiętaj ustawienia domyślne hasła, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
 </dt>
 </dl></dd>
 <dt class="cap-guard">Ustawienia zabezpieczeń aplikacji Strażnik</dt>
-<dd><dl><dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="cap-guard">opcje resetowania, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
+</dt>
+<dt class="cap-guard">pokaż zaawansowane ustawienia tworzenia wiadomości, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
+</dt>
+<dt class="cap-guard">Ustawienie automatycznego szyfrowania, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
+</dt>
+<dt class="cap-guard">ustawienie pamięci podręcznej poczty, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji Strażnik</a>
+</dt>
+</dl></dd>
 <dt class="">Ustawienia zadań</dt>
 <dd><dl>
 <dt class="">powiadomienie jako organizator, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Dostosowywanie powiadomień</a>
@@ -1829,12 +1775,12 @@
 </dl></dd>
 <dt class="cap-webmail">Usuń</dt>
 <dd><dl>
-<dt class="cap-webmail">e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Usuwanie wiadomości e-mail</a>
-</dt>
 <dt class="cap-contacts">kontakty, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.delete.html">Usuwanie kontaktów</a>
 </dt>
 <dt class="cap-calendar">spotkania, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.delete.html">Usuwanie spotkań</a>
 </dt>
+<dt class="cap-webmail">wiadomość e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Usuwanie wiadomości e-mail</a>, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Usuwanie wiadomości e-mail</a>
+</dt>
 <dt class="cap-tasks">zadania, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.delete.html">Usuwanie zadań</a>
 </dt>
 </dl></dd>
@@ -1877,9 +1823,122 @@
 <dt class="cap-webdav">uzyskiwanie dostępu do plików, <a class="indexterm" href="ox.appsuite.user.sect.drive.webdav.html">Uzyskiwanie dostępu do plików przy użyciu protokołu WebDAV</a>
 </dt>
 </dl></dd>
-<dt class="cap-infostore">wiadomość e-mail</dt>
-<dd><dl><dt class="cap-infostore">wyświetlanie załączników, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Wyświetlanie załączników wiadomości e-mail w aplikacji Pliki</a>
-</dt></dl></dd>
+<dt class="cap-webmail">wiadomość e-mail</dt>
+<dd><dl>
+<dt class="cap-webmail">archiwizacja, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">Archiwizacja wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">automatyczne przesyłanie dalej, <a class="indexterm" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatyczne przesyłanie wiadomości e-mail dalej</a>
+</dt>
+<dt class="cap-webmail">czyszczenie folderów, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Czyszczenie folderów poczty e-mail</a>
+</dt>
+<dt class="cap-portal">dodawanie do portalu, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.addportal.html">Dodawanie wiadomości e-mail do portalu</a>
+</dt>
+<dt class="cap-webmail">dodawanie folderu, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Dodawanie folderów poczty e-mail</a>
+</dt>
+<dt class="cap-webmail">Dodawanie załączników, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Dodawanie załączników</a>
+</dt>
+<dt class="cap-webmail">dodawanie załączników z już istniejących wiadomości e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Dodawanie załączników z już istniejących wiadomości e-mail</a>
+</dt>
+<dt class="feat-io-ox-core-mailPDFExport">eksportuj jako PDF, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Eksportuj wiadomości e-mail w formacie PDF</a>
+</dt>
+<dt class="cap-webmail">filtry, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Korzystanie z filtrów poczty e-mail</a>
+</dt>
+<dt class="cap-webmail">importowanie z pliku EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importowanie wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">Kategorie skrzynki odbiorczej, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Praca z kategoriami skrzynki odbiorczej</a>
+</dt>
+<dt class="cap-webmail">kategoryzowanie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Kategoryzowanie wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">kopiowanie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Przenoszenie lub kopiowanie wiadomości e-mail</a>
+</dt>
+<dt class="feat-io-ox-core-openai">korzystanie z funkcji AI w przypadku odpowiedzi, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">Korzystanie z funkcji AI podczas odpowiadania na wiadomości e-mail</a>
+</dt>
+<dt class="feat-io-ox-core-openai">korzystanie z integracji z AI, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Korzystanie z integracji z AI</a>
+</dt>
+<dt class="cap-webmail">korzystanie z wersji roboczej, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">Korzystanie z wersji roboczych wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">odpowiadanie, <a class="indexterm" href="ox.appsuite.user.sect.email.send.reply.html">Odpowiadanie na wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">odzyskiwanie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Odzyskiwanie wiadomości e-mail</a>
+</dt>
+<dt class="cap-dumpster">odzyskiwanie trwale usuniętych wiadomości e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Odzyskiwanie trwale usuniętych wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">oznaczanie folderu jako przeczytanego, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Oznaczanie wiadomości e-mail jako przeczytanych lub nieprzeczytanych</a>
+</dt>
+<dt class="cap-webmail">oznaczanie jako nieprzeczytane, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Oznaczanie wiadomości e-mail jako przeczytanych lub nieprzeczytanych</a>
+</dt>
+<dt class="cap-webmail">oznaczanie jako przeczytane, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Oznaczanie wiadomości e-mail jako przeczytanych lub nieprzeczytanych</a>
+</dt>
+<dt class="cap-webmail">przenoszenie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Przenoszenie lub kopiowanie wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">przesyłanie dalej, <a class="indexterm" href="ox.appsuite.user.sect.email.send.forward.html">Przesyłanie wiadomości e-mail dalej</a>
+</dt>
+<dt class="cap-webmail">przypisywanie kolorów, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Kategoryzowanie wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">ujednolicona poczta, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Korzystanie z ujednoliconej poczty</a>
+</dt>
+<dt class="cap-webmail">ustawianie adresu Odpowiedz do, <a class="indexterm" href="ox.appsuite.user.sect.email.send.replyto.html">Ustawianie adresu Odpowiedz do</a>
+</dt>
+<dt class="cap-webmail">usuń, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Usuwanie wiadomości e-mail</a>
+</dt>
+<dt class="cap-tasks">utwórz przypomnienie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.reminder.html">Tworzenie przypomnień o wiadomościach e-mail</a>
+</dt>
+<dt class="cap-webmail">Wybieranie adresu nadawcy, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">Wybieranie adresu nadawcy</a>
+</dt>
+<dt class="cap-webmail">wyświetlanie, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Wyświetlanie wiadomości e-mail</a>
+</dt>
+<dt class="cap-infostore">wyświetlanie załączników, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Wyświetlanie załączników wiadomości e-mail w aplikacji Pliki</a>
+</dt>
+<dt class="cap-webmail">wysyłanie, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a>
+</dt>
+<dt class="cap-calendar">wysyłanie do uczestników spotkania, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attendees.html">Wysyłanie wiadomości e-mail do uczestników spotkania</a>
+</dt>
+<dt class="cap-infostore">wysyłanie załączników jako linków, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Wysyłanie załączników jako linków</a>
+</dt>
+<dt class="cap-webmail">wysyłanie zawiadomienia o urlopie, <a class="indexterm" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Automatyczne wysyłanie zawiadomienia o urlopie</a>
+</dt>
+<dt class="cap-webmail">wyszukiwanie, <a class="indexterm" href="ox.appsuite.user.sect.email.search.html">Wyszukiwanie wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">zapisywanie w formacie EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">Zapisywanie wiadomości</a>
+</dt>
+<dt class="cap-webmail">zarządzanie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a>
+</dt>
+</dl></dd>
+<dt class="cap-webmail">Wiadomość e-mail</dt>
+<dd><dl>
+<dt class="cap-webmail">dodawanie konta e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Dodawanie kont e-mail</a>
+</dt>
+<dt class="cap-webmail">drukowanie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Drukowanie wiadomości e-mail</a>
+</dt>
+<dt class="cap-deputy">edytowanie, zarządzanie jako zastępca, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Wysyłanie lub odbieranie wiadomości e-mail jako zastępca</a>
+</dt>
+<dt class="cap-webmail">gromadzenie adresów, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Gromadzenie adresów</a>
+</dt>
+<dt class="feat-io-ox-core-openai">korzystanie z funkcji AI do tworzenia wiadomości e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Korzystanie z funkcji AI podczas tworzenia wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">korzystanie z podpisów, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Korzystanie z podpisów</a>
+</dt>
+<dt class="feat-io-ox-core-templates">korzystanie z szablonów, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Korzystanie z szablonów</a>
+</dt>
+<dt class="cap-webmail">oznaczanie jako przeczytane, ustawienie, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
+</dt>
+<dt class="cap-webmail cap-switchboard">połączenie z nadawcą lub innym adresatem, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Łączenie z nadawcą lub innym adresatem</a>
+</dt>
+<dt class="cap-webmail">trwałe usuwanie, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Usuwanie wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">ustawienia, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
+</dt>
+<dt class="feat-io-ox-core-categories">używanie kategorii, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">wyświetlanie załącznika, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Wyświetlanie lub zapisywanie załączników wiadomości e-mail</a>
+</dt>
+<dt class="cap-webmail">wyświetlanie źródła wiadomości e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Wyświetlanie źródła wiadomości e-mail</a>
+</dt>
+<dt class="cap-deputy">wysyłanie jako zastępca, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Wysyłanie lub odbieranie wiadomości e-mail jako zastępca</a>
+</dt>
+<dt class="cap-webmail">zapisywanie załącznika, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Wyświetlanie lub zapisywanie załączników wiadomości e-mail</a>
+</dt>
+</dl></dd>
 <dt class="cap-portal">Widgety portalu</dt>
 <dd><dl>
 <dt class="cap-portal">dodawanie, <a class="indexterm" href="ox.appsuite.user.sect.portal.customize.add.html">Dodawanie widgetów portalu</a>
@@ -1898,12 +1957,12 @@
 </dt>
 <dt class="">ukrywanie folderów, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.hide.html">Ukrywanie folderów</a>
 </dt>
-<dt class="">Ulubione, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Dodawanie folderów do ulubionych</a>
+<dt class="">ulubione, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Dodawanie folderów do ulubionych</a>
 </dt>
 <dt class="">zmiana szerokości, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Poruszanie się po strukturze folderów</a>
 </dt>
 </dl></dd>
-<dt class="cap-webmail cap-calendar cap-tasks">widok halo, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Wyświetlanie kontaktów w widoku halo</a>
+<dt class="cap-webmail cap-calendar cap-tasks">Widok halo, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Wyświetlanie kontaktów w widoku halo</a>
 </dt>
 <dt class="">Widok halo, zob. wyskakujÄ…ce okienko, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.popup.html">WyskakujÄ…ce okienko</a>
 </dt>
@@ -1915,7 +1974,7 @@
 <dd><dl>
 <dt class="cap-contacts">eksport, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.export.html">Eksportowanie kontaktów</a>
 </dt>
-<dt class="cap-contacts">importowanie, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importowanie kontaktów</a>
+<dt class="cap-contacts">import, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importowanie kontaktów</a>
 </dt>
 <dt class="cap-contacts">tworzenie kontaktu z załącznika, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.vcardattachment.html">Dodawanie kontaktu z załączonej wizytówki</a>
 </dt>
@@ -1925,7 +1984,7 @@
 <dt class="">wyskakujÄ…ce okienko, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.popup.html">WyskakujÄ…ce okienko</a>
 </dt>
 <dt class="cap-webmail">Wyślij</dt>
-<dd><dl><dt class="cap-webmail">wiadomość e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a>
+<dd><dl><dt class="cap-webmail">wiadomość e-mail, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a>
 </dt></dl></dd>
 <dt class="cap-webmail">wyświetlanie</dt>
 <dd><dl>
@@ -2079,6 +2138,8 @@
 </dt>
 <dt class="cap-tasks">usuwanie, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.delete.html">Usuwanie zadań</a>
 </dt>
+<dt class="feat-io-ox-core-categories">używanie kategorii, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Używanie kategorii w odniesieniu do zadań</a>
+</dt>
 <dt class="cap-tasks">widok folderów, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">Widok folderów w aplikacji Zadania</a>
 </dt>
 <dt class="cap-tasks">widok listy, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.list.html">Widok listy w aplikacji Zadania</a>
@@ -2195,11 +2256,12 @@
 </dt>
 </dl></dd>
 <dt class="cap-infostore">Zmień nazwę</dt>
-<dd><dl><dt class="cap-infostore">pliki, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.rename.html">Edycja nazw plików</a>
-</dt></dl></dd>
-<dt class="">zmienianie nazwy</dt>
-<dd><dl><dt class="">folder, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Zmiana nazw folderów</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="">folder, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Zmiana nazw folderów</a>
+</dt>
+<dt class="cap-infostore">pliki, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.rename.html">Edycja nazw plików</a>
+</dt>
+</dl></dd>
 <dt class="cap-calendar">Zmienianie organizatora spotkania, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Zmienianie organizatora</a>
 </dt>
 <dt class="cap-webmail cap-switchboard">Zoom</dt>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.about.glossary.html b/help/l10n/pl_PL/ox.appsuite.user.sect.about.glossary.html
index 188138f61..2554afb95 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.about.glossary.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.about.glossary.html
@@ -74,19 +74,19 @@
 <p role="presentation">To pojęcie dotyczy interfejsu użytkownika oprogramowania do pracy grupowej. Interfejs użytkownika zawiera różne elementy.</p>
 <p role="presentation">Powiązane tematy: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.html">Ogólny opis interfejsu użytkownika</a></p></li></ul></p>
 </dd>
-<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">karty skrzynki odbiorczej</span></dt>
+<dt class="feat-io-ox-core-categories" id="ox.appsuite.user.reference.about.glossary.categories"><span class="glossterm">Kategorie</span></dt>
+<dd class="glossdef feat-io-ox-core-categories">
+<p role="presentation">Kategorie umożliwiają porządkowanie wiadomości e-mail, spotkań, kontaktów i zadań w różnych aplikacjach, niezależnie od struktury folderów. Dzięki temu można łatwiej identyfikować i znajdować obiekty powiązane logicznie, na przykład wszystkie wiadomości e-mail, spotkania, kontakty i zadania należące do konkretnego projektu lub klienta. W niektórych konfiguracjach jest już skonfigurowana część kategorii. Możesz także ustawić własne kategorie.</p>
+<p role="presentation">Uwaga: w przypadku wiadomości e-mail możesz także używać kart skrzynki odbiorczej.</p>
+<p role="presentation">PowiÄ…zane tematy: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">ZarzÄ…dzanie kategoriami</a></p></li></ul></p>
+</dd>
+<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">kategorie skrzynki odbiorczej</span></dt>
 <dd class="glossdef cap-webmail">
 <p role="presentation">Karty skrzynki odbiorczej umożliwiają łatwe utrzymywanie porządku w folderze <span class="guilabel"><strong>Skrzynka odbiorcza</strong></span>. Dzięki kartom przychodzące wiadomości e-mail są zapisywane w folderze <span class="guilabel"><strong>Skrzynka odbiorcza</strong></span> osobno — według nadawcy. W niektórych konfiguracjach niektóre karty są predefiniowane. W zależności od potrzeb można skonfigurować dodatkowe karty.</p>
 <p role="presentation">Kart skrzynki odbiorczej można używać tylko w folderze <span class="guilabel"><strong>Skrzynka odbiorcza</strong></span>. Jeśli potrzebne są dodatkowe opcje przechowywania, należy utworzyć odpowiednie foldery poczty e-mail przy użyciu widoku folderów.</p>
-<p role="presentation" class="feat-io-ox-core-categories">Uwaga: opisanych tutaj kart skrzynki odbiorczej można używać tylko w przypadku wiadomości e-mail. W niektórych konfiguracjach możesz używać oddzielnych kategorii dla spotkań, kontaktów i zadań.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Uwaga: opisanych tutaj kategorii skrzynki odbiorczej można używać tylko w odniesieniu do wiadomości e-mail. W niektórych konfiguracjach można stosować osobne kategorie do wiadomości e-mail, spotkań, kontaktów i zadań.</p>
 <p role="presentation">PowiÄ…zane tematy: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Praca z kategoriami skrzynki odbiorczej</a></p></li></ul></p>
 </dd>
-<dt class="feat-io-ox-core-categories" id="ox.appsuite.user.reference.about.glossary.categories"><span class="glossterm">Kategorie</span></dt>
-<dd class="glossdef feat-io-ox-core-categories">
-<p role="presentation">Kategorie służą do klasyfikowania spotkań, kontaktów i zadań. W ten sposób można zidentyfikować i łatwo znaleźć powiązane semantycznie obiekty. W niektórych konfiguracjach określone kategorie są predefiniowane, ale można skonfigurować własne kategorie.</p>
-<p role="presentation">Uwaga: kategorii tego typu nie można używać w przypadku wiadomości e-mail. Do ich obsługi służą karty skrzynki odbiorczej.</p>
-<p role="presentation">PowiÄ…zane tematy: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">ZarzÄ…dzanie kategoriami</a></p></li></ul></p>
-</dd>
 <dt id="ox.appsuite.user.reference.about.glossary.account"><span class="glossterm">konto</span></dt>
 <dd class="glossdef">
 <p role="presentation">Konto, czyli konto użytkownika, jest uprawnieniem dostępu do systemu komputerowego. Przykłady kont: <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.attendees.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.attendees.html
index d5c982328..a29202055 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.attendees.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.attendees.html
@@ -1,7 +1,7 @@
 <html lang="pl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Zapraszanie uczestników na nowe spotkanie</title>
+<title>Zapraszanie uczestników do nowego spotkania</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
@@ -37,7 +37,7 @@
   </h1>
 <h2 class="sr-only">Tworzenie spotkań</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attendees">
-<div class="titlepage"><div><div><h3 class="title">Zapraszanie uczestników na nowe spotkanie</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Zapraszanie uczestników do nowego spotkania</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.17.2"></a><p id="ox.appsuite.user.concept.calendar.add.attendees">Jeśli w spotkaniu uczestniczy kilka osób, możesz je zaprosić na nowe spotkanie.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.add.attendees">
 <p class="title">Jak zaprosić uczestników na nowe spotkanie:</p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.create.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.create.html
index b9851a263..5ea47d4aa 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.create.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.create.html
@@ -107,7 +107,7 @@
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Tworzenie spotkań przy użyciu kalendarza zasobu</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Korzystanie z widoku planowania</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Tworzenie kolejnego spotkania</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników na nowe spotkanie</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników do nowego spotkania</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Zapraszanie adresatów wiadomości e-mail na nowe spotkania</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Tworzenie spotkań z załączników iCal</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Usuwanie konfliktów</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.followup.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.followup.html
index 8e5484eca..f08d37a20 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.followup.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.followup.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Tworzenie spotkań">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Korzystanie z widoku planowania">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Zapraszanie uczestników na nowe spotkanie">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Zapraszanie uczestników do nowego spotkania">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.html
index dc14d7ede..575a0717f 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.html
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attachments.html">Dodawanie załączników</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Korzystanie z widoku planowania</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Tworzenie kolejnego spotkania</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników na nowe spotkanie</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników do nowego spotkania</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Zapraszanie adresatów wiadomości e-mail na nowe spotkania</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Tworzenie spotkań z załączników iCal</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Usuwanie konfliktów</a></p></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.participants.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.participants.html
index 97bc53a63..1a5c70466 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.participants.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.participants.html
@@ -67,6 +67,7 @@
 <li class="listitem"><p role="presentation">Jeśli uczestnik zewnętrzny zaakceptuje spotkanie, otrzymasz wiadomość e-mail.</p></li>
 </ul>
           <p role="presentation" class="feat-io-ox-core-managedResources">Uwaga: po dodaniu zasobu zarządzanego osoba odpowiedzialna za ten zasób otrzyma prośbę o jego rezerwację. Gdy tylko przyjmie ona albo odrzuci tę prośbę, otrzymasz o tym informację.</p>
+          
         </div>
 </div>
 <p id="ox.appsuite.user.tip.calendar.add.participants">Wskazówka: aby znaleźć wolny termin spotkania, w którym będą dyspozycyjni wszyscy uczestnicy i zasoby, <a class="link" href="ox.appsuite.user.sect.calendar.add.scheduling.html">użyj widoku harmonogramu</a>.</p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.recipients.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.recipients.html
index 9f97daaf6..a55a507e1 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.recipients.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.recipients.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Tworzenie spotkań">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Zapraszanie uczestników na nowe spotkanie">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Zapraszanie uczestników do nowego spotkania">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Tworzenie spotkań z załączników iCal">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -59,7 +59,7 @@
               <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Tworzenie nowych spotkań</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników na nowe spotkanie</a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników do nowego spotkania</a>
             </p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.scheduling.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.scheduling.html
index 1e02078fb..0711dd163 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.scheduling.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.add.scheduling.html
@@ -91,7 +91,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Tworzenie nowych spotkań</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników na nowe spotkanie</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników do nowego spotkania</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Usuwanie konfliktów</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy">Pokaż informację „wolny/zajęty” innym użytkownikom</a></p></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.create.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.create.html
index 467f06bb8..4e7bfa5a1 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.create.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.create.html
@@ -111,7 +111,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">Kalendarz</span></a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Tworzenie nowych spotkań</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Tworzenie spotkań</a></p>
 <p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Tworzenie i edytowanie spotkań oraz zarządzanie nimi jako zastępca</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edycja spotkań</a></p>
 </li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.detailview.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.detailview.html
index e8663e79a..ff1527deb 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.detailview.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.detailview.html
@@ -105,10 +105,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Wyświetlanie kontaktów w widoku halo</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Łączenie się z uczestnikami spotkania</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Zmiana statusu spotkania</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Zmiana przypomnień o spotkaniach</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">ZarzÄ…dzanie spotkaniami</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.detailview">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Składniki aplikacji <span class="phrase">Kalendarz</span></a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.foldertree.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.foldertree.html
index 997f4de60..86fda2638 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.foldertree.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.foldertree.html
@@ -65,7 +65,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Wyświetlanie spotkań</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">Dodawanie kalendarzy osobistych</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Używanie kolorów kalendarza</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">ZarzÄ…dzanie spotkaniami</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Tworzenie kalendarzy zasobów i grup kalendarzy zasobów</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.edit.html">Edytowanie kalendarzy zasobów</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Tworzenie spotkań przy użyciu kalendarza zasobu</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.list.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.list.html
index 48c3b20af..a76b1885e 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.list.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.list.html
@@ -57,11 +57,11 @@
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">Kalendarz</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Wyświetlanie spotkań w różnych widokach</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.view.html">Wyświetlanie kalendarzy zasobów</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">ZarzÄ…dzanie spotkaniami</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.list">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Składniki aplikacji <span class="phrase">Kalendarz</span></a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.new.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.new.html
index 622423bb3..1a1fc4abc 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.new.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.new.html
@@ -52,10 +52,7 @@
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Tworzenie nowych spotkań</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Korzystanie z widoku planowania</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Tworzenie spotkań</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">Subskrybowanie kalendarzy Google</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subskrybowanie publicznych i udostępnionych kalendarzy</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.popup.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.popup.html
index 81c7f1738..3b6fcbc5f 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.popup.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.popup.html
@@ -119,15 +119,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edycja spotkań</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Tworzenie kolejnego spotkania</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Zmiana statusu spotkania</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Zmiana przypomnień o spotkaniach</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Zmienianie organizatora</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Przenoszenie spotkań do innego kalendarza</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Eksportowanie spotkań</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Drukowanie spotkań</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Usuwanie spotkań</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">ZarzÄ…dzanie spotkaniami</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Wysyłanie wiadomości e-mail do uczestników spotkania</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.popup">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Składniki aplikacji <span class="phrase">Kalendarz</span></a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.toolbar.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.toolbar.html
index fc7b8673b..0cea89979 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.toolbar.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.gui.toolbar.html
@@ -72,18 +72,11 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Tworzenie kolejnego spotkania</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Wysyłanie wiadomości e-mail do uczestników spotkania</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników na nowe spotkanie</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Zapraszanie uczestników do nowego spotkania</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edycja spotkań</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Zmiana przypomnień o spotkaniach</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Zmienianie organizatora</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Przenoszenie spotkań do innego kalendarza</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Eksportowanie spotkań</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Drukowanie spotkań</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Usuwanie spotkań</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">ZarzÄ…dzanie spotkaniami</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.toolbar">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">Składniki aplikacji <span class="phrase">Kalendarz</span></a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.categories.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.categories.html
new file mode 100644
index 000000000..0787b637c
--- /dev/null
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.categories.html
@@ -0,0 +1,106 @@
+<html lang="pl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>używanie kategorii w odniesieniu do spotkań</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="podręcznik użytkownika">
+<link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="ZarzÄ…dzanie spotkaniami">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="ZarzÄ…dzanie ulubionymi strefami czasowymi">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Używanie kolorów kalendarza">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Wróć</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Dalej</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Kalendarz</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">ZarzÄ…dzanie spotkaniami</h2>
+<div class="sect2" id="ox.appsuite.user.sect.calendar.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">używanie kategorii w odniesieniu do spotkań</h3></div></div></div>
+<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><a class="indexterm" name="id-1.8.15.11.4"></a><p id="ox.appsuite.user.concept.calendar.manage.categories">Za pomocą kategorii można porządkować spotkania bez korzystania z folderów. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Można oznaczać spotkania kategoriami.</p></li>
+<li class="listitem"><p role="presentation">Można wyświetlać wszystkie spotkania oznaczone określoną kategorią.</p></li>
+</ul>
+<p> Można tworzyć, edytować lub usuwać własne kategorie — zobacz sekcję <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Zarządzanie kategoriami</a>.</p>
+<div class="task" id="ox.appsuite.user.task.calendar.manage.categories">
+<p class="title">Jak oznaczyć spotkania kategorią:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">W zależności od widoku dostępne są następujące możliwości: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Kliknij spotkanie w widoku kalendarza. W wyskakujÄ…cym okienku kliknij ikonÄ™ <span class="guibutton"><strong>Edytuj spotkanie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">W widoku listy wybierz spotkanie. Kliknij ikonę <span class="guibutton"><strong>Edytuj spotkanie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> widoczną na pasku narzędzi.</p></li>
+</ul></p>
+<p role="presentation">Otworzy siÄ™ okno edycji spotkania.</p>
+</li>
+<li class="step">
+<p role="presentation">W tym celu kliknij <span class="guibutton"><strong>Dodaj kategoriÄ™</strong></span> obok pozycji <span class="guibutton"><strong>Kategorie</strong></span>. Wybierz kategoriÄ™.</p>
+<p role="presentation">Aby usunąć kategorię ze spotkania, kliknij widoczną obok niej ikonę <span class="guibutton"><strong>Usuń kategorię</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.calendar.categories.view">
+<p class="title">Jak wyświetlić spotkania oznaczone określoną kategorią:</p>
+<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">W zależności od widoku dostępne są następujące możliwości: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Kliknij w widoku kalendarza spotkanie oznaczone kategoriÄ…. W wyskakujÄ…cym okienku kliknij kategoriÄ™.</p></li>
+<li class="listitem"><p role="presentation">W widoku listy wybierz spotkanie, które zostało oznaczone kategorią. Kliknij kategorię w widoku szczegółów.</p></li>
+</ul></p></li></ul></div>
+<div class="taskrelated">
+          <p>Wynik: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">W widoku listy pojawiÄ… siÄ™ wszystkie spotkania oznaczone tÄ… kategoriÄ….</p></li>
+<li class="listitem"><p role="presentation">Aby wyświetlić poprzedni widok, kliknij ikonę <span class="guibutton"><strong>Anuluj wyszukiwanie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> w polu wyszukiwania.</p></li>
+</ul>
+          <p>Wskazówka: kategorię można też znaleźć przy użyciu opcji wyszukiwania.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.calendar.manage.categories">
+        </p>
+<p class="title">PowiÄ…zane tematy:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">ZarzÄ…dzanie kategoriami</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Wyszukiwanie spotkań</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Używanie kategorii w odniesieniu do kontaktów</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Używanie kategorii w odniesieniu do zadań</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.calendar.manage.categories">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Zarządzanie spotkaniami</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.changeorganizer.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
index de18aa564..10891fd97 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
@@ -64,8 +64,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changeorganizer"></p>
 <p class="title">Interfejs użytkownika:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Kalendarz</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Widok listy w aplikacji <span class="phrase">Kalendarz</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.changereminder.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.changereminder.html
index 7a936e86b..13ad9856d 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.changereminder.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.changereminder.html
@@ -60,9 +60,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changereminder"></p>
 <p class="title">Interfejs użytkownika:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Kalendarz</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">Kalendarz</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Widok listy w aplikacji <span class="phrase">Kalendarz</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.changestatus.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.changestatus.html
index 834d1d9b1..9c9556a18 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.changestatus.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.changestatus.html
@@ -64,6 +64,7 @@
 <p class="title">Interfejs użytkownika:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Widok listy w aplikacji <span class="phrase">Kalendarz</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">Kalendarz</span></a></p>
 </li></ul>
 <p> </p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.colors.html
index 2ec0a86b4..dbab592c5 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.colors.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.colors.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="ZarzÄ…dzanie spotkaniami">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="ZarzÄ…dzanie ulubionymi strefami czasowymi">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="używanie kategorii w odniesieniu do spotkań">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.move.html" title="Przenoszenie spotkań do innego kalendarza">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.move.html">Dalej</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie spotkaniami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.colors">
 <div class="titlepage"><div><div><h3 class="title">Używanie kolorów kalendarza</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">Możesz zdefiniować kolor kalendarza. Domyślnie wszystkie spotkania z tego kalendarza będą wyświetlane w kolorze kalendarza. Jeśli podczas tworzenia lub edycji spotkania zostanie mu przypisany specjalny kolor, będzie ono wyświetlane w przypisanym kolorze, a nie w kolorze kalendarza.</p>
+<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">Możesz zdefiniować kolor kalendarza. Domyślnie wszystkie spotkania z tego kalendarza będą wyświetlane w kolorze kalendarza. Jeśli podczas tworzenia lub edycji spotkania zostanie mu przypisany specjalny kolor, będzie ono wyświetlane w przypisanym kolorze, a nie w kolorze kalendarza.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.colors">
 <p class="title">Jak wybrać kolor kalendarza:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,19 +46,15 @@
 <li class="step"><p role="presentation">Wybierz kolor z listy rozwijanej z opcjami kolorów.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.colors">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.colors"></p>
+<p class="title">Interfejs użytkownika:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">Kalendarz</span></a></p></li></ul>
+<p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Jak są wyświetlane spotkania w widoku kalendarza? </a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">Kalendarz</span></a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">Kalendarz</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Jak są wyświetlane spotkania w widoku kalendarza? </a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.colors">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Zarządzanie spotkaniami</a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.delete.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.delete.html
index 441747653..eba73475a 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.delete.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie spotkaniami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Usuwanie spotkań</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Ostrzeżenie:</strong></span> usuniętych spotkań <span class="phrase"><strong>nie</strong></span> można przywrócić. W pewnych konfiguracjach spotkanie w kalendarzu prywatnym może edytować wyłącznie jego organizator.</p>
+<a class="indexterm" name="id-1.8.15.17.2"></a><a class="indexterm" name="id-1.8.15.17.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Ostrzeżenie:</strong></span> usuniętych spotkań <span class="phrase"><strong>nie</strong></span> można przywrócić. W pewnych konfiguracjach spotkanie w kalendarzu prywatnym może edytować wyłącznie jego organizator.</p>
 <p id="ox.appsuite.user.concept.calendar.manage.delete">Jeśli masz uprawnienia do usuwania elementów, możesz usuwać spotkania z kalendarza.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.delete">
 <p class="title">Jak usunąć spotkania:</p>
@@ -73,11 +73,14 @@
         </p>
 <p class="title">Interfejs użytkownika:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Kalendarz</span></a>
+            </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Kalendarz</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Widok listy w aplikacji <span class="phrase">Kalendarz</span></a>
             </p>
 </li></ul>
 <p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.export.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.export.html
index 93d1190b4..af2f25563 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.export.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie spotkaniami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Eksportowanie spotkań</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">Spotkania można eksportować w formacie iCal. Formatu tego można użyć np. do wymiany spotkań między aplikacjami kalendarza. Można wyeksportować zarówno wybrane spotkanie, jak i wszystkie spotkania zapisane w kalendarzu.</p>
+<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">Spotkania można eksportować w formacie iCal. Formatu tego można użyć np. do wymiany spotkań między aplikacjami kalendarza. Można wyeksportować zarówno wybrane spotkanie, jak i wszystkie spotkania zapisane w kalendarzu.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.manage.export.selected">
 <p class="title">Jak wyeksportować jedno spotkanie:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -65,14 +65,16 @@
 <p id="ox.appsuite.user.related.calendar.manage.export"></p>
 <p class="title">Interfejs użytkownika:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">Kalendarz</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Kalendarz</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Widok listy w aplikacji <span class="phrase">Kalendarz</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importowanie spotkań</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.8.15.14.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Pobieranie danych osobowych</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.8.15.15.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Pobieranie danych osobowych</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.manage.export">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Zarządzanie spotkaniami</a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.html
index 0f44c79f4..f504f530a 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.html
@@ -43,6 +43,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Zmiana przypomnień o spotkaniach</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Zmienianie organizatora</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">ZarzÄ…dzanie ulubionymi strefami czasowymi</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">używanie kategorii w odniesieniu do spotkań</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Używanie kolorów kalendarza</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Przenoszenie spotkań do innego kalendarza</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importowanie spotkań</a></p></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.import.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.import.html
index cd3d4c974..15f6f5114 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.import.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie spotkaniami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importowanie spotkań</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><a class="indexterm" name="id-1.8.15.13.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">Istnieje możliwość importowania spotkań z plików w formacie iCal.</p>
+<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">Istnieje możliwość importowania spotkań z plików w formacie iCal.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.import">
 <p class="title">Jak zaimportować spotkania z pliku iCal:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -55,22 +55,16 @@
           <p>Uwaga: wszyscy uczestnicy zaimportowanych spotkań zostaną usunięci. Zamiast tego dodamy Ciebie jako uczestnika.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.calendar.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.calendar.manage.import"></p>
+<p class="title">Interfejs użytkownika:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">Kalendarz</span></a></p></li></ul>
+<p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Eksportowanie spotkań</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Tworzenie spotkań</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importowanie kalendarzy z plików</a>
-            </p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Eksportowanie spotkań</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Tworzenie spotkań</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importowanie kalendarzy z plików</a></p>
 </li></ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.calendar.manage.import">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Zarządzanie spotkaniami</a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.move.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.move.html
index a5214c123..52c7d8191 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.move.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.move.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie spotkaniami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Przenoszenie spotkań do innego kalendarza</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">Istnieje możliwość przeniesienia pojedynczych spotkań do innego kalendarza. Nie jest to możliwe w przypadku cyklu spotkań.</p>
+<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">Istnieje możliwość przeniesienia pojedynczych spotkań do innego kalendarza. Nie jest to możliwe w przypadku cyklu spotkań.</p>
 <p>Warunek: musisz mieć odpowiednie uprawnienia do tworzenia obiektów w kalendarzu docelowym.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.move">
 <p class="title">Jak przenieść spotkania do innego kalendarza:</p>
@@ -57,8 +57,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.move"></p>
 <p class="title">Interfejs użytkownika:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Kalendarz</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Widok listy w aplikacji <span class="phrase">Kalendarz</span></a></p>
 </li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.print.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.print.html
index c0beecdf7..9b7d61dfd 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.print.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie spotkaniami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Drukowanie spotkań</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><a class="indexterm" name="id-1.8.15.15.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">W zakresie drukowania kalendarzy i spotkań możesz: </p>
+<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><a class="indexterm" name="id-1.8.15.16.4"></a><a class="indexterm" name="id-1.8.15.16.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">W zakresie drukowania kalendarzy i spotkań możesz: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">wydrukować arkusz kalendarza ze spotkaniami,</p></li>
 <li class="listitem"><p role="presentation">wydrukować dane spotkania,</p></li>
@@ -89,14 +89,20 @@
 <p class="title">Interfejs użytkownika:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">Menu Ustawienia aplikacji <span class="phrase">Kalendarz</span></a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">Menu Ustawienia aplikacji <span class="phrase">Kalendarz</span></a>
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">Kalendarz</span></a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Kalendarz</span></a>
             </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html">Widok listy w aplikacji <span class="phrase">Kalendarz</span></a>
+            </p>
 </li></ul>
 <p>
       </p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.timezones.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.timezones.html
index 83afc237a..c40808864 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.timezones.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.manage.timezones.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="ZarzÄ…dzanie spotkaniami">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Zmienianie organizatora">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Używanie kolorów kalendarza">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="używanie kategorii w odniesieniu do spotkań">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Dalej</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Dalej</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.search.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.search.html
index 57eae6ceb..b1d6cb5b8 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.search.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.search.html
@@ -89,7 +89,7 @@
             <a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Wyświetlanie spotkań w różnych widokach</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">ZarzÄ…dzanie kategoriami</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">używanie kategorii w odniesieniu do spotkań</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.settings.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.settings.html
index 98ee8212d..594bc69e7 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.settings.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.settings.html
@@ -103,7 +103,7 @@
 <p id="ox.appsuite.user.reference.calendar.settings.jitsi"></p>
 <h3 class="title">Spotkania Jitsi</h3>
 <p><a class="indexterm" name="id-1.8.22.9.2"></a>Za pomocą tych opcji zdefiniuj zachowanie występujące, gdy podczas tworzenia spotkań wybierzesz <span class="guibutton"><strong>Spotkanie Jitsi</strong></span> w menu rozwijanym <span class="guibutton"><strong>Konferencja</strong></span>. </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>Automatycznie skopiuj link do lokalizacji. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Określa, czy link umożliwiający udział w spotkaniu Jitsi ma zostać skopiowany do pola <span class="guibutton"><strong>Lokalizacja</strong></span>.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>Automatyczne kopiowanie linku do lokalizacji. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Określa, czy link umożliwiający udział w spotkaniu Jitsi ma zostać skopiowany do pola <span class="guibutton"><strong>Lokalizacja</strong></span>.</p></li></ul>
 <p> Zobacz <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Planowanie konferencji audio/wideo</a></p>
 </div>
 <div id="ox.appsuite.user.reference.calendar.settings.zoom" class="feat-zoom">
@@ -115,8 +115,8 @@
 <p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments"><b>Spotkania. </b></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.password"><b>Zawsze dodawaj losowe hasło do spotkania. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.1.1.2"></a>Określa, czy konferencja ma zostać zabezpieczona automatycznie utworzonym hasłem.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>Automatycznie skopiuj link do lokalizacji. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Określa, czy link umożliwiający udział w spotkaniu Zoom ma zostać skopiowany do pola <span class="guibutton"><strong>Lokalizacja</strong></span>.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>Kopiowanie do opisu informacju o telefonicznym uczestnictwie w spotkaniu. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Określa, czy link umożliwiający udział w spotkaniu Zoom ma zostać skopiowany do pola <span class="guibutton"><strong>Lokalizacja</strong></span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>Automatyczne kopiowanie linku do lokalizacji. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Określa, czy link umożliwiający udział w spotkaniu Zoom ma zostać skopiowany do pola <span class="guibutton"><strong>Lokalizacja</strong></span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>Skopiuj do opisu informacje o telefonicznym uczestnictwie w spotkaniu. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Określa, czy link umożliwiający udział w spotkaniu Zoom ma zostać skopiowany do pola <span class="guibutton"><strong>Lokalizacja</strong></span>.</p></li>
 </ul>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.dialinnumber"><b>Numery do telefonicznego uczestnictwa. </b>Jeśli masz przynajmniej konto Zoom Pro, masz dostęp do oferowanych przez Zoom numerów do telefonicznego uczestnictwa w każdym kraju. Aby zdefiniować kraje, które mają być wyświetlane w zaproszeniach na spotkania, kliknij <span class="guibutton"><strong>Otwórz profil Zoom</strong></span>.</p></li>
@@ -129,7 +129,7 @@
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>Pokaż kalendarz urodzin. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Określa, czy w widoku folderów ma być wyświetlany kalendarz urodzin.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>Pokazywanie przypomnień dotyczących spotkań z przeszłości. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Określa, czy mają być wyświetlane przypomnienia o spotkaniach z przeszłości.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>Pokaż przypomnienia dotyczące spotkań z przeszłości. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Określa, czy mają być wyświetlane przypomnienia o spotkaniach z przeszłości.</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.calendar.settings.advanced.emailchanges"><b>Automatycznie wprowadzaj zmiany w spotkaniach otrzymane e-mailem do kalendarza. </b><a class="indexterm" name="id-1.8.22.11.3.1.3.1.2"></a>Definiuje, w jakich przypadkach zaproszenia na spotkanie od zewnętrznych kontaktów będą automatycznie dodawane do kalendarza. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.appointments.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.appointments.html
index 0cb6f03da..1d930e5d8 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.appointments.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.appointments.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Wyświetlanie spotkań</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.appointments">
 <div class="titlepage"><div><div><h3 class="title">Jak są wyświetlane spotkania w widoku kalendarza? </h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.9.2"></a><a class="indexterm" name="id-1.8.8.9.3"></a><a class="indexterm" name="id-1.8.8.9.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">Poniższe właściwości spotkania określają sposób jego wyświetlania w widoku kalendarza: </p>
+<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><a class="indexterm" name="id-1.8.8.8.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">Poniższe właściwości spotkania określają sposób jego wyświetlania w widoku kalendarza: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">Kolor spotkania</p>
@@ -67,7 +67,7 @@
 <p role="presentation">Spotkanie, które zostało odrzucone, będzie wyświetlane na szaro. Temat zostanie poprzedzony ikoną <span class="guibutton"><strong>Odrzucone</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.declined"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span> oraz zostanie przekreślony.</p>
 <p role="presentation">W ustawieniach kalendarza można określić, czy spotkania odrzucone mają być w ogóle wyświetlane.</p>
 </li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.6.2.1.6"><p role="presentation">Spotkania, które zostały odrzucone przez wszystkich użytkowników, zostaną oznaczone ikoną <span class="guibutton"><strong>Odrzucone przez wszystkich</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>.</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.6.2.1.6"><p role="presentation">Spotkania, które zostały odrzucone przez wszystkich użytkowników, zostaną oznaczone ikoną <span class="guibutton"><strong>Odrzucone przez wszystkich</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>.</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.view.appointments.private"></p>
 <h4 class="title">Wyświetlanie spotkań prywatnych</h4>
@@ -94,7 +94,7 @@
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.secret"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span>spotkanie tajne</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.unconfirmed"><object type="image/svg+xml" data="../../images/question-circle.svg" height="15"></object></span>spotkanie niepotwierdzone</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.rejected"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>spotkanie odrzucone</p></li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>spotkanie odrzucone przez wszystkich pozostałych uczestników</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>spotkanie odrzucone przez wszystkich pozostałych uczestników</p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.view.appointments">
         </p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.html
index b67db8d03..e48369f17 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.html
@@ -43,14 +43,6 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.timezones.html">Wyświetlanie wielu stref czasowych</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Jak są wyświetlane spotkania w widoku kalendarza? </a></p></li>
 </ul>
-<p id="ox.appsuite.user.related.calendar.view">
-      </p>
-<p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">Kalendarz</span></a>
-          </p></li></ul>
-<p>
-    </p>
 <p id="ox.appsuite.user.parent.calendar.view">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i>
     <span class="phrase">Kalendarz</span>
     
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.timezones.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.timezones.html
index 15038ebf6..1d1f73934 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.timezones.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.timezones.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Wyświetlanie spotkań</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.timezones">
 <div class="titlepage"><div><div><h3 class="title">Wyświetlanie wielu stref czasowych</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">Oprócz domyślnej strefy czasowej można wyświetlić strefy oznaczone przez Ciebie jako ulubione. Natomiast domyślną strefę czasową można zmienić w sekcji ustawień podstawowych.</p>
+<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">Oprócz domyślnej strefy czasowej można wyświetlić strefy oznaczone przez Ciebie jako ulubione. Natomiast domyślną strefę czasową można zmienić w sekcji ustawień podstawowych.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.timezones">
 <p class="title">Jak wyświetlić wiele stref czasowych w widoku kalendarza:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.views.html b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.views.html
index 3c0a48af2..313c1636a 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.views.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.calendar.view.views.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Wyświetlanie spotkań</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.views">
 <div class="titlepage"><div><div><h3 class="title">Wyświetlanie spotkań w różnych widokach</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><a class="indexterm" name="id-1.8.8.7.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Dowiedz się, jak wyświetlać spotkania z wybranego kalendarza lub kilku kalendarzy w różnych widokach:</p>
+<a class="indexterm" name="id-1.8.8.6.2"></a><a class="indexterm" name="id-1.8.8.6.3"></a><a class="indexterm" name="id-1.8.8.6.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Dowiedz się, jak wyświetlać spotkania z wybranego kalendarza lub kilku kalendarzy w różnych widokach:</p>
 <div class="task" id="ox.appsuite.user.task.calendar.view.views">
 <p class="title">Jak wyświetlić spotkanie:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.create.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.create.html
index b5aafd36b..735f54522 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.create.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.create.html
@@ -50,8 +50,8 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">Obraz kontaktu, jeśli został przesłany. Kliknij obraz kontaktu, aby go edytować lub przesłać nowy obraz.</p>
-<p role="presentation">Nazwisko, imiÄ™</p>
-<p role="presentation">Jeśli wprowadzono: tytuł, informacje o firmie, miejsce zamieszkania</p>
+<p role="presentation">nazwisko, imiÄ™</p>
+<p role="presentation">jeśli wprowadzono: tytuł, informacje o firmie, miejsce zamieszkania</p>
 </li>
 <li class="listitem">
 <p role="presentation">Dane osobowe </p>
@@ -88,13 +88,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">Okno edycji</a></p></li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">Książka adresowa</span></a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Tworzenie nowego kontaktu</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Dodawanie kontaktów</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Edycja kontaktów i list dystrybucyjnych</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.create">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Składniki aplikacji <span class="phrase">Książka adresowa</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.detailview.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.detailview.html
index ee4da7029..2ede8bbdc 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.detailview.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.detailview.html
@@ -46,12 +46,12 @@
 <p class="title">Zawartość</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Obraz kontaktu, jeśli został przesłany</p>
-<p role="presentation">Nazwisko, imiÄ™</p>
-<p role="presentation">Jeśli wprowadzono: tytuł, informacje o firmie, miejsce zamieszkania</p>
+<p role="presentation">obraz kontaktu, jeśli został przesłany</p>
+<p role="presentation">nazwisko, imiÄ™</p>
+<p role="presentation">jeśli wprowadzono: tytuł, informacje o firmie, miejsce zamieszkania</p>
 </li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.7.11.4.1.3">
-<p role="presentation">Przypisane kategorie</p>
+<p role="presentation">przypisane kategorie</p>
 <p role="presentation">Kliknięcie kategorii powoduje wyszukanie kontaktów przypisanych do tej kategorii.</p>
 </li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.4"><p role="presentation">W niektórych konfiguracjach: aktualna dostępność kontaktu do rozmów</p></li>
@@ -84,7 +84,7 @@
 </li>
 <li class="listitem"><p role="presentation">Notatka</p></li>
 <li class="listitem"><p role="presentation">Maksymalnie 18 opcjonalnych pól użytkownika</p></li>
-<li class="listitem"><p role="presentation">załączniki</p></li>
+<li class="listitem"><p role="presentation">Załączniki</p></li>
 </ul>
 </li>
 </ul>
@@ -97,15 +97,11 @@
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">Widok listy w aplikacji <span class="phrase">Książka adresowa</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.create.html">Okno edycji kontaktu</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Wyświetlanie kontaktów z książki adresowej</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.attachments.html">Wyświetlanie lub zapisywanie załączników z kontaktami</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Łączenie się z kontaktami</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">ZarzÄ…dzanie kontaktami</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">ZarzÄ…dzanie kontaktami</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.detailview">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Składniki aplikacji <span class="phrase">Książka adresowa</span></a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.foldertree.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.foldertree.html
index 06247a6fb..b1a35d532 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.foldertree.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.foldertree.html
@@ -62,6 +62,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Wyświetlanie kontaktów z książki adresowej</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Dodawanie książek adresowych</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">ZarzÄ…dzanie kontaktami</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">ZarzÄ…dzanie danymi z folderami</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.list.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.list.html
index 96b9d294a..857836643 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.list.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.list.html
@@ -53,8 +53,8 @@
 <p role="presentation">W przypadku każdego kontaktu są wyświetlane następujące informacje: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Przesłany obraz</p></li>
-<li class="listitem"><p role="presentation">Nazwisko, imiÄ™</p></li>
-<li class="listitem"><p role="presentation">Dane służbowe, jeśli zostały wprowadzone</p></li>
+<li class="listitem"><p role="presentation">nazwisko, imiÄ™</p></li>
+<li class="listitem"><p role="presentation">dane służbowe, jeśli zostały wprowadzone</p></li>
 </ul>
 <p role="presentation">Nazwy zaczynające się od cyfry lub znaku specjalnego są wyświetlane na początku widoku listy pod pozycją <span class="guibutton"><strong>#</strong></span>. Nazwy zaczynające się od symbolu specjalnego są wyświetlane na końcu widoku listy pod pozycją <span class="guibutton"><strong>Ω</strong></span>.</p>
 </li>
@@ -66,11 +66,8 @@
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.settingsmenu.html">Menu Ustawienia aplikacji <span class="phrase">Książka adresowa</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">Książka adresowa</span></a></p>
-</li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Wyświetlanie kontaktów z książki adresowej</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">ZarzÄ…dzanie kontaktami</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.list">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Składniki aplikacji <span class="phrase">Książka adresowa</span></a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.new.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.new.html
index b81019e4c..374fd6951 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.new.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.new.html
@@ -42,7 +42,7 @@
 <a class="indexterm" name="id-1.9.7.6.2"></a><p id="ox.appsuite.user.concept.contacts.gui.new">Umożliwia utworzenie nowego kontaktu. Kliknięcie ikony <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> powoduje otwarcie menu z dodatkowymi funkcjami: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">nowa lista dystrybucyjna</p></li>
-<li class="listitem"><p role="presentation">Subskrybowanie udostępnionych albo innych książek adresowych</p></li>
+<li class="listitem"><p role="presentation">subskrybowanie udostępnionych albo innych książek adresowych</p></li>
 <li class="listitem"><p role="presentation">nowa wiadomość, nowe spotkanie, nowy kontakt</p></li>
 </ul>
 <p id="ox.appsuite.user.hint.contacts.gui.new">Uwaga: jeśli widok folderów jest zamknięty, przycisk będzie wyświetlany jako ikona. W takim przypadku ikona <span class="guibutton"><strong>Więcej działań</strong></span> nie jest dostępna. Aby wyświetlić widok folderów, kliknij ikonę <span class="guibutton"><strong>Otwórz widok folderów</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.open"><object type="image/svg+xml" data="../../images/layout-split.svg" height="15"></object></span> widoczną w lewym dolnym rogu.</p>
@@ -52,7 +52,7 @@
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Tworzenie nowego kontaktu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Dodawanie kontaktów</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">Tworzenie nowych list dystrybucyjnych</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Subskrybowanie zewnętrznych książek adresowych</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Subskrybowanie publicznych i udostępnionych książek adresowych</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.settingsmenu.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
index 81da05f5a..ebc88dce3 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
@@ -45,7 +45,7 @@
 <li class="listitem"><p role="presentation">Dostosowywanie wszystkich ustawień</p></li>
 <li class="listitem"><p role="presentation">Wybierz motyw interfejsu użytkownika</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Opcje listy</strong></span>. Umożliwia określenie, czy w widoku listy mają być wyświetlane obrazy kontaktów i/lub pola wyboru czy żaden z tych elementów.</p></li>
-<li class="listitem"><p role="presentation">Subskrybowanie udostępnionych albo innych książek adresowych</p></li>
+<li class="listitem"><p role="presentation">subskrybowanie udostępnionych albo innych książek adresowych</p></li>
 <li class="listitem"><p role="presentation">W niektórych konfiguracjach: <span class="guibutton"><strong>Podłącz urządzenie</strong></span>. Umożliwia uruchomienie kreatora do konfigurowania lokalnych aplikacji, za pomocą których możesz uzyskać dostęp do danych oprogramowania do pracy grupowej.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.contacts.gui.settingsmenu"></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.toolbar.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.toolbar.html
index 09ef43bf4..4fca05850 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.toolbar.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.gui.toolbar.html
@@ -64,13 +64,7 @@
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Edycja kontaktów i list dystrybucyjnych</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Wysyłanie wiadomości e-mail z poziomu książki adresowej</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Zapraszanie kontaktów na spotkanie</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Przenoszenie lub kopiowanie kontaktów</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Wysyłanie kontaktów jako wizytówki</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Eksportowanie kontaktów</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.print.html">Drukowanie kontaktów</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.delete.html">Usuwanie kontaktów</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">ZarzÄ…dzanie kontaktami</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.toolbar">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">Składniki aplikacji <span class="phrase">Książka adresowa</span></a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.categories.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.categories.html
new file mode 100644
index 000000000..9e94074cd
--- /dev/null
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="pl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Używanie kategorii w odniesieniu do kontaktów</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="podręcznik użytkownika">
+<link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="ZarzÄ…dzanie kontaktami">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Zapraszanie kontaktów na spotkanie">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Przenoszenie lub kopiowanie kontaktów">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Wróć</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Dalej</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Książka adresowa</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">ZarzÄ…dzanie kontaktami</h2>
+<div class="sect2" id="ox.appsuite.user.sect.contacts.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Używanie kategorii w odniesieniu do kontaktów</h3></div></div></div>
+<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><p id="ox.appsuite.user.concept.contacts.manage.categories">Za pomocą kategorii można porządkować kontakty bez korzystania z folderów. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Można oznaczać kontakty kategoriami.</p></li>
+<li class="listitem"><p role="presentation">Można wyświetlać wszystkie kontakty oznaczone określoną kategorią.</p></li>
+</ul>
+<p> Można tworzyć, edytować lub usuwać własne kategorie — zobacz sekcję <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Zarządzanie kategoriami</a>.</p>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories">
+<p class="title">Jak oznaczyć kontakty kategorią:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Wybierz kontakt. Kliknij na pasku narzędzi ikonę <span class="guibutton"><strong>Edytuj kontakt</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>.</p>
+<p role="presentation">Otworzy siÄ™ okno edycji kontaktu.</p>
+</li>
+<li class="step">
+<p role="presentation">W tym celu kliknij <span class="guibutton"><strong>Dodaj kategoriÄ™</strong></span> obok pozycji <span class="guibutton"><strong>Kategorie</strong></span>. Wybierz kategoriÄ™.</p>
+<p role="presentation">Aby usunąć kategorię z kontaktu, kliknij widoczną obok niej ikonę <span class="guibutton"><strong>Usuń kategorię</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories.view">
+<p class="title">Jak wyświetlić kontakty oznaczone określoną kategorią:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Wybierz kontakt oznaczony kategoriÄ….</p></li>
+<li class="step"><p role="presentation">Kliknij kategorię w widoku szczegółów.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Wynik: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">W widoku listy pojawiÄ… siÄ™ wszystkie kontakty oznaczone tÄ… kategoriÄ…. </p></li>
+<li class="listitem"><p role="presentation">Aby wyświetlić poprzednią listę, kliknij ikonę <span class="guibutton"><strong>Anuluj wyszukiwanie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> w polu wyszukiwania.</p></li>
+</ul>
+          <p>Wskazówka: kategorię można też znaleźć przy użyciu opcji wyszukiwania.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.contacts.manage.categories">
+        </p>
+<p class="title">PowiÄ…zane tematy:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">ZarzÄ…dzanie kategoriami</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Wyszukiwanie kontaktów</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">używanie kategorii w odniesieniu do spotkań</a>
+            </p>
+<p role="presentation" class="cap-tasks">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Używanie kategorii w odniesieniu do zadań</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.contacts.manage.categories">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Zarządzanie kontaktami</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.delete.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.delete.html
index 20162f6b0..a3799a854 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.delete.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie kontaktami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Usuwanie kontaktów</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Ostrzeżenie:</strong></span> usuniętych zadań i list dystrybucyjnych <span class="phrase"><strong>nie</strong></span> można przywrócić.</p>
+<a class="indexterm" name="id-1.9.17.15.2"></a><a class="indexterm" name="id-1.9.17.15.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Ostrzeżenie:</strong></span> usuniętych zadań i list dystrybucyjnych <span class="phrase"><strong>nie</strong></span> można przywrócić.</p>
 <p id="ox.appsuite.user.concept.contacts.manage.delete">Jeśli masz uprawnienia do usuwania elementów z tej książki adresowej, możesz usuwać z niej kontakty lub listy dystrybucyjne. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Nie można usunąć kontaktów z książki adresowej <span class="guibutton"><strong>Wszyscy użytkownicy</strong></span>.</p></li>
@@ -55,9 +55,14 @@
 <p id="ox.appsuite.user.related.contacts.manage.delete">
         </p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Książka adresowa</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">Widok listy w aplikacji <span class="phrase">Książka adresowa</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.delete">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Zarządzanie kontaktami</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.export.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.export.html
index acf68744e..b6b6ed390 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.export.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie kontaktami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Eksportowanie kontaktów</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">Kontakty i listy dystrybucyjne można eksportować w następujących formatach: </p>
+<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><a class="indexterm" name="id-1.9.17.13.4"></a><a class="indexterm" name="id-1.9.17.13.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">Kontakty i listy dystrybucyjne można eksportować w następujących formatach: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Wizytówka (vCard). Format ten można wykorzystać na przykład do wymiany kontaktów z innymi aplikacjami poczty e-mail.</p></li>
 <li class="listitem"><p role="presentation">CSV. Ten format może posłużyć do wyeksportowania kontaktów do arkuszy kalkulacyjnych.</p></li>
@@ -76,7 +76,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.export"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Książka adresowa</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">Książka adresowa</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Książka adresowa</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">Widok listy w aplikacji <span class="phrase">Książka adresowa</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -84,7 +88,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Wysyłanie kontaktów jako wizytówki</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importowanie kontaktów</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.9.17.12.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Pobieranie danych osobowych</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.9.17.13.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Pobieranie danych osobowych</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.export">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Zarządzanie kontaktami</a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.html
index 023318ffb..e760830c0 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem cap-webmail" id="id-1.9.17.4.1.1"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Wysyłanie wiadomości e-mail z poziomu książki adresowej</a></p></li>
 <li class="listitem cap-calendar" id="id-1.9.17.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Zapraszanie kontaktów na spotkanie</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Używanie kategorii w odniesieniu do kontaktów</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Przenoszenie lub kopiowanie kontaktów</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Wysyłanie kontaktów jako wizytówki</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importowanie kontaktów</a></p></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.import.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.import.html
index 3860518a2..86c3b8dd6 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.import.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie kontaktami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importowanie kontaktów</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><a class="indexterm" name="id-1.9.17.11.5"></a><a class="indexterm" name="id-1.9.17.11.6"></a><a class="indexterm" name="id-1.9.17.11.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">Kontakty i listy dystrybucyjne można importować z plików w następujących formatach: </p>
+<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><a class="indexterm" name="id-1.9.17.12.6"></a><a class="indexterm" name="id-1.9.17.12.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">Kontakty i listy dystrybucyjne można importować z plików w następujących formatach: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">Wizytówka (vCard). Uwagi: </p>
@@ -71,19 +71,15 @@
 <li class="step"><p role="presentation">Kliknij przycisk <span class="guibutton"><strong>Importuj</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.contacts.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.contacts.manage.import"></p>
+<p class="title">Interfejs użytkownika:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">Książka adresowa</span></a></p></li></ul>
+<p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Eksportowanie kontaktów</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Dodawanie kontaktów</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Eksportowanie kontaktów</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Dodawanie kontaktów</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.contacts.manage.import">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Zarządzanie kontaktami</a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.inviteappointment.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
index 004d9217c..0ec48be33 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="ZarzÄ…dzanie kontaktami">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.manage.sendmail.html" title="Wysyłanie wiadomości e-mail z poziomu książki adresowej">
-<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Przenoszenie lub kopiowanie kontaktów">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Używanie kategorii w odniesieniu do kontaktów">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Dalej</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Dalej</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -53,7 +53,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.inviteappointment"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Książka adresowa</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Książka adresowa</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">Widok listy w aplikacji <span class="phrase">Książka adresowa</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">Książka adresowa</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Tworzenie nowych spotkań</a></p></li></ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.movecopy.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.movecopy.html
index 047d93b84..95806e3aa 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.movecopy.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.movecopy.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="ZarzÄ…dzanie kontaktami">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Zapraszanie kontaktów na spotkanie">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Używanie kategorii w odniesieniu do kontaktów">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html" title="Wysyłanie kontaktów jako wizytówki">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Dalej</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie kontaktami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.movecopy">
 <div class="titlepage"><div><div><h3 class="title">Przenoszenie lub kopiowanie kontaktów</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><a class="indexterm" name="id-1.9.17.9.4"></a><a class="indexterm" name="id-1.9.17.9.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">Kontakty i listy dystrybucyjne można przenieść lub skopiować do innej książki adresowej.</p>
+<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><a class="indexterm" name="id-1.9.17.10.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">Kontakty i listy dystrybucyjne można przenieść lub skopiować do innej książki adresowej.</p>
 <p id="ox.appsuite.user.hints.contacts.manage.movecopy">Uwagi: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Kontaktów i list dystrybucyjnych nie można przenieść ani skopiować do książki adresowej <span class="guibutton"><strong>Wszyscy użytkownicy</strong></span>.</p></li>
@@ -61,7 +61,10 @@
 <p id="ox.appsuite.user.tip.contacts.manage.movecopy">Wskazówka: wybrane obiekty można też przenieść przez przeciągnięcie ich do książki adresowej z widoku folderów.</p>
 <p id="ox.appsuite.user.related.contacts.manage.movecopy"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Książka adresowa</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Książka adresowa</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">Widok listy w aplikacji <span class="phrase">Książka adresowa</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.personal.html">Dodawanie osobistych książek adresowych</a></p></li></ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.print.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.print.html
index cd4778ec5..113b8aa30 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.print.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie kontaktami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Drukowanie kontaktów</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">Możesz wydrukować dane wybranych kontaktów, dobierając odpowiedni układ wydruku.</p>
+<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">Możesz wydrukować dane wybranych kontaktów, dobierając odpowiedni układ wydruku.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.print.list">
 <p class="title">Jak wydrukować dane kontaktu:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,9 +54,17 @@
 <p id="ox.appsuite.user.related.contacts.manage.print">
         </p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">Książka adresowa</span></a>
+            </p>
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Książka adresowa</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">Widok listy w aplikacji <span class="phrase">Książka adresowa</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.contacts.manage.print">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Zarządzanie kontaktami</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.sendmail.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.sendmail.html
index 253b5dd24..d7eac0574 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.sendmail.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.sendmail.html
@@ -53,10 +53,14 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendmail"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Książka adresowa</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Książka adresowa</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">Widok listy w aplikacji <span class="phrase">Książka adresowa</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">Książka adresowa</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p></li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendmail">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Zarządzanie kontaktami</a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.sendvcard.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.sendvcard.html
index baa20c2b4..9bbf1590f 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.sendvcard.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.manage.sendvcard.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie kontaktami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.sendvcard">
 <div class="titlepage"><div><div><h3 class="title">Wysyłanie kontaktów jako wizytówki</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">Istnieje możliwość wysłania kontaktów lub list dystrybucyjnych w formie wizytówek dołączonych jako załączniki do wiadomości e-mail.</p>
+<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">Istnieje możliwość wysłania kontaktów lub list dystrybucyjnych w formie wizytówek dołączonych jako załączniki do wiadomości e-mail.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.sendvcard">
 <p class="title">Jak wysłać kontakt jako dołączoną wizytówkę:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,12 +49,15 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendvcard"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Książka adresowa</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Książka adresowa</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html">Widok listy w aplikacji <span class="phrase">Książka adresowa</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Eksportowanie kontaktów</a></p></li>
-<li class="listitem cap-webmail" id="id-1.9.17.10.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p></li>
+<li class="listitem cap-webmail" id="id-1.9.17.11.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendvcard">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Zarządzanie kontaktami</a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.search.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.search.html
index 835f90fcd..df750f268 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.search.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Wyświetlanie kontaktów z książki adresowej</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">ZarzÄ…dzanie kategoriami</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Używanie kategorii w odniesieniu do kontaktów</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.useaddressbook.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.useaddressbook.html
index 284412971..cb3261790 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.useaddressbook.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.useaddressbook.html
@@ -70,7 +70,7 @@
 <p> </p>
 <p class="title">Działania nadrzędne:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Dodawanie uczestników lub zasobów</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Korzystanie z widoku planowania</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Tworzenie zasobów zarządzanych</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.useaddressdirectory.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.useaddressdirectory.html
index e10fcfd05..a6458798d 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.useaddressdirectory.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.useaddressdirectory.html
@@ -77,7 +77,7 @@
 <p id="ox.appsuite.user.related.contacts.useaddressdirectory"></p>
 <p class="title">Działania nadrzędne:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Dodawanie uczestników lub zasobów</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Korzystanie z widoku planowania</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Tworzenie zasobów zarządzanych</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.view.haloview.html b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.view.haloview.html
index 6f78c7372..14276b9b9 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.view.haloview.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.contacts.view.haloview.html
@@ -49,8 +49,8 @@
 </ul></p>
 <p role="presentation">W zależności od wpisów kontaktów w książce adresowej dane te pojawią się w wyskakującym okienku: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Przesłany obraz</p></li>
-<li class="listitem"><p role="presentation">Nazwisko, imiÄ™</p></li>
-<li class="listitem"><p role="presentation">Dane służbowe, jeśli zostały wprowadzone</p></li>
+<li class="listitem"><p role="presentation">nazwisko, imiÄ™</p></li>
+<li class="listitem"><p role="presentation">dane służbowe, jeśli zostały wprowadzone</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.4"><p role="presentation">W niektórych konfiguracjach: aktualna dostępność kontaktu do rozmów</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">W niektórych konfiguracjach: ikony do komunikacji z kontaktem: <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>E-mail</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>. Umożliwia otwarcie okna pisania wiadomości e-mail.</p></li>
@@ -62,7 +62,7 @@
 <li class="listitem"><p role="presentation">Adresy e-mail. Kliknięcie adresu e-mail wyświetli stronę umożliwiającą wysłanie nowej wiadomości e-mail.</p></li>
 <li class="listitem"><p role="presentation">Służbowe i prywatne numery telefonu. Kliknięcie numeru powoduje otwarcie funkcji nawiązania połączenia, jeśli jest dostępna.</p></li>
 <li class="listitem"><p role="presentation">Służbowe i prywatne adresy. W ustawieniach książki adresowej możesz zdefiniować, czy w przypadku kliknięcia adresu ma on zostać pokazany na mapie.</p></li>
-<li class="listitem"><p role="presentation">załączniki</p></li>
+<li class="listitem"><p role="presentation">Załączniki</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">Książka adresowa, w której zapisano kontakt</p></li>
 <li class="listitem"><p role="presentation">Twoje ostatnie rozmowy z tym kontaktem. Po kliknięciu wiadomości e-mail jej zawartość pojawi się w wyskakującym okienku.</p></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.dataorganisation.categories.html b/help/l10n/pl_PL/ox.appsuite.user.sect.dataorganisation.categories.html
index e1c513dad..153b0c83d 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.dataorganisation.categories.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.dataorganisation.categories.html
@@ -32,15 +32,15 @@
   <h1 class="sr-only">Porządkowanie danych i udostępnianie</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.categories">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">ZarzÄ…dzanie kategoriami</h2></div></div></div>
-<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Dowiedz się, jak należy zarządzać <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">kategoriami</a>, które umożliwiają klasyfikowanie spotkań, kontaktów i zadań. Kategorie mają następujące właściwości: </p>
+<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Dowiedz się, jak należy zarządzać <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">kategoriami</a>, które umożliwiają porządkowanie wiadomości e-mail, spotkań, kontaktów i zadań w różnych aplikacjach niezależnie od struktury folderów. Możesz na przykład użyć własnej kategorii na potrzeby konkretnego projektu lub klienta. Kategorie mają następujące właściwości: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Kategoria składa się z nazwy i koloru.</p></li>
 <li class="listitem"><p role="presentation">Obiekty można wyszukiwać przez wpisanie kategorii w polu wyszukiwania.</p></li>
-<li class="listitem"><p role="presentation">W niektórych konfiguracjach są dostępne predefiniowane kategorie. Takich kategorii nie można edytować ani usuwać.</p></li>
+<li class="listitem"><p role="presentation">W niektórych konfiguracjach są już skonfigurowane niektóre kategorie. Takich kategorii nie można edytować ani usuwać.</p></li>
 <li class="listitem"><p role="presentation">Można tworzyć, edytować i usuwać własne kategorie.</p></li>
-<li class="listitem"><p role="presentation">Można przypisywać kategorie do spotkań, kontaktów i zadań, a następnie je usuwać.</p></li>
+<li class="listitem"><p role="presentation">Można przypisywać pojedyncze kategorie lub większą ich liczbę do wiadomości e-mail, spotkań, kontaktów i zadań, a potem je usuwać.</p></li>
 </ul>
-<p> Uwaga: tych kategorii nie można używać w odniesieniu do wiadomości e-mail. Do klasyfikowania wiadomości e-mail służą kategorie skrzynki odbiorczej — zob. <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Praca z kategoriami skrzynki odbiorczej</a>.</p>
+<p> Uwaga: w przypadku wiadomości e-mail można też używać kart skrzynki odbiorczej. Do wiadomości e-mail może zostać przypisana kategoria skrzynki odbiorczej. Kategoria zależy od nadawcy — zobacz sekcję <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Praca z kategoriami skrzynki odbiorczej</a>.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.categories">Dostępne są następujące możliwości: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Utworzenie własnej kategorii</p></li>
@@ -51,9 +51,15 @@
 <p class="title">Jak zarządzać kategoriami:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step help-hide-inline">
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> z prawej strony paska menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>. Pojawi siÄ™ okno <span class="guilabel"><strong>Ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="guibutton"><strong>Podstawowe</strong></span> w lewym okienku. Kliknij opcjÄ™ <span class="guibutton"><strong>ZarzÄ…dzaj kategoriami</strong></span> widocznÄ… w obszarze <span class="guibutton"><strong>Ustawienia zaawansowane</strong></span>.</p>
+<p role="presentation">Możesz też użyć jednej z następujących metod: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Wybierz wiadomość e-mail. Kliknij ikonę <span class="guibutton"><strong>Dodaj kategorię</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> dostępną na pasku narzędzi. Zaznacz opcję <span class="guibutton"><strong>Zarządzaj kategoriami</strong></span>.</p></li>
+<li class="listitem">
 <p role="presentation">Otwórz okno edycji spotkania, kontaktu lub zadania przez utworzenie lub edycję spotkania, kontaktu bądź zadania.</p>
 <p role="presentation">W tym celu kliknij <span class="guibutton"><strong>Dodaj kategoriÄ™</strong></span> obok pozycji <span class="guibutton"><strong>Kategorie</strong></span>. Wybierz <span class="guibutton"><strong>ZarzÄ…dzaj kategoriami</strong></span>.</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Możesz też użyć przycisku <span class="guibutton"><strong>Zarządzaj kategoriami</strong></span> w ustawieniach ogólnych dostępnych poniżej napisu <span class="guibutton"><strong>Ustawienia zaawansowane</strong></span>.</p></li></ul>
+</li>
+</ul></p>
 <p role="presentation">Pojawi siÄ™ okno <span class="guilabel"><strong>ZarzÄ…dzaj kategoriami</strong></span>.</p>
 </li>
 <li class="step">
@@ -69,41 +75,22 @@
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Tworzenie nowych spotkań</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Tworzenie nowego kontaktu</a>
+<p role="presentation" class="cap-webmail">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail</a>
           </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Tworzenie nowego zadania</a>
-          </p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Edycja spotkań</a>
+            <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">używanie kategorii w odniesieniu do spotkań</a>
           </p>
 <p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Edycja kontaktów i list dystrybucyjnych</a>
+            <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Używanie kategorii w odniesieniu do kontaktów</a>
           </p>
 <p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Edycja zadań</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Używanie kategorii w odniesieniu do zadań</a>
           </p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Dostosowywanie ustawień ogólnych</a>
           </p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar">
-            <a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Wyszukiwanie spotkań</a>
-          </p>
-<p role="presentation" class="cap-contacts">
-            <a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Wyszukiwanie kontaktów</a>
-          </p>
-<p role="presentation" class="cap-tasks">
-            <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Wyszukiwanie zadań</a>
-          </p>
-</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.dataorganisation.sharing.share.html b/help/l10n/pl_PL/ox.appsuite.user.sect.dataorganisation.sharing.share.html
index 3ff4aff35..ab1aacb12 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.dataorganisation.sharing.share.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.dataorganisation.sharing.share.html
@@ -48,7 +48,7 @@
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">kalendarz </p>
+<p role="presentation">Kalendarz </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Foldery z obszaru <span class="guibutton"><strong>Moje kalendarze</strong></span> można udostępniać użytkownikom wewnętrznym z uprawnieniami do odczytu lub edycji.</p></li>
 <li class="listitem"><p role="presentation">Folderu <span class="guibutton"><strong>Moje kalendarze</strong></span> nie można udostępniać.</p></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.content.html b/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.content.html
index b96c34184..ac5757cb0 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.content.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.content.html
@@ -76,6 +76,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Wyświetlanie zawartości folderu aplikacji <span class="phrase">Pliki</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Wyświetlanie zawartości pliku</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Porządkowanie plików i folderów aplikacji <span class="phrase">Pliki</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">ZarzÄ…dzanie danymi z folderami</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Udostępnianie danych</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.foldertree.html b/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.foldertree.html
index e96a4e47e..9dc9bb157 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.foldertree.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.foldertree.html
@@ -73,6 +73,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">Pliki</span>: tworzenie folderów</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">Subskrybowanie publicznych i udostępnionych folderów aplikacji <span class="phrase">Pliki</span></a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Porządkowanie plików i folderów aplikacji <span class="phrase">Pliki</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">ZarzÄ…dzanie danymi z folderami</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Udostępnianie danych</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.toolbar.html b/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.toolbar.html
index aad44ae9c..7924a718b 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.toolbar.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.toolbar.html
@@ -76,20 +76,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Wyświetlanie zawartości folderu aplikacji <span class="phrase">Pliki</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Wyświetlanie zawartości pliku</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.send.html">Wysyłanie plików jako załączników wiadomości e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Edycja nazw plików</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Tworzenie lub edytowanie opisów</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.move.html">Przenoszenie plików lub folderów aplikacji <span class="phrase">Pliki</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.copy.html">Kopiowanie plików</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Zapisywanie plików w formacie PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Drukowanie plików w formacie PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.addportal.html">Dodawanie plików do portalu</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.favorite.html">Dodawanie plików lub folderów aplikacji <span class="phrase">Pliki</span> do ulubionych</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.delete.html">Usuwanie plików lub folderów aplikacji <span class="phrase">Pliki</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.lock.html">Blokowanie lub odblokowywanie plików</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Praca z wersjami</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Porządkowanie plików i folderów aplikacji <span class="phrase">Pliki</span></a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Szyfrowanie lub odszyfrowywanie plików</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.toolbar">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.drive.gui.html">Składniki aplikacji <span class="phrase">Pliki</span></a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.viewer.html b/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.viewer.html
index 3e1748804..102dc0dd6 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.viewer.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.drive.gui.viewer.html
@@ -106,23 +106,9 @@
               <a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">Przedstawianie prezentacji</a>
             </p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Edycja nazw plików</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Tworzenie lub edytowanie opisów</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Zapisywanie plików w formacie PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Drukowanie plików w formacie PDF</a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Praca z wersjami</a>
-            </p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Porządkowanie plików i folderów aplikacji <span class="phrase">Pliki</span></a>
+            </p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-share_links cap-share_mail_attachments">
               <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Udostępnianie danych</a>
             </p></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.drive.settings.html b/help/l10n/pl_PL/ox.appsuite.user.sect.drive.settings.html
index 3f89bec4e..aea27bb3b 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.drive.settings.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.drive.settings.html
@@ -51,13 +51,13 @@
 </div>
 <p id="ox.appsuite.user.reference.drive.settings">W pewnych konfiguracjach dostępne są następujące ustawienia:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">Dodawanie plików</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">Dodaj pliki</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.versionhistory">Historia wersji</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.advanced">Ustawienia zaawansowane</a></p></li>
 </ul>
 <p>Zobacz też: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Wyszukiwanie ustawień</a></p>
 <p id="ox.appsuite.user.reference.drive.settings.adddrive"></p>
-<h3 class="title">Dodawanie plików</h3>
+<h3 class="title">Dodaj pliki</h3>
 <p><a class="indexterm" name="id-1.11.17.6.2"></a>Umożliwia określenie, czy ma zostać utworzony nowy plik, czy nowa wersja ewentualnie już istniejącego pliku o takiej samej nazwie. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><b>Dodaj nową wersję. </b>Zostanie utworzona nowa wersja istniejącego już pliku.</p></li>
@@ -76,7 +76,7 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.advanced.playdiashow"><b>Pokaz slajdów z obrazów. </b><a class="indexterm" name="id-1.11.17.8.2.1.1.1.2"></a>Umożliwia określenie, jak mają być pokazywane zdjęcia wyświetlane w przeglądarce</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.advanced.playdiashow"><b>Pokaz slajdów w przypadku obrazów. </b><a class="indexterm" name="id-1.11.17.8.2.1.1.1.2"></a>Umożliwia określenie, jak mają być pokazywane zdjęcia wyświetlane w przeglądarce</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.advanced.showhiddenobjects"><b>Pokazywanie ukrytych plików i folderów. </b><a class="indexterm" name="id-1.11.17.8.2.1.2.1.2"></a>Umożliwia określenie, czy mają być wyświetlane ukryte pliki i foldery. Nazwy ukrytych plików i folderów są poprzedzone kropką. Lokalne aplikacje <span class="phrase">Pliki</span> potrzebują takich plików i folderów do własnych celów. Aby lokalne aplikacje <span class="phrase">Pliki</span> działały bez zakłóceń, nie wolno zmieniać ani usuwać ukrytych plików i folderów.</p></li>
 </ul>
 <p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.create.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.create.html
index 1e2f2876d..06c17818e 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.create.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.create.html
@@ -42,7 +42,7 @@
 <a class="indexterm" name="id-1.7.8.13.2"></a><p id="ox.appsuite.user.concept.email.gui.create">To okno umożliwia utworzenie lub edycję wiadomości e-mail.</p>
 <p role="presentation" class="help-hide-inline">Aby je otworzyć, wykonaj jedną z następujących czynności: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Kliknij opcję <span class="guibutton"><strong>Nowa wiadomość</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Wybierz wiadomość e-mail. Kliknij ikonę <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.reply"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> w widoku szczegółów. Wybierz funkcję odpowiedzi lub przekazania dalej.</p></li>
+<li class="listitem"><p role="presentation">Wybierz wiadomość e-mail. Kliknij ikonę <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.reply"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> w widoku szczegółów. Wybierz funkcję odpowiedzi lub przesłania dalej.</p></li>
 <li class="listitem"><p role="presentation">Wybierz wersję roboczą wiadomości e-mail. Kliknij ikonę <span class="guibutton"><strong>Edytuj wersję roboczą</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.draft.original"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> lub ikonę <span class="guibutton"><strong>Edytuj kopię</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.draft.copy"><object type="image/svg+xml" data="../../images/files.svg" height="15"></object></span> widoczną na pasku narzędzi.</p></li>
 </ul></p>
 <p id="ox.appsuite.user.reference.email.gui.create">
@@ -62,7 +62,7 @@
 </li>
 <li class="listitem"><p role="presentation">Przycisk <span class="guibutton"><strong>DW</strong></span>, <span class="guibutton"><strong>UDW</strong></span>. Powoduje otwarcie pola wejściowego <span class="guibutton"><strong>DW</strong></span> lub <span class="guibutton"><strong>UDW</strong></span>.</p></li>
 <li class="listitem">
-<p role="presentation">Przycisk <span class="guibutton"><strong>ODP</strong></span>. Powoduje otwarcie pola wejściowego <span class="guibutton"><strong>Odpowiedz do</strong></span>.</p>
+<p role="presentation">Przycisk <span class="guibutton"><strong>Odp</strong></span>. Umożliwia otwarcie pola <span class="guibutton"><strong>Odpowiedz do</strong></span>.</p>
 <p role="presentation">Odpowiedź na Twoją wiadomość zostanie wysłana na adresy e-mail wprowadzone w tym polu.</p>
 </li>
 <li class="listitem">
@@ -83,6 +83,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Wyślij</strong></span>. Wysyła wiadomość e-mail do wpisanych adresatów.</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.13.5.1.5"><p role="presentation"><span class="guibutton"><strong>Wyślij później</strong></span>. Powoduje otwarcie menu umożliwiającego wybranie czasu wysłania wiadomości e-mail.</p></li>
 <li class="listitem">
 <p role="presentation">Pasek przycisków </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -116,17 +117,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">Okno edycji</a></p></li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Odpowiadanie na wiadomości e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Przesyłanie wiadomości e-mail dalej</a></p>
-<p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Korzystanie z funkcji AI podczas tworzenia wiadomości e-mail</a></p>
-<p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Wysyłanie lub odbieranie wiadomości e-mail jako zastępca</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Wysyłanie wiadomości e-mail</a></p>
 <p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Wysyłanie zaszyfrowanych wiadomości e-mail</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.email.gui.create">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Składniki aplikacji <span class="phrase">E-mail</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.detailview.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.detailview.html
index 9f7e66cf8..d12f1fce1 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.detailview.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.detailview.html
@@ -63,11 +63,12 @@
 <li class="listitem">
 <p role="presentation">W niektórych konfiguracjach dostępne są następujące funkcje: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Ikona <span class="guibutton"><strong>Ustaw kategorię</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Umożliwia otwarcie menu z funkcjami służącymi do przypisywania kategorii lub zarządzania nimi.</p></li>
 <li class="listitem"><p role="presentation">Ikona <span class="guibutton"><strong>Ustaw kolor</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Umożliwia otwarcie menu pozwalającego na przypisywanie kolorowych etykiet do wiadomości e-mail.</p></li>
 <li class="listitem"><p role="presentation">Ikona <span class="guibutton"><strong>Oflaguj</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Umożliwia oflagowanie wiadomości e-mail.</p></li>
 </ul>
 </li>
-<li class="listitem"><p role="presentation">Ikona <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Umożliwia otwarcie menu z dodatkowymi funkcjami do odpowiadania na wiadomości e-mail oraz przekazywania ich dalej i porządkowania.</p></li>
+<li class="listitem"><p role="presentation">Ikona <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Umożliwia otwarcie menu z dodatkowymi funkcjami do odpowiadania na wiadomości e-mail oraz przesyłania ich dalej i porządkowania.</p></li>
 <li class="listitem"><p role="presentation">Jeśli wiadomość e-mail zawiera obrazy zewnętrzne, w niektórych konfiguracjach pojawią się przyciski do wyświetlania obrazów zewnętrznych.</p></li>
 <li class="listitem">
 <p role="presentation">Jeśli wiadomość e-mail ma załączniki, zostaną wyświetlone dodatkowe elementy: </p>
@@ -80,6 +81,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation">W przypadku wybrania w folderze <span class="guibutton"><strong>Elementy wysłane</strong></span> wiadomości e-mail z załącznikiem w postaci linku u góry wiadomości pojawią się informacje o załączniku.</p></li>
+<li class="listitem"><p role="presentation">W niektórych konfiguracjach: przypisane kategorie będą wyświetlane, jeśli są dostępne.</p></li>
 <li class="listitem">
 <p role="presentation">Treść wiadomości e-mail.</p>
 <p role="presentation">Cytowany tekst zostanie odpowiednio oznaczony na początku każdego wiersza.</p>
@@ -95,15 +97,11 @@
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">E-mail</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">Okno edycji wiadomości e-mail</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Wyświetlanie wiadomości e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Odpowiadanie na wiadomości e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Wyświetlanie lub zapisywanie załączników wiadomości e-mail</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.detailview">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Składniki aplikacji <span class="phrase">E-mail</span></a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.foldertree.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.foldertree.html
index 90914435a..f42567b56 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.foldertree.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.foldertree.html
@@ -47,14 +47,16 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Skrzynka odbiorcza</strong></span>. Domyślnie do tego folderu są kierowane wszystkie przychodzące wiadomości e-mail.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Wersje robocze</strong></span>. Folder zawierający wiadomości e-mail zapisane jako wersje robocze.</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Wysłane</strong></span>. Folder zawierający wiadomości wysłane przez Ciebie.</p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Wysłane</strong></span>. Folder zawierający wysłane przez Ciebie wiadomości e-mail.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Kosz</strong></span>. Folder zawierający usunięte przez Ciebie wiadomości e-mail.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Archiwum</strong></span>. Zawiera zarchiwizowane wiadomości e-mail. Folder ten jest tworzony automatycznie podczas pierwszej archiwizacji wiadomości e-mail.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Moje foldery</strong></span>. Zawiera utworzone foldery poczty e-mail. Folder ten jest tworzony automatycznie podczas tworzenia pierwszego folderu poczty e-mail.</p></li>
 </ul>
 <p>W niektórych konfiguracjach oprogramowania oraz poczty e-mail mogą być dostępne jeszcze inne foldery. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">na nieprzeczytane wiadomości e-mail, na wiadomości oznaczone flagą</p></li>
+<li class="listitem"><p role="presentation">Folder na oflagowane wiadomości</p></li>
+<li class="listitem"><p role="presentation">Folder na nieprzeczytane wiadomości</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.7.5.2.3"><p role="presentation">Folder na wiadomości, które mają zostać wysłane później</p></li>
 <li class="listitem"><p role="presentation">Subskrybowane udostępnione i publiczne foldery poczty e-mail.</p></li>
 <li class="listitem"><p role="presentation">Foldery z funkcyjnych kont e-mail, które zostały Ci przypisane przez administratora.</p></li>
 </ul>
@@ -67,10 +69,10 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Wyświetlanie wiadomości e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Dodawanie folderów poczty e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Wyłączanie lub włączanie funkcyjnych kont e-mail</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Wyłączanie lub włączanie funkcyjnych kont e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">ZarzÄ…dzanie danymi z folderami</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Udostępnianie danych</a></p>
 </li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.html
index 711b5699f..23517afaf 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">Przycisk Nowa wiadomość</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">E-mail</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">Pasek kart skrzynki odbiorczej aplikacji <span class="phrase">E-mail</span></a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">Pasek kategorii skrzynki odbiorczej</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">E-mail</span></a></p></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.list.html
index 162eba748..b986d5423 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.list.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.list.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="Składniki aplikacji E-mail">
-<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="Pasek kart skrzynki odbiorczej aplikacji E-mail">
+<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="Pasek kategorii skrzynki odbiorczej">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.detailview.html" title="Widok szczegółów aplikacji E-mail">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -52,6 +52,7 @@
 <li class="listitem"><p role="presentation">Przy każdej wiadomości e-mail wyświetlane są następujące szczegółowe informacje: nadawca, temat, data odbioru. Nieprzeczytane wiadomości e-mail są oznaczone ikoną <span class="guibutton"><strong>Nieprzeczytane</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span>.</p></li>
 <li class="listitem"><p role="presentation">Etykietka przy nazwisku (nazwie) nadawcy zawiera jego adres e-mail.</p></li>
 <li class="listitem"><p role="presentation">Pokazywane są też jeszcze inne informacje, jeśli tylko są dostępne: ikony załączników, kolorowa etykieta lub flaga, liczba wiadomości e-mail w <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">konwersacji</a>, priorytet.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.10.5.1.7"><p role="presentation">Przypisane kategorie będą wyświetlane, jeśli są dostępne. W ustawieniach poczty e-mail można określić, czy przypisane kategorie mają być wyświetlane w widoku listy.</p></li>
 <li class="listitem"><p role="presentation">Zaszyfrowane wiadomości e-mail są oznaczone ikoną Zaszyfrowane <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.encrypted"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Jeśli zawiadomienie o urlopie jest włączone, nad widokiem listy będzie widoczne powiadomienie.</p>
@@ -69,12 +70,9 @@
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">Menu ustawień aplikacji <span class="phrase">E-mail</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Wyświetlanie wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.list">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Składniki aplikacji <span class="phrase">E-mail</span></a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.new.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.new.html
index 3a6ec469b..6c7f27a5f 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.new.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.new.html
@@ -52,7 +52,7 @@
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Wysyłanie wiadomości e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Dodawanie kont e-mail</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Wyświetlanie lub zapisywanie załączników wiadomości e-mail</a></p>
 </li></ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.popup.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.popup.html
index f77b7e075..b3566f69d 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.popup.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.popup.html
@@ -71,8 +71,7 @@
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p></li>
-<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Łączenie z nadawcą lub innym adresatem</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Łączenie z nadawcą lub innym adresatem</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Wyświetlanie kontaktów w widoku halo</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.popup">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Składniki aplikacji <span class="phrase">E-mail</span></a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.settingsmenu.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.settingsmenu.html
index ec0fb3953..b70e4da32 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.settingsmenu.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.settingsmenu.html
@@ -59,7 +59,6 @@
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Dodawanie kont e-mail</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Wyświetlanie lub zapisywanie załączników wiadomości e-mail</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.tabs.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.tabs.html
index bfaa5fe3f..18fae6495 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.tabs.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.tabs.html
@@ -1,7 +1,7 @@
 <html lang="pl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Pasek kart skrzynki odbiorczej aplikacji E-mail</title>
+<title>Pasek kategorii skrzynki odbiorczej</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
@@ -38,15 +38,14 @@
 <h2 class="sr-only">Składniki aplikacji <span class="phrase">E-mail</span>
 </h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.tabs">
-<div class="titlepage"><div><div><h3 class="title">Pasek kart skrzynki odbiorczej aplikacji <span class="phrase">E-mail</span>
-</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Pasek kategorii skrzynki odbiorczej</h3></div></div></div>
 <a class="indexterm" name="id-1.7.8.9.2"></a><p id="ox.appsuite.user.concept.email.gui.tabs">Pokazuje predefiniowane karty skrzynki odbiorczej na wiadomości e-mail w folderze <span class="guibutton"><strong>Skrzynka odbiorcza</strong></span>. Pozwala to na przypisywanie przychodzących wiadomości e-mail do niektórych kart z zastosowaniem sortowania według nadawców.</p>
 <p id="ox.appsuite.user.reference.email.gui.tabs">
         </p>
 <p class="title">Uwagi:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">W niektórych konfiguracjach karty skrzynki odbiorczej mogą być niedostępne.</p></li>
-<li class="listitem"><p role="presentation">Jeśli karty skrzynki odbiorczej są dostępne, możesz pokazać lub ukryć pasek kart. Aby to zrobić, kliknij ikonę <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widoczną na pasku menu. Kliknij <span class="guibutton"><strong>Kategorie skrzynki odbiorczej</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Jeśli są dostępne kategorie skrzynki odbiorczej, można wyświetlić lub ukryć pasek kategorii. W tym celu kliknij ikonę <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widoczną na pasku menu. Kliknij <span class="guibutton"><strong>Kategorie skrzynki odbiorczej</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">Liczba, nazwy i kolejność kart skrzynki odbiorczej są predefiniowane. W niektórych konfiguracjach serwera możliwa jest zmiana nazw niektórych kart skrzynki odbiorczej lub ich wyłączenie.</p></li>
 </ul>
 <p>
@@ -54,14 +53,9 @@
 <p id="ox.appsuite.user.related.email.gui.tabs">
         </p>
 <p class="title">PowiÄ…zane tematy:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Praca z kategoriami skrzynki odbiorczej</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a>
-            </p></li>
-</ul>
+            </p></li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.reference.email.gui.tabs.parent">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Składniki aplikacji <span class="phrase">E-mail</span></a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.toolbar.html
index 759f59c59..af3f0dad6 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.toolbar.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.gui.toolbar.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="Składniki aplikacji E-mail">
 <link rel="prev" href="ox.appsuite.user.sect.email.gui.foldertree.html" title="Widok folderów w aplikacji E-mail">
-<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="Pasek kart skrzynki odbiorczej aplikacji E-mail">
+<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="Pasek kategorii skrzynki odbiorczej">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -47,9 +47,10 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Ikona <span class="guibutton"><strong>Usuń</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.delete"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>. Umożliwia usunięcie wybranych wiadomości e-mail.</p></li>
 <li class="listitem"><p role="presentation">Ikona <span class="guibutton"><strong>Archiwum</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.archive"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span>. Umożliwia zarchiwizowanie wybranych wiadomości e-mail.</p></li>
-<li class="listitem"><p role="presentation">Ikony <span class="guibutton"><strong>odpowiadania</strong></span> na wybraną wiadomość e-mail i <span class="guibutton"><strong>przekazywania jej dalej</strong></span>: <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
+<li class="listitem"><p role="presentation">Ikony <span class="guibutton"><strong>odpowiadania</strong></span> na wybraną wiadomość e-mail i <span class="guibutton"><strong>przesyłania jej dalej</strong></span>: <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">W niektórych konfiguracjach: ikona <span class="guibutton"><strong>Integracja z AI</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>. Umożliwia otwarcie menu z funkcjami AI do edycji treści wiadomości e-mail.</p></li>
-<li class="listitem"><p role="presentation">Ikona <span class="guibutton"><strong>Ustaw kategorię</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Jej kliknięcie powoduje otwarcie menu umożliwiającego przeniesienie wiadomości e-mail do kategorii. Ikona ta jest dostępna tylko wtedy, gdy jest wyświetlany pasek kart skrzynki odbiorczej.</p></li>
+<li class="listitem"><p role="presentation">W niektórych konfiguracjach: ikona <span class="guibutton"><strong>Ustaw kategorię skrzynki odbiorczej</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.inboxcategories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Jej kliknięcie powoduje otwarcie menu umożliwiającego przeniesienie wiadomości e-mail do wybranej kategorii skrzynki odbiorczej. Ikona ta jest dostępna tylko wtedy, gdy jest wyświetlany pasek kart skrzynki odbiorczej.</p></li>
+<li class="listitem"><p role="presentation">W niektórych konfiguracjach: ikona <span class="guibutton"><strong>Ustaw kategorię</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Umożliwia otwarcie menu z funkcjami służącymi do przypisywania kategorii lub zarządzania nimi.</p></li>
 <li class="listitem"><p role="presentation">W niektórych konfiguracjach: ikona <span class="guibutton"><strong>Ustaw kolor</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Umożliwia otwarcie menu pozwalającego na przypisywanie kolorowych etykiet do wybranych wiadomości e-mail.</p></li>
 <li class="listitem"><p role="presentation">W niektórych konfiguracjach: ikona <span class="guibutton"><strong>Oflaguj</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Umożliwia oflagowanie wiadomości e-mail.</p></li>
 <li class="listitem"><p role="presentation">Ikona <span class="guibutton"><strong>Przenieś</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.moveto"><object type="image/svg+xml" data="../../images/folder-symlink.svg" height="15"></object></span>. Umożliwia przeniesienie wybranych wiadomości e-mail do innego folderu.</p></li>
@@ -63,25 +64,12 @@
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">Pasek kart skrzynki odbiorczej aplikacji <span class="phrase">E-mail</span></a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Odpowiadanie na wiadomości e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Przesyłanie wiadomości e-mail dalej</a></p>
 </li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Korzystanie z funkcji AI podczas odpowiadania na wiadomości e-mail</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Przenoszenie lub kopiowanie wiadomości e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Oznaczanie wiadomości e-mail jako przeczytanych lub nieprzeczytanych</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Kategoryzowanie wiadomości e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Wyświetlanie źródła wiadomości e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Korzystanie z wersji roboczych wiadomości e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Tworzenie przypomnień o wiadomościach e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Dodawanie wiadomości e-mail do portalu</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Zapisywanie wiadomości</a></p>
-<p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Eksportuj wiadomości e-mail w formacie PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Drukowanie wiadomości e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Usuwanie wiadomości e-mail</a></p>
-</li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Korzystanie z funkcji AI podczas odpowiadania na wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.toolbar">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.gui.html">Składniki aplikacji <span class="phrase">E-mail</span></a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.addportal.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.addportal.html
index 30a254aaa..56e2281f7 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.addportal.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.addportal.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.addportal">
 <div class="titlepage"><div><div><h3 class="title">Dodawanie wiadomości e-mail do portalu</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.15.2"></a><a class="indexterm" name="id-1.7.15.15.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">Istnieje możliwość dodania wiadomości e-mail do portalu jako widgetu.</p>
+<a class="indexterm" name="id-1.7.15.16.2"></a><a class="indexterm" name="id-1.7.15.16.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">Istnieje możliwość dodania wiadomości e-mail do portalu jako widgetu.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.addportal">
 <p class="title">Jak dodać wiadomość e-mail do portalu:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.addportal"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.add.html">Dodawanie widgetów portalu</a></p></li></ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.archive.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.archive.html
index 31ac8d6bd..fb73aa061 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.archive.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.archive.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.archive">
 <div class="titlepage"><div><div><h3 class="title">Archiwizacja wiadomości e-mail</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.20.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">W przypadku archiwizowania wiadomości e-mail są one przenoszone do folderu <span class="guibutton"><strong>Archiwum</strong></span>. W folderze <span class="guibutton"><strong>Archiwum</strong></span> znajdują oddzielne podfoldery na każdy rok kalendarzowy. Zarchiwizowane wiadomości e-mail są zapisywane w tych podfolderach zgodnie z datą odbioru. Folder <span class="guibutton"><strong>Archiwum</strong></span> jest tworzony od razu po pierwszym użyciu funkcji archiwizacji. Dostępne są następujące możliwości: </p>
+<a class="indexterm" name="id-1.7.15.21.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">W przypadku archiwizowania wiadomości e-mail są one przenoszone do folderu <span class="guibutton"><strong>Archiwum</strong></span>. W folderze <span class="guibutton"><strong>Archiwum</strong></span> znajdują oddzielne podfoldery na każdy rok kalendarzowy. Zarchiwizowane wiadomości e-mail są zapisywane w tych podfolderach zgodnie z datą odbioru. Folder <span class="guibutton"><strong>Archiwum</strong></span> jest tworzony od razu po pierwszym użyciu funkcji archiwizacji. Dostępne są następujące możliwości: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Archiwizowanie wiadomości z folderu poczty e-mail, które mają ponad 90 dni</p></li>
 <li class="listitem"><p role="presentation">Archiwizowanie pojedynczych wiadomości e-mail</p></li>
@@ -61,14 +61,16 @@
 </li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.archive">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.archive"></p>
+<p class="title">Interfejs użytkownika:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Drukowanie wiadomości e-mail</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Drukowanie wiadomości e-mail</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.archive">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.categories.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.categories.html
new file mode 100644
index 000000000..4eaa1314f
--- /dev/null
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.categories.html
@@ -0,0 +1,95 @@
+<html lang="pl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="podręcznik użytkownika">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Zarządzanie wiadomościami e-mail">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Gromadzenie adresów">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Kategoryzowanie wiadomości e-mail">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Wróć</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Dalej</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">E-mail</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.categories">Za pomocą kategorii można porządkować wiadomości e-mail bez korzystania z folderów. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Można oznaczać wiadomości e-mail kategoriami.</p></li>
+<li class="listitem"><p role="presentation">Można wyświetlać wszystkie wiadomości e-mail oznaczone określoną kategorią.</p></li>
+</ul>
+<p> Można tworzyć, edytować lub usuwać własne kategorie — zobacz sekcję <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Zarządzanie kategoriami</a>.</p>
+<p id="ox.appsuite.user.tip.email.manage.categories">Niezależnie od kategorii można korzystać z kategorii skrzynki odbiorczej. Za pomocą kategorii skrzynki odbiorczej można porządkować wiadomości e-mail powiązane z określonymi nadawcami — zobacz <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Praca z kategoriami skrzynki odbiorczej</a>.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.mark">
+<p class="title">Jak oznaczyć wiadomości e-mail kategorią:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Wybierz jedną lub kilka wiadomości e-mail.</p></li>
+<li class="step">
+<p role="presentation">Kliknij widoczną na pasku narzędzi ikonę <span class="guibutton"><strong>Ustaw kategorię</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.mark.add"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>. Wybierz kategorię.</p>
+<p role="presentation">Aby usunąć kategorię z poczty e-mail, kliknij tę kategorię.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.view">
+<p class="title">Jak wyświetlić wiadomości e-mail oznaczone określoną kategorią:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Zaznacz wiadomość e-mail oznaczoną daną kategorią.</p></li>
+<li class="step"><p role="presentation">Kliknij kategorię w widoku szczegółów.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Wynik: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">W widoku listy pojawią się wszystkie wiadomości e-mail oznaczone tą kategorią.</p></li>
+<li class="listitem"><p role="presentation">W przypadku każdej wiadomości e-mail zostanie wskazany folder, w którym się ona znajduje.</p></li>
+<li class="listitem"><p role="presentation">Aby wyświetlić poprzednią listę, kliknij ikonę <span class="guibutton"><strong>Anuluj wyszukiwanie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> w polu wyszukiwania.</p></li>
+</ul>
+          <p>Wskazówka: kategorię można też znaleźć przy użyciu opcji wyszukiwania.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.categories"></p>
+<p class="title">Interfejs użytkownika:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">PowiÄ…zane tematy:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">ZarzÄ…dzanie kategoriami</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">Wyszukiwanie wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">używanie kategorii w odniesieniu do spotkań</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Używanie kategorii w odniesieniu do kontaktów</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Używanie kategorii w odniesieniu do zadań</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.categories">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.collectaddress.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.collectaddress.html
index cff523077..c3b5eb46b 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.collectaddress.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.collectaddress.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Zarządzanie wiadomościami e-mail">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.mark.html" title="Oznaczanie wiadomości e-mail jako przeczytanych lub nieprzeczytanych">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Kategoryzowanie wiadomości e-mail">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.mark.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Dalej</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.categories.html">Dalej</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -40,7 +40,7 @@
 <div class="titlepage"><div><div><h3 class="title">Gromadzenie adresów</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.10.2"></a><a class="indexterm" name="id-1.7.15.10.3"></a><p id="ox.appsuite.user.concept.email.manage.collectaddress">Dostępne są następujące możliwości: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Automatyczne gromadzenie nowych adresów e-mail przy wysyłaniu lub czytaniu wiadomości e-mail dzięki uaktywnieniu tej funkcji w sekcji Ustawienia poczty e-mail.</p></li>
+<li class="listitem"><p role="presentation">Automatyczne gromadzenie nowych adresów e-mail przy wysyłaniu lub czytaniu wiadomości e-mail dzięki uaktywnieniu tej funkcji w sekcji zaawansowanych ustawień poczty e-mail.</p></li>
 <li class="listitem"><p role="presentation">Ręczne dodawanie adresów e-mail do książki adresowej.</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.collectaddress">
@@ -56,16 +56,10 @@
           <p>Uwaga: ta funkcja jest dostępna tylko w przypadku nowych kontaktów.</p>
         </div>
 </div>
-<p role="presentation" class="cap-contacts">
-        <p class="title">PowiÄ…zane tematy:</p><ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Tworzenie nowego kontaktu</a>
-            </p></li>
-</ul>
-      </p>
+<p role="presentation" class="cap-contacts"><p class="title">Interfejs użytkownika:</p><ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p></li></ul> <p class="title">Powiązane tematy:</p><ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Tworzenie nowego kontaktu</a></p></li>
+</ul></p>
 <p id="ox.appsuite.user.parent.email.manage.collectaddress">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.delete.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.delete.html
index b3558db8e..86c4e4728 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.delete.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.delete.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Zarządzanie wiadomościami e-mail">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.archive.html" title="Archiwizacja wiadomości e-mail">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Czyszczenie folderów poczty e-mail">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.recover.html" title="Odzyskiwanie wiadomości e-mail">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.archive.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Dalej</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.recover.html">Dalej</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -38,20 +38,20 @@
 <h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Usuwanie wiadomości e-mail</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.21.2"></a><a class="indexterm" name="id-1.7.15.21.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">Dostępne są następujące możliwości: </p>
+<a class="indexterm" name="id-1.7.15.22.2"></a><a class="indexterm" name="id-1.7.15.22.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">Dostępne są następujące możliwości: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Określ, czy usuwane wiadomości e-mail mają być przenoszone do kosza, czy trwale kasowane.</p>
-<p role="presentation">Wiadomości e-mail, które zostaną przeniesione do kosza, można odzyskać.</p>
+<p role="presentation">Możesz określić, czy usuwane wiadomości e-mail mają być przenoszone do kosza, czy usuwane trwale. </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Wiadomości e-mail, które zostaną przeniesione do kosza, można odzyskać.</p></li>
+<li class="listitem"><p role="presentation"><span class="cap-dumpster">Trwale usunięte wiadomości e-mail można odzyskać w ciągu 14 dni. Po upływie tego okresu: </span> Trwale usuniętych wiadomości <span class="phrase"><strong>nie</strong></span> można odzyskać.</p></li>
+</ul>
 </li>
-<li class="listitem"><p role="presentation">Usuń pojedyncze wiadomości e-mail lub całe konwersacje.</p></li>
-<li class="listitem"><p role="presentation">Usuń wszystkie e-maile z folderu poczty e-mail.</p></li>
-<li class="listitem"><p role="presentation">Odzyskaj wiadomości e-mail z kosza.</p></li>
-<li class="listitem"><p role="presentation">Trwale usuń wiadomości e-mail z kosza.</p></li>
-<li class="listitem"><p role="presentation">Trwale usuń wszystkie wiadomości e-mail z kosza, opróżniając go.</p></li>
+<li class="listitem"><p role="presentation">Można usuwać pojedyncze wiadomości e-mail lub całe konwersacje.</p></li>
+<li class="listitem"><p role="presentation">Można usuwać wszystkie wiadomości e-mail z folderu poczty e-mail.</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.delete.setting">
-<p class="title">Jak określić, czy usuwane wiadomości e-mail mają być przenoszone do kosza, czy trwale kasowane.</p>
+<p class="title">Jak określić, czy usuwane wiadomości e-mail mają być przenoszone do kosza, czy usuwane trwale.</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.setting"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
@@ -65,21 +65,21 @@
 <li class="listitem"><p role="presentation">Jeśli wiadomości e-maile mają zostać przeniesione do kosza, wyłącz opcję <span class="guibutton"><strong>Trwale usuwaj kasowane wiadomości e-mail</strong></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Jeśli wiadomości e-maile mają zostać trwale usunięte, włącz opcję <span class="guibutton"><strong>Trwale usuwaj kasowane wiadomości e-mail</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Ostrzeżenie:</strong></span> wiadomości, które zostały trwale usunięte, <span class="phrase"><strong>nie</strong></span> można odzyskać.</p>
+<p role="presentation"><span class="phrase"><strong>Ostrzeżenie:</strong></span> w niektórych konfiguracjach trwale usuniętych wiadomości <span class="phrase"><strong>nie</strong></span> można odzyskać.</p>
 </li>
 </ul></p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.delete">
-<p class="title">Jak usunąć wiadomość e-mail:</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.single">
+<p class="title">Jak usunąć wybraną wiadomość e-mail:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Wybierz jedną lub kilka wiadomości e-mail.</p></li>
 <li class="step">
-<p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Usuń</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> widoczną na pasku narzędzi.</p>
+<p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Usuń</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> widoczną na pasku narzędzi.</p>
 <p role="presentation">Lub: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Naciśnij klawisz [Del] lub [Backspace] na klawiaturze.</p></li>
 <li class="listitem"><p role="presentation">W menu kontekstowym wiadomości e-mail kliknij <span class="guibutton"><strong>Usuń</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Jeśli wybrano jedną wiadomość e-mail, użyj ikony <span class="guibutton"><strong>Usuń</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> dostępnej w widoku szczegółów.</p></li>
+<li class="listitem"><p role="presentation">Jeśli wybrano jedną wiadomość e-mail, użyj ikony <span class="guibutton"><strong>Usuń</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> dostępnej w widoku szczegółów.</p></li>
 </ul></p>
 </li>
 </ol></div>
@@ -87,7 +87,7 @@
           <p>Wynik: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Jeśli ustawienie <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Trwale usuwaj kasowane wiadomości e-mail</strong></span></a> jest wyłączone:</p>
+<p role="presentation">Jeśli jest wyłączone ustawienie <span class="guibutton"><strong>Trwale usuwaj kasowane wiadomości e-mail</strong></span>:</p>
 <p role="presentation">Wiadomości e-mail zostaną przeniesione do folderu Kosz.</p>
 </li>
 <li class="listitem">
@@ -97,17 +97,17 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptyfolder">
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.emptyfolder">
 <p class="title">Jak usunąć wszystkie wiadomości e-mail z folderu:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">W widoku folderów zaznacz folder, z którego chcesz usunąć wiadomości e-mail.</p></li>
 <li class="step">
 <p role="presentation">Użyj jednej z następujących metod: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Działania</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> widoczną obok nazwy folderu.</p></li>
-<li class="listitem"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> widoczną nad listą.</p></li>
+<li class="listitem"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Działania</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> widoczną obok nazwy folderu.</p></li>
+<li class="listitem"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> widoczną nad listą.</p></li>
 </ul></p>
 <p role="presentation">Kliknij przycisk <span class="guibutton"><strong>Usuń wszystkie wiadomości</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Ostrzeżenie:</strong></span> jeśli ustawienie <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Trwale usuwaj kasowane wiadomości e-mail</strong></span></a> jest włączone, usuniętych wiadomości e-mail nie można odzyskać.</p>
+<p role="presentation"><span class="phrase"><strong>Ostrzeżenie:</strong></span> w niektórych konfiguracjach, czyli jeśli jest włączone ustawienie <span class="guibutton"><strong>Trwale usuwaj kasowane wiadomości e-mail</strong></span>, usuniętych wiadomości e-mail <span class="phrase"><strong>nie</strong></span> można odzyskać.</p>
 </li>
 <li class="step"><p role="presentation">Potwierdź, że chcesz usunąć zawartość tego folderu.</p></li>
 </ol></div>
@@ -115,7 +115,7 @@
           <p>Wynik: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Jeśli ustawienie <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Trwale usuwaj kasowane wiadomości e-mail</strong></span></a> jest wyłączone:</p>
+<p role="presentation">Jeśli jest wyłączone ustawienie <span class="guibutton"><strong>Trwale usuwaj kasowane wiadomości e-mail</strong></span>:</p>
 <p role="presentation">Wiadomości e-mail zostaną przeniesione do folderu Kosz.</p>
 </li>
 <li class="listitem">
@@ -125,60 +125,22 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
-<p class="title">Jak odzyskać usunięte wiadomości e-mail:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">W widoku folderów otwórz folder <span class="guibutton"><strong>Kosz</strong></span>.</p></li>
-<li class="step"><p role="presentation">Wybierz jedną lub kilka wiadomości e-mail.</p></li>
-<li class="step"><p role="presentation">W menu kontekstowym wiadomości e-mail kliknij <span class="guibutton"><strong>Przenieś</strong></span>.</p></li>
-<li class="step"><p role="presentation">Wybierz folder w oknie <span class="guilabel"><strong>PrzenieÅ›</strong></span>. Kliknij przycisk <span class="guibutton"><strong>PrzenieÅ›</strong></span>.</p></li>
-</ol></div>
-<div class="taskrelated">
-          <p>Lub: </p>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Aby odzyskać wszystkie wiadomości e-mail z kosza, kliknij widoczną nad listą ikonę <span class="guibutton"><strong>Więcej opcji</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> i kliknij przycisk <span class="guibutton"><strong>Przenieś wszystkie wiadomości</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Jeśli wybrano jedną wiadomość e-mail, użyj ikony <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> dostępnej w widoku szczegółów i kliknij przycisk <span class="guibutton"><strong>Przenieś</strong></span>.</p></li>
-</ul>
-        </div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever">
-<p class="title">Jak nieodwracalnie usunąć wiadomość e-mail:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Ostrzeżenie:</strong></span> wiadomości, które zostały trwale usunięte, <span class="phrase"><strong>nie</strong></span> można odzyskać.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">W widoku folderów otwórz folder <span class="guibutton"><strong>Kosz</strong></span>.</p></li>
-<li class="step"><p role="presentation">Wybierz jedną lub kilka wiadomości e-mail.</p></li>
-<li class="step">
-<p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Usuń</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> widoczną na pasku narzędzi.</p>
-<p role="presentation">Jeśli wybrano jedną wiadomość e-mail, możesz także użyć ikony <span class="guibutton"><strong>Usuń</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> dostępnej w widoku szczegółów.</p>
-</li>
-<li class="step"><p role="presentation">Potwierdź, że chcesz trwale usunąć wybrane wiadomości e-mail.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptytrash">
-<p class="title">Jak trwale usunąć zawartość folderu Kosz:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Ostrzeżenie:</strong></span> wiadomości, które zostały trwale usunięte, <span class="phrase"><strong>nie</strong></span> można odzyskać.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">W widoku folderów zaznacz folder <span class="guibutton"><strong>Kosz</strong></span>.</p></li>
-<li class="step">
-<p role="presentation">Użyj jednej z następujących metod: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> widoczną obok opcji <span class="guibutton"><strong>Kosz</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> widoczną nad listą.</p></li>
-</ul></p>
-<p role="presentation">Kliknij przycisk <span class="guibutton"><strong>Pusty folder</strong></span>.</p>
-</li>
-<li class="step"><p role="presentation">Potwierdź, że chcesz usunąć zawartość tego folderu.</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.email.manage.delete"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Czyszczenie folderów poczty e-mail</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Odzyskiwanie wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Usuwanie wiadomości e-mail</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.22.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Odzyskiwanie trwale usuniętych wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Czyszczenie folderów poczty e-mail</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.email.manage.delete">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.deleteforever.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.deleteforever.html
new file mode 100644
index 000000000..e0ce7aaab
--- /dev/null
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.deleteforever.html
@@ -0,0 +1,92 @@
+<html lang="pl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Usuwanie wiadomości e-mail</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="podręcznik użytkownika">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Zarządzanie wiadomościami e-mail">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.recover.html" title="Odzyskiwanie wiadomości e-mail">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Odzyskiwanie trwale usuniętych wiadomości e-mail">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.recover.html">Wróć</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Dalej</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">E-mail</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.deleteforever">
+<div class="titlepage"><div><div><h3 class="title">Usuwanie wiadomości e-mail</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.24.2"></a><a class="indexterm" name="id-1.7.15.24.3"></a><p id="ox.appsuite.user.concept.email.manage.deleteforever">Dostępne są następujące możliwości: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Trwałe usuwanie pojedynczych wiadomości e-mail z kosza.</p></li>
+<li class="listitem"><p role="presentation">Trwale usuń wszystkie wiadomości e-mail z kosza, opróżniając go.</p></li>
+</ul>
+<p id="ox.appsuite.user.hint.email.manage.deleteforever.html"><span class="cap-dumpster">Trwale usunięte wiadomości e-mail można odzyskać w ciągu 14 dni. Po upływie tego okresu: </span>Trwale usuniętych wiadomości <span class="phrase"><strong>nie</strong></span> można odzyskać.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.single">
+<p class="title">Jak trwale usunąć wybraną wiadomość e-mail:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">W widoku folderów otwórz folder <span class="guibutton"><strong>Kosz</strong></span>.</p></li>
+<li class="step"><p role="presentation">Wybierz jedną lub kilka wiadomości e-mail.</p></li>
+<li class="step">
+<p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Usuń</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> widoczną na pasku narzędzi.</p>
+<p role="presentation">Jeśli wybrano jedną wiadomość e-mail, możesz także użyć ikony <span class="guibutton"><strong>Usuń</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> dostępnej w widoku szczegółów.</p>
+</li>
+<li class="step"><p role="presentation">Potwierdź, że chcesz trwale usunąć wybrane wiadomości e-mail.</p></li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.emptytrash">
+<p class="title">Jak trwale usunąć wszystkie wiadomości e-mail z kosza:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">W widoku folderów zaznacz folder <span class="guibutton"><strong>Kosz</strong></span>.</p></li>
+<li class="step">
+<p role="presentation">Użyj jednej z następujących metod: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> widoczną obok opcji <span class="guibutton"><strong>Kosz</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> widoczną nad listą.</p></li>
+</ul></p>
+<p role="presentation">Kliknij przycisk <span class="guibutton"><strong>Pusty folder</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Potwierdź, że chcesz usunąć zawartość tego folderu.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.deleteforever"></p>
+<p class="title">Interfejs użytkownika:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">PowiÄ…zane tematy:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Usuwanie wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Odzyskiwanie wiadomości e-mail</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.24.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Odzyskiwanie trwale usuniętych wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Czyszczenie folderów poczty e-mail</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.deleteforever">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.draft.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.draft.html
index 7f82eb3b9..331c4495d 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.draft.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.draft.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.draft">
 <div class="titlepage"><div><div><h3 class="title">Korzystanie z wersji roboczych wiadomości e-mail</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">Podczas pisania wiadomości e-mail jest ona w regularnych odstępach automatycznie zapisywana jako wersja robocza. Dostępne są następujące możliwości: </p>
+<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">Podczas pisania wiadomości e-mail jest ona w regularnych odstępach automatycznie zapisywana jako wersja robocza. Dostępne są następujące możliwości: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Edytowanie lub wysłanie wersji roboczej wiadomości e-mail.</p></li>
 <li class="listitem"><p role="presentation">Edytowanie lub wysłanie kopii wersji roboczej wiadomości e-mail.</p></li>
@@ -69,7 +69,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.draft"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.expungefolder.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.expungefolder.html
index 26e95e33c..2f6d47b4d 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.expungefolder.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.expungefolder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Zarządzanie wiadomościami e-mail">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Usuwanie wiadomości e-mail">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Odzyskiwanie trwale usuniętych wiadomości e-mail">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.unifiedmail.html" title="Korzystanie z ujednoliconej poczty">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Dalej</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.expungefolder">
 <div class="titlepage"><div><div><h3 class="title">Czyszczenie folderów poczty e-mail</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.22.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">W zależności od ustawień klienta poczty e-mail wiadomości e-mail usunięte z tego klienta (np. Apple Mail, MS Outlook lub Mozilla Thunderbird) zostaną w rzeczywistości usunięte dopiero po wylogowaniu się z klienta. Do tego czasu wiadomości te będą widoczne w oprogramowaniu do pracy grupowej jako skreślone. Aby je usunąć, należy oczyścić folder poczty e-mail.</p>
+<a class="indexterm" name="id-1.7.15.26.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">W zależności od ustawień klienta poczty e-mail wiadomości e-mail usunięte z tego klienta (np. Apple Mail, MS Outlook lub Mozilla Thunderbird) zostaną w rzeczywistości usunięte dopiero po wylogowaniu się z klienta. Do tego czasu wiadomości te będą widoczne w oprogramowaniu do pracy grupowej jako skreślone. Aby je usunąć, należy oczyścić folder poczty e-mail.</p>
 <p id="ox.appsuite.user.hint.email.manage.expungefolder">Uwaga: w niektórych konfiguracjach ta funkcja może być niedostępna, tj. wiadomości e-mail nie są wyświetlane.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.expunge">
 <p class="title">Jak wyczyścić folder poczty e-mail:</p>
@@ -47,14 +47,12 @@
 <li class="step"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Działania</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.expungefolder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> obok nazwy folderu. Kliknij <span class="guibutton"><strong>Wykonaj czyszczenie</strong></span>.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.expungefolder">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.expungefolder"></p>
+<p class="title">Interfejs użytkownika:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">E-mail</span></a></p></li></ul>
+<p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Usuwanie wiadomości e-mail</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Usuwanie wiadomości e-mail</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.expungefolder">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.html
index c64352789..95bd014cb 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.html
@@ -43,17 +43,21 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Przenoszenie lub kopiowanie wiadomości e-mail</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Oznaczanie wiadomości e-mail jako przeczytanych lub nieprzeczytanych</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Gromadzenie adresów</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Kategoryzowanie wiadomości e-mail</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Wyświetlanie źródła wiadomości e-mail</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Korzystanie z wersji roboczych wiadomości e-mail</a></p></li>
-<li class="listitem cap-tasks" id="id-1.7.15.4.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Tworzenie przypomnień o wiadomościach e-mail</a></p></li>
+<li class="listitem cap-tasks" id="id-1.7.15.4.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Tworzenie przypomnień o wiadomościach e-mail</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Dodawanie wiadomości e-mail do portalu</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Zapisywanie wiadomości</a></p></li>
-<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Eksportuj wiadomości e-mail w formacie PDF</a></p></li>
+<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Eksportuj wiadomości e-mail w formacie PDF</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importowanie wiadomości e-mail</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Drukowanie wiadomości e-mail</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archiwizacja wiadomości e-mail</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Usuwanie wiadomości e-mail</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Odzyskiwanie wiadomości e-mail</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Usuwanie wiadomości e-mail</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.4.1.19"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Odzyskiwanie trwale usuniętych wiadomości e-mail</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Czyszczenie folderów poczty e-mail</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Korzystanie z ujednoliconej poczty</a></p></li>
 </ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.import.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.import.html
index 94c2ffb65..d7291b7d7 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.import.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importowanie wiadomości e-mail</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><p id="ox.appsuite.user.concept.email.manage.import">Możesz zaimportować wiadomość e-mail dostępną w formacie EML.</p>
+<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.import">Możesz zaimportować wiadomość e-mail dostępną w formacie EML.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.import">
 <p class="title">Jak zaimportować wiadomość e-mail:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,14 +46,15 @@
 <li class="step"><p role="presentation">Przeciągnij plik EML z przeglądarki plików lub pulpitu na widok listy wiadomości e-mail.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.email.manage.import"></p>
+<p class="title">Interfejs użytkownika:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Zapisywanie wiadomości</a>
-            </p></li></ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Zapisywanie wiadomości</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.import">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.inboxcategories.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.inboxcategories.html
index 3d28621be..8dd1ac70e 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.inboxcategories.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.inboxcategories.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation">przypisywanie przychodzących wiadomości e-mail do kategorii skrzynki odbiorczej</p></li>
 <li class="listitem"><p role="presentation">edytowanie widoku kategorii skrzynki odbiorczej</p></li>
 </ul>
-<p role="presentation" class="feat-io-ox-core-categories">Uwaga: opisanych tutaj kategorii skrzynki odbiorczej można używać tylko w odniesieniu do wiadomości e-mail. W niektórych konfiguracjach można używać oddzielnych kategorii dla spotkań, kontaktów i zadań — zobacz <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Zarządzanie kategoriami</a>.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Uwaga: opisanych tutaj kategorii skrzynki odbiorczej można używać tylko w odniesieniu do wiadomości e-mail. W niektórych konfiguracjach można stosować osobne kategorie do wiadomości e-mail, spotkań, kontaktów i zadań — zobacz <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail</a>.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.inboxcategories.activate">
 <p class="title">Jak włączyć lub wyłączyć karty skrzynki odbiorczej:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,7 @@
 <p role="presentation">Aby włączyć karty skrzynki odbiorczej, kliknij ikonę <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.activate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widoczną na pasku menu. Kliknij <span class="guibutton"><strong>Kategorie skrzynki odbiorczej</strong></span>.</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Możesz też kliknąć przycisk <span class="guibutton"><strong>Konfiguruj kategorie skrzynki odbiorczej</strong></span> w sekcji <span class="guibutton"><strong>Odczyt</strong></span> w ustawieniach poczty e-mail.</p></li></ul>
 <p role="presentation">Pojawi się okno <span class="guilabel"><strong>Skonfiguruj kategorie</strong></span>, a w nim dostępne kategorie skrzynki odbiorczej. Kliknij <span class="guibutton"><strong>Włącz kategorie</strong></span>.</p>
-<p role="presentation">Po prawej stronie poniżej paska menu pojawi się pasek kart.</p>
+<p role="presentation">Pod paskiem menu zostanie wyświetlony pasek kategorii skrzynki odbiorczej.</p>
 </li>
 <li class="step">
 <p role="presentation">Aby wyłączyć karty skrzynki odbiorczej, kliknij ikonę <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.deactivate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widoczną na pasku menu. Kliknij <span class="guibutton"><strong>Kategorie skrzynki odbiorczej</strong></span>.</p>
@@ -68,7 +68,7 @@
 <p role="presentation">Wiadomości e-mail, które nie zostały jeszcze przypisane do kategorii skrzynki odbiorczej, są wyświetlane na karcie <span class="guibutton"><strong>Ogólne</strong></span>.</p>
 </li>
 <li class="step">
-<p role="presentation">Przeciągnij wiadomość e-mail z widoku listy na kartę na pasku kart i upuść ją w tym miejscu.</p>
+<p role="presentation">Przeciągnij wiadomość e-mail z widoku listy do kategorii na pasku kategorii skrzynki odbiorczej.</p>
 <p role="presentation">Możesz też wybrać wiadomość e-mail. Kliknij widoczną na pasku narzędzi ikonę <span class="guibutton"><strong>Ustaw kategorię</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Wybierz kartę z menu.</p>
 </li>
 <li class="step"><p role="presentation">Aby zakończyć cała procedurę, wykonaj jedną z następujących czynności: <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -82,14 +82,14 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Kategorie skrzynki odbiorczej</strong></span>.</p>
-<p role="presentation">Możesz też kliknąć ikonę <span class="guibutton"><strong>Skonfiguruj kategorie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> widoczna na pasku kategorii.</p>
+<p role="presentation">Możesz też kliknąć ikonę <span class="guibutton"><strong>Skonfiguruj kategorie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> widoczną na pasku kategorii skrzynki odbiorczej.</p>
 <p role="presentation">Pojawi siÄ™ okno <span class="guilabel"><strong>Skonfiguruj kategorie</strong></span>.</p>
 </li>
 <li class="step">
 <p role="presentation">Aby włączyć lub wyłączyć kategorię skrzynki odbiorczej, zaznacz lub wyczyść odpowiednie pole wyboru.</p>
 <p role="presentation">Aby zmienić nazwę kategorii skrzynki odbiorczej, edytuj odpowiedni tekst.</p>
 <p role="presentation">Uwaga: niektórych kategorii nie można edytować.</p>
-<p role="presentation">Aby ukryć pasek kategorii, kliknij <span class="guibutton"><strong>Wyłącz kategorie</strong></span>.</p>
+<p role="presentation">Aby ukryć pasek kategorii skrzynki odbiorczej, kliknij <span class="guibutton"><strong>Wyłącz kategorie</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">Kliknij przycisk <span class="guibutton"><strong>Zapisz</strong></span>.</p></li>
 </ol></div>
@@ -98,14 +98,11 @@
 <p class="title">Interfejs użytkownika:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">Menu ustawień aplikacji <span class="phrase">E-mail</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">Pasek kart skrzynki odbiorczej aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">Pasek kategorii skrzynki odbiorczej</a></p>
 </li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Wyświetlanie wiadomości e-mail</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.inboxcategories">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.label.html
index 4e02f54dc..25c339e3a 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.label.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.label.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Zarządzanie wiadomościami e-mail">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Gromadzenie adresów">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.source.html" title="Wyświetlanie źródła wiadomości e-mail">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.categories.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.source.html">Dalej</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.label">
 <div class="titlepage"><div><div><h3 class="title">Kategoryzowanie wiadomości e-mail</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.label">W niektórych konfiguracjach istnieje możliwość kategoryzacji wiadomości e-mail za pomocą jednej z następujących opcji: </p>
+<a class="indexterm" name="id-1.7.15.12.2"></a><a class="indexterm" name="id-1.7.15.12.3"></a><p id="ox.appsuite.user.concept.email.manage.label">W niektórych konfiguracjach istnieje możliwość kategoryzacji wiadomości e-mail za pomocą jednej z następujących opcji: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">kolorowa etykieta</p></li>
 <li class="listitem"><p role="presentation">flaga</p></li>
@@ -69,7 +69,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.label"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.mark.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.mark.html
index 3f0a4199f..994a6c24b 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.mark.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.mark.html
@@ -62,7 +62,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.mark"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Wyświetlanie wiadomości e-mail</a></p></li></ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.movecopy.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.movecopy.html
index 4dacc2ffa..c9625395a 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.movecopy.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.movecopy.html
@@ -67,7 +67,11 @@
 </ul>
 <p id="ox.appsuite.user.related.email.manage.movecopy"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.pdfexport.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.pdfexport.html
index 43e9555f5..0c0100d0c 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.pdfexport.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.pdfexport.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.pdfexport">
 <div class="titlepage"><div><div><h3 class="title">Eksportuj wiadomości e-mail w formacie PDF</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.17.2"></a><a class="indexterm" name="id-1.7.15.17.3"></a><a class="indexterm" name="id-1.7.15.17.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Uwaga: w niektórych konfiguracjach ta funkcja może być niedostępna.</p>
+<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><a class="indexterm" name="id-1.7.15.18.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Uwaga: w niektórych konfiguracjach ta funkcja może być niedostępna.</p>
 <p id="ox.appsuite.user.concept.email.manage.pdfexport">Możesz wyeksportować wiadomość e-mail razem z załącznikami w formacie docx do pliku w formacie PDF. Utworzony plik PDF zostanie od razu zapisany w folderze programu <span class="phrase">Pliki</span>, który może być zdefiniowany przez użytkownika. Czas pobierania pliku zależy od jego objętości. Otrzymasz powiadomienie o zakończonym procesie.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.pdfexport">
 <p class="title">Jak wyeksportować wiadomości e-mail w formacie PDF:</p>
@@ -54,7 +54,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.pdfexport"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Zapisywanie wiadomości</a></p></li></ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.print.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.print.html
index d55d06af8..9c995fea6 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.print.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Drukowanie wiadomości e-mail</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.print">Istnieje możliwość wydrukowania treści jednej lub kilku wiadomości e-mail.</p>
+<a class="indexterm" name="id-1.7.15.20.2"></a><a class="indexterm" name="id-1.7.15.20.3"></a><p id="ox.appsuite.user.concept.email.manage.print">Istnieje możliwość wydrukowania treści jednej lub kilku wiadomości e-mail.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.print">
 <p class="title">Jak wydrukować zawartość wiadomości e-mail:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -56,7 +56,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.print"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archiwizacja wiadomości e-mail</a></p></li></ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.recover.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.recover.html
new file mode 100644
index 000000000..524a0df59
--- /dev/null
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.recover.html
@@ -0,0 +1,97 @@
+<html lang="pl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Odzyskiwanie wiadomości e-mail</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="podręcznik użytkownika">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Zarządzanie wiadomościami e-mail">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Usuwanie wiadomości e-mail">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Usuwanie wiadomości e-mail">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Wróć</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Dalej</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">E-mail</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.recover">
+<div class="titlepage"><div><div><h3 class="title">Odzyskiwanie wiadomości e-mail</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.recover">Dostępne są następujące możliwości: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Odzyskiwanie pojedynczych wiadomości e-mail z kosza.</p></li>
+<li class="listitem"><p role="presentation">Odzyskiwanie wszystkich wiadomości e-mail z kosza.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.single">
+<p class="title">Jak odzyskać wybraną wiadomość e-mail z kosza:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">W widoku folderów otwórz folder <span class="guibutton"><strong>Kosz</strong></span>.</p></li>
+<li class="step">
+<p role="presentation">Wybierz jedną lub kilka wiadomości e-mail.</p>
+<p role="presentation">W menu kontekstowym wiadomości e-mail kliknij <span class="guibutton"><strong>Przenieś</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Wybierz folder w oknie <span class="guilabel"><strong>PrzenieÅ›</strong></span>. Kliknij <span class="guibutton"><strong>PrzenieÅ›</strong></span>.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Lub: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Przeciągnij wiadomości e-mail z kosza do folderu w widoku folderów.</p></li>
+<li class="listitem"><p role="presentation">Jeśli wybrano jedną wiadomość e-mail, użyj ikony <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.single.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> dostępnej w widoku szczegółów i kliknij <span class="guibutton"><strong>Przenieś</strong></span>.</p></li>
+</ul>
+        </div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.all">
+<p class="title">Jak odzyskać wszystkie wiadomości e-mail z kosza:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">W widoku folderów zaznacz folder <span class="guibutton"><strong>Kosz</strong></span>.</p></li>
+<li class="step">
+<p role="presentation">Użyj jednej z następujących metod: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> widoczną obok opcji <span class="guibutton"><strong>Kosz</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> widoczną nad listą.</p></li>
+</ul></p>
+<p role="presentation">Kliknij przycisk <span class="guibutton"><strong>Przenieś wszystkie wiadomości</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Wybierz folder w oknie <span class="guilabel"><strong>PrzenieÅ›</strong></span>. Kliknij <span class="guibutton"><strong>PrzenieÅ› wszystko</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.recover"></p>
+<p class="title">Interfejs użytkownika:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
+<p> </p>
+<p class="title">PowiÄ…zane tematy:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Usuwanie wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Usuwanie wiadomości e-mail</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.23.7.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Odzyskiwanie trwale usuniętych wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Czyszczenie folderów poczty e-mail</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.recover">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.reminder.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.reminder.html
index 5036d5711..64d1b640a 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.reminder.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.reminder.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.reminder">
 <div class="titlepage"><div><div><h3 class="title">Tworzenie przypomnień o wiadomościach e-mail</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">Istnieje możliwość włączenia przypomnienia e-mail. Ta funkcja utworzy odpowiednie zadanie i przypomni Ci o jego terminie.</p>
+<a class="indexterm" name="id-1.7.15.15.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">Istnieje możliwość włączenia przypomnienia e-mail. Ta funkcja utworzy odpowiednie zadanie i przypomni Ci o jego terminie.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.email.manage.reminder">
 <p class="title">Jak utworzyć przypomnienie e-mail:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.reminder"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Tworzenie nowego zadania</a></p></li></ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.save.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.save.html
index 7f00775d6..5c4c7dd8b 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.save.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.save.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.save">
 <div class="titlepage"><div><div><h3 class="title">Zapisywanie wiadomości</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.16.2"></a><p id="ox.appsuite.user.concept.email.manage.save">Możesz zapisać wiadomość e-mail jako plik tekstowy. Plik ten będzie miał rozszerzenie EML. Jeśli zaznaczysz wiele wiadomości e-mail, w przypadku każdej z nich zostanie utworzony plik EML. Następnie te pliki EML zostaną zapisane jako archiwum ZIP.</p>
+<a class="indexterm" name="id-1.7.15.17.2"></a><p id="ox.appsuite.user.concept.email.manage.save">Możesz zapisać wiadomość e-mail jako plik tekstowy. Plik ten będzie miał rozszerzenie EML. Jeśli zaznaczysz wiele wiadomości e-mail, w przypadku każdej z nich zostanie utworzony plik EML. Następnie te pliki EML zostaną zapisane jako archiwum ZIP.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.save">
 <p class="title">Jak zapisać wiadomość:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.save"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -57,7 +60,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importowanie wiadomości e-mail</a></p>
 <p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Eksportuj wiadomości e-mail w formacie PDF</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.7.15.16.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Pobieranie danych osobowych</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.7.15.17.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Pobieranie danych osobowych</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.save">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.source.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.source.html
index 66c296606..2ef61b8f6 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.source.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.source.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.source">
 <div class="titlepage"><div><div><h3 class="title">Wyświetlanie źródła wiadomości e-mail</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.12.2"></a><p id="ox.appsuite.user.concept.email.manage.source">Źródło wiadomości e-mail oznacza całą zawartość wiadomości, tj. wszystkie dane jej nagłówka.</p>
+<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.source">Źródło wiadomości e-mail oznacza całą zawartość wiadomości, tj. wszystkie dane jej nagłówka.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.source">
 <p class="title">Jak wyświetlić źródło wiadomości e-mail:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.source"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.undelete.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.undelete.html
new file mode 100644
index 000000000..cb7706eee
--- /dev/null
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.undelete.html
@@ -0,0 +1,75 @@
+<html lang="pl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Odzyskiwanie trwale usuniętych wiadomości e-mail</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="podręcznik użytkownika">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Zarządzanie wiadomościami e-mail">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Usuwanie wiadomości e-mail">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Czyszczenie folderów poczty e-mail">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Wróć</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Dalej</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">E-mail</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.undelete">
+<div class="titlepage"><div><div><h3 class="title">Odzyskiwanie trwale usuniętych wiadomości e-mail</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.25.2"></a><a class="indexterm" name="id-1.7.15.25.3"></a><p id="ox.appsuite.user.concept.email.manage.undelete.html">Trwale usunięte wiadomości e-mail można odzyskać w ciągu 14 dni. Po upływie tego okresu trwale usunięte wiadomości e-mail zostaną bezpowrotnie utracone.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
+<p class="title">Jak odzyskać trwale usunięte wiadomości e-mail:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">W widoku folderów zaznacz folder <span class="guibutton"><strong>Kosz</strong></span>.</p></li>
+<li class="step">
+<p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Więcej działań</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> widoczną obok opcji <span class="guibutton"><strong>Kosz</strong></span>.</p>
+<p role="presentation">Kliknij <span class="guibutton"><strong>Odzyskaj usunięte elementy</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">W oknie <span class="guilabel"><strong>Odzyskaj usunięte elementy</strong></span> wybierz wiadomości e-mail, które chcesz odzyskać.</p>
+<p role="presentation">Kliknij <span class="guibutton"><strong>PrzenieÅ› wybrane elementy</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">W oknie <span class="guilabel"><strong>Przenieś</strong></span> określ folder, który powinien zawierać odzyskane wiadomości e-mail.</p>
+<p role="presentation">Kliknij <span class="guibutton"><strong>PrzenieÅ›</strong></span>.</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.undelete"></p>
+<p class="title">Interfejs użytkownika:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">E-mail</span></a></p></li></ul>
+<p> </p>
+<p class="title">PowiÄ…zane tematy:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Usuwanie wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Odzyskiwanie wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Usuwanie wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Czyszczenie folderów poczty e-mail</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.undelete">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Zarządzanie wiadomościami e-mail</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.unifiedmail.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.unifiedmail.html
index 616b97a98..66c5db3ab 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.unifiedmail.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.manage.unifiedmail.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">Zarządzanie wiadomościami e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.unifiedmail">
 <div class="titlepage"><div><div><h3 class="title">Korzystanie z ujednoliconej poczty</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">Za pomocą folderu Ujednolicona poczta możesz wyświetlać wiadomości e-mail z różnych kont w jednym folderze centralnym. Pozwala to na szybkie przeglądanie zawartości skrzynek odbiorczych kilku kont e-mail. Ujednoliconą pocztę można opisać następująco: </p>
+<a class="indexterm" name="id-1.7.15.27.2"></a><a class="indexterm" name="id-1.7.15.27.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">Za pomocą folderu Ujednolicona poczta możesz wyświetlać wiadomości e-mail z różnych kont w jednym folderze centralnym. Pozwala to na szybkie przeglądanie zawartości skrzynek odbiorczych kilku kont e-mail. Ujednoliconą pocztę można opisać następująco: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Oprócz skrzynki odbiorczej konta e-mail istnieje folder <span class="guibutton"><strong>Ujednolicona poczta</strong></span> zapewniający dodatkowy widok poczty e-mail na danym koncie. W rzeczywistości wiadomości e-mail występują tylko w pojedynczych egzemplarzach.</p></li>
 <li class="listitem"><p role="presentation">Wiadomości e-mail z podfolderów skrzynki odbiorczej nie są wyświetlane w folderze <span class="guibutton"><strong>Ujednolicona poczta</strong></span>.</p></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.openai.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.openai.html
index 7c4bae108..2b4bf4f8e 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.openai.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.openai.html
@@ -40,9 +40,9 @@
 <a class="indexterm" name="id-1.7.12.2"></a><a class="indexterm" name="id-1.7.12.3"></a><p id="ox.appsuite.user.orientation.email.openai">Dowiedz się, jak korzystać z integracji AI w celu edycji treści wiadomości e-mail: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">edytowanie treści już istniejących wiadomości e-mail lub tworzenie propozycji tekstów, aby na wiadomości odpowiadać</p></li>
-<li class="listitem"><p role="presentation">automatyczne tworzenie propozycji tekstowych w celu wysyłania nowych wiadomości e-mail</p></li>
+<li class="listitem"><p role="presentation">automatyczne tworzenie propozycji tekstów w celu wysyłania nowych wiadomości e-mail</p></li>
 </ul>
-<p> Uwaga: w przypadku korzystania z integracji AI treść danej wiadomości e-mail zostanie wysłana do usługi Microsoft Azure OpenAI Service. </p>
+<p> Uwaga: w przypadku korzystania z integracji AI treść danej wiadomości e-mail zostanie wysłana do usługi OpenAI. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Przy pierwszym użyciu funkcji AI otwiera się okno dialogowe z pytaniem o zgodę na wysyłanie tych danych. Z funkcji AI można korzystać dopiero po wyrażeniu tej zgody.</p></li>
 <li class="listitem"><p role="presentation">Zgodę na wysyłanie danych można w każdej chwili zmienić. Aby to zrobić, kliknij <span class="guibutton"><strong>Zmień zgodę</strong></span> w obszarze <span class="guibutton"><strong>Integracja z AI</strong></span> w ustawieniach poczty e-mail.</p></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.openai.send.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.openai.send.html
index 3df3331e1..3bce9e377 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.openai.send.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.openai.send.html
@@ -64,7 +64,7 @@
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Korzystanie z funkcji AI podczas odpowiadania na wiadomości e-mail</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.email.openai.send">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Korzystanie z integracji z AI</a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.search.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.search.html
index 69a0e16f0..6f165e5c8 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.search.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.search.html
@@ -101,9 +101,14 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">Wyświetlanie wiadomości e-mail</a>
           </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Kategoryzowanie wiadomości e-mail</a>
-          </p></li>
+          </p>
+<p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail</a>
+          </p>
+</li>
 </ul>
 <p>
     </p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attachmentexisting.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attachmentexisting.html
index 28476829a..e867cbf5b 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attachmentexisting.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attachmentexisting.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Wysyłanie wiadomości e-mail">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="Dodawanie załączników">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Wysyłanie załącznika jako linku">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Wysyłanie załączników jako linków">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -59,12 +59,12 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachmentexisting"></p>
 <p class="title">Działanie nadrzędne:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p></li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Dodawanie załączników</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Wysyłanie załącznika jako linku</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Wysyłanie załączników jako linków</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.send..attachmentexisting">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Wysyłanie wiadomości e-mail</a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attachmentlink.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attachmentlink.html
index 16d428575..fbf600954 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attachmentlink.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attachmentlink.html
@@ -1,7 +1,7 @@
 <html lang="pl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Wysyłanie załącznika jako linku</title>
+<title>Wysyłanie załączników jako linków</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
@@ -37,7 +37,7 @@
   </h1>
 <h2 class="sr-only">Wysyłanie wiadomości e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentlink">
-<div class="titlepage"><div><div><h3 class="title">Wysyłanie załącznika jako linku</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Wysyłanie załączników jako linków</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.10.2"></a><p id="ox.appsuite.user.concept.email.send.attachmentlink">Ta funkcja pozwala na wysyłanie dużych załączników pocztą e-mail. Działa ona w następujący sposób: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Załączniki zostaną przesłane do nowego folderu widocznego poniżej folderu <span class="guibutton"><strong>Drive Mail</strong></span> w aplikacji <span class="phrase">Pliki</span>. Nazwa folderu odpowiada tematowi wiadomości e-mail. Folder zostanie udostępniony za pomocą linku publicznego.</p></li>
@@ -89,7 +89,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.attachmentlink"></p>
 <p class="title">Działanie nadrzędne:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p></li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attachments.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attachments.html
index 1ac3861ab..3235a4c96 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attachments.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attachments.html
@@ -62,12 +62,12 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachments"></p>
 <p class="title">Działanie nadrzędne:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p></li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Dodawanie załączników z już istniejących wiadomości e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Wysyłanie załącznika jako linku</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Wysyłanie załączników jako linków</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.send.attachments">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Wysyłanie wiadomości e-mail</a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attendees.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attendees.html
index 62f66fdf1..a9db0d44b 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attendees.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.attendees.html
@@ -51,24 +51,15 @@
 <li class="step"><p role="presentation">Uzupełnij dane potrzebne do wysłania wiadomości e-mail.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.related.email.send.attendees">
-        </p>
+<p id="ox.appsuite.user.related.email.send.attendees"></p>
+<p class="title">Interfejs użytkownika:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Kalendarz</span></a></p>
+</li></ul>
+<p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">WyskakujÄ…ce okienko w aplikacji <span class="phrase">Kalendarz</span></a>
-            </p>
-<p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Kalendarz</span></a>
-            </p>
-</li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a>
-            </p></li>
-</ul>
-<p>
-      </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.send.attendees">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Wysyłanie wiadomości e-mail</a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.autoforward.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.autoforward.html
index 036494e6a..6f2d8af3c 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.autoforward.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.autoforward.html
@@ -67,7 +67,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a>
+              <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Odpowiadanie na wiadomości e-mail</a>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.forward.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.forward.html
index b90c0cf66..22ce16bf7 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.forward.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.forward.html
@@ -74,7 +74,7 @@
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Odpowiadanie na wiadomości e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatyczne przesyłanie wiadomości e-mail dalej</a></p>
 </li></ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.html
index 68fb627e5..0803a8d9f 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="E-mail">
 <link rel="prev" href="ox.appsuite.user.sect.email.attachments.html" title="Wyświetlanie lub zapisywanie załączników wiadomości e-mail">
-<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Wysyłanie nowej wiadomości e-mail">
+<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Wysyłanie nowych wiadomości e-mail">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -39,12 +39,12 @@
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Wysyłanie wiadomości e-mail</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.email.send">Dowiedz się, jak wysłać wiadomość e-mail, oraz poznaj funkcje dostępne do dostosowania zawartości wiadomości e-mail: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Wybieranie adresu nadawcy</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Ustawianie adresu Odpowiedz do</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Dodawanie załączników</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Dodawanie załączników z już istniejących wiadomości e-mail</a></p></li>
-<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Wysyłanie załącznika jako linku</a></p></li>
+<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Wysyłanie załączników jako linków</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.11.2.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Korzystanie z szablonów</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Korzystanie z podpisów</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Odpowiadanie na wiadomości e-mail</a></p></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.new.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.new.html
index 49378ef97..4862beda4 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.new.html
@@ -1,7 +1,7 @@
 <html lang="pl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Wysyłanie nowej wiadomości e-mail</title>
+<title>Wysyłanie nowych wiadomości e-mail</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
@@ -37,7 +37,7 @@
   </h1>
 <h2 class="sr-only">Wysyłanie wiadomości e-mail</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.new">
-<div class="titlepage"><div><div><h3 class="title">Wysyłanie nowej wiadomości e-mail</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Wysyłanie nowych wiadomości e-mail</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.5.2"></a><a class="indexterm" name="id-1.7.11.5.3"></a><a class="indexterm" name="id-1.7.11.5.4"></a><div class="task" id="ox.appsuite.user.task.email.send.new">
 <p class="title">Jak wysłać nową wiadomość e-mail:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -93,7 +93,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">Przycisk Nowa wiadomość</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">Okno edycji wiadomości e-mail</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Działania podrzędne:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatyczne dodawanie kontaktów lub zasobów z książki adresowej</a></p>
@@ -102,25 +102,14 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Ustawianie adresu Odpowiedz do</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Dodawanie załączników</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Dodawanie załączników z już istniejących wiadomości e-mail</a></p>
-<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Wysyłanie załącznika jako linku</a></p>
+<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Wysyłanie załączników jako linków</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Korzystanie z szablonów</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Korzystanie z podpisów</a></p>
 </li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Odpowiadanie na wiadomości e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Przesyłanie wiadomości e-mail dalej</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatyczne przesyłanie wiadomości e-mail dalej</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Wysyłanie wiadomości e-mail do uczestników spotkania</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Automatyczne wysyłanie zawiadomienia o urlopie</a></p>
-<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Wysyłanie zaszyfrowanych wiadomości e-mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Wysyłanie kontaktów jako wizytówki</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Wysyłanie wiadomości e-mail z poziomu książki adresowej</a></p>
-</li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Korzystanie z funkcji AI podczas tworzenia wiadomości e-mail</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Korzystanie z funkcji AI podczas tworzenia wiadomości e-mail</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.send.new">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Wysyłanie wiadomości e-mail</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.reply.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.reply.html
index e5dd08c83..6c7d2fd1f 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.reply.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.reply.html
@@ -70,7 +70,7 @@
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Przesyłanie wiadomości e-mail dalej</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Automatyczne wysyłanie zawiadomienia o urlopie</a></p>
 </li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.replyto.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.replyto.html
index 0088d4623..07829f916 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.replyto.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.replyto.html
@@ -43,11 +43,11 @@
 <p class="title">Jak wybrać adres Odpowiedz do w oknie edycji wiadomości e-mail:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">W oknie edycji wiadomości e-mail kliknij pole <span class="guibutton"><strong>ODP</strong></span> obok adresu nadawcy. Pojawi się pole wejściowe <span class="guibutton"><strong>Odpowiedz do</strong></span>.</p>
-<p role="presentation">Jeśli podczas edycji podstawowego konta e-mail ustawiono domyślne adresy na potrzeby odpowiedzi, pole <span class="guibutton"><strong>Odpowiedz do</strong></span> będzie wyświetlane automatycznie. Pole wejściowe będzie zawierało wstępnie ustawione adresy Odpowiedz do.</p>
+<p role="presentation">W oknie edycji wiadomości e-mail kliknij przycisk <span class="guibutton"><strong>Odp</strong></span> obok adresu nadawcy. Zostanie wyświetlone pole <span class="guibutton"><strong>Odpowiedz do</strong></span>.</p>
+<p role="presentation">Jeśli podczas edycji podstawowego konta e-mail ustawiono adresy na potrzeby odpowiedzi, pole wejściowe <span class="guibutton"><strong>Odpowiedz do</strong></span> będzie wyświetlane automatycznie i będzie zawierało ustawione adresy Odpowiedz do.</p>
 </li>
 <li class="step">
-<p role="presentation">W polu <span class="guibutton"><strong>Odpowiedz do</strong></span> wpisz adresy e-mail, na które ma zostać wysłana odpowiedź na tę wiadomość. <ul class="itemizedlist" style="list-style-type: disc; ">
+<p role="presentation">W polu <span class="guibutton"><strong>Odpowiedz do</strong></span> wpisz adresy e-mail, na które ma zostać wysłana odpowiedź na wiadomość e-mail. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Podczas wpisywania adresatów będą wyświetlane pasujące sugestie. Aby wybrać jedną z nich, po prostu ją kliknij.</p></li>
 <li class="listitem"><p role="presentation">Aby wybrać kontakty z książki adresowej, kliknij ikonę <span class="guibutton"><strong>Wybierz kontakt</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.replyto.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span> z prawej strony pola wejściowego.</p></li>
 </ul></p>
@@ -57,7 +57,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.replyto"></p>
 <p class="title">Działanie nadrzędne:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p></li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">Edycja głównego konta e-mail</a></p></li></ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.sender.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.sender.html
index 21e17f9d3..588295e76 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.sender.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.sender.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Wysyłanie wiadomości e-mail">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Wysyłanie nowej wiadomości e-mail">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Wysyłanie nowych wiadomości e-mail">
 <link rel="next" href="ox.appsuite.user.sect.email.send.replyto.html" title="Ustawianie adresu Odpowiedz do">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -59,7 +59,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.sender"></p>
 <p class="title">Działanie nadrzędne:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p></li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Dodawanie kont e-mail</a></p></li></ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.signatures.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.signatures.html
index 174016118..289920d0e 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.signatures.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.signatures.html
@@ -91,7 +91,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.signatures"></p>
 <p class="title">Działanie nadrzędne:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p></li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.templates.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.templates.html
index 577cf5b1b..d88b90ab8 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.templates.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.templates.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Wysyłanie wiadomości e-mail">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Wysyłanie załącznika jako linku">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Wysyłanie załączników jako linków">
 <link rel="next" href="ox.appsuite.user.sect.email.send.signatures.html" title="Korzystanie z podpisów">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -88,7 +88,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.templates"></p>
 <p class="title">Działanie nadrzędne:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p></li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.vacationnotice.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.vacationnotice.html
index 088b746b7..7e6208f4b 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.vacationnotice.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.send.vacationnotice.html
@@ -81,7 +81,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Odpowiadanie na wiadomości e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Przesyłanie wiadomości e-mail dalej</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatyczne przesyłanie wiadomości e-mail dalej</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.settings.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.settings.html
index e9f5495f7..7343f6b9c 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.settings.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.settings.html
@@ -55,8 +55,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.composereply">Utwórz e-mail i odpowiedz</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.20.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">Szablony</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.rules">Zasady</a></p></li>
-<li class="listitem feat-zoom" id="id-1.7.20.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">Integracja z AI</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.7.20.5.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Ustawienia zaawansowane</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">Integracja z AI</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Ustawienia zaawansowane</a></p></li>
 </ul>
 <p>Zobacz też: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Wyszukiwanie ustawień</a></p>
 <p id="ox.appsuite.user.reference.email.settings.reading"></p>
@@ -71,8 +71,9 @@
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.list"><b>Zdjęcia kontaktów, pola wyboru, proste. </b>Umożliwia określenie, czy w widoku listy mają być wyświetlane obrazy kontaktów i/lub pola wyboru czy żaden z tych elementów.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.preview"><b>Pokaż podgląd tekstu. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.2.1.2"></a>Określa, czy w widoku listy wiadomości e-mail mają być wyświetlane pierwsze słowa z treści wiadomości.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Zawsze pokazuj pełną datę i godzinę. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Określa, czy w widoku listy wiadomości e-mail będzie wyświetlana nie tylko data otrzymania wiadomości, ale także godzina.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Pokaż rozmiar wiadomości. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Określa, czy w widoku listy wiadomości e-mail ma być wyświetlany rozmiar wiadomości.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.20.6.2.1.2.1.3.1.3"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>Pokaż kategorie. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Umożliwia określenie, czy w widoku listy wiadomości e-mail mają być wyświetlane przypisane im kategorie.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Zawsze pokazuj pełną datę i godzinę. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Określa, czy w widoku listy wiadomości e-mail będzie wyświetlana nie tylko data otrzymania wiadomości, ale także godzina.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Pokaż rozmiar wiadomości. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.5.1.2"></a>Określa, czy w widoku listy wiadomości e-mail ma być wyświetlany rozmiar wiadomości.</p></li>
 </ul>
 <p>
               </p>
@@ -88,7 +89,7 @@
               </p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>oznaczanie jako przeczytane. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Określa czas, po którym wybrana wiadomość e-mail zostanie automatycznie oznaczona jako przeczytana. </p>
+<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>Oznacz jako przeczytane. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Określa czas, po którym wybrana wiadomość e-mail zostanie automatycznie oznaczona jako przeczytana. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.immediately"><b>Niezwłocznie. </b>Wiadomość e-mail zostanie natychmiast oznaczona jako przeczytana.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.seconds"><b>Po 5 sekundach, po 20 sekundach. </b>Wiadomość e-mail zostanie oznaczona jako przeczytana po wskazanym czasie.</p></li>
@@ -176,7 +177,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>Pokaż żądania potwierdzeń zwrotnych. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Określa, czy jest wyświetlane potwierdzenie zwrotne, jeśli otrzymana wiadomość e-mail zawiera prośbę o potwierdzenie odbioru.</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>Trwale usuwaj kasowane wiadomości e-mail. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Określa, czy wiadomości e-mail będą trwale usuwane, czy przenoszone do folderu kosza.</p>
-<p role="presentation"><span class="phrase"><strong>Ostrzeżenie:</strong></span> trwale usuniętych wiadomości e-mail nie można przywrócić.</p>
+<p role="presentation"><span class="phrase"><strong>Ostrzeżenie:</strong></span> w niektórych konfiguracjach trwale usuniętych wiadomości <span class="bold">nie</span> można odzyskać.</p>
 <p role="presentation">Zobacz <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Usuwanie wiadomości e-mail</a></p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.selectrecent"><b>Wybierz przy starcie automatycznie najnowszą wiadomość. </b><a class="indexterm" name="id-1.7.20.12.2.1.4.1.2"></a>Umożliwia określenie, czy po uruchomieniu aplikacji zostanie wybrana ostatnio czytana wiadomość.</p></li>
@@ -204,7 +205,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
@@ -224,7 +225,7 @@
             <a class="xref" href="ox.appsuite.user.sect.email.settings.html">Ustawienia poczty e-mail</a>
           </p>
 <p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a>
+            <a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a>
           </p>
 <p role="presentation">
             <a class="xref" href="ox.appsuite.user.sect.email.view.html">Wyświetlanie wiadomości e-mail</a>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.email.view.html b/help/l10n/pl_PL/ox.appsuite.user.sect.email.view.html
index 8cc0513ad..8061c469e 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.email.view.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.email.view.html
@@ -82,11 +82,10 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">Widok listy w aplikacji <span class="phrase">E-mail</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">E-mail</span></a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Praca z kategoriami skrzynki odbiorczej</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Wyświetlanie lub zapisywanie załączników wiadomości e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Wyświetlanie źródła wiadomości e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Oznaczanie wiadomości e-mail jako przeczytanych lub nieprzeczytanych</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.email.send.html b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.email.send.html
index 8de04f5eb..3f61f8163 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.email.send.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.email.send.html
@@ -49,7 +49,7 @@
 <p role="presentation">Możesz też kliknąć pozycję <span class="guibutton"><strong>Ustawienia</strong></span> w sekcji Uruchamianie aplikacji.</p>
 <p role="presentation">Pojawi siÄ™ okno <span class="guilabel"><strong>Ustawienia</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku.</p></li>
+<li class="step"><p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>S/MIME</strong></span> w prawym okienku.</p></li>
 <li class="step">
 <p role="presentation">Zaznacz opcję <span class="guibutton"><strong>Włącz S/MIME</strong></span>.</p>
 <p role="presentation">Jeśli szyfrowanie S/MIME ma być ustawione jako domyślne, włącz opcję <span class="guibutton"><strong>Używaj domyślnie S/MIME do podpisywania i szyfrowania</strong></span> w obszarze <span class="guibutton"><strong>Domyślne</strong></span>.</p>
@@ -75,7 +75,7 @@
 <li class="listitem"><p role="presentation">Aby umożliwić adresatowi wiadomości e-mail wysłanie zaszyfrowanej odpowiedzi, adresat musi mieć Twój klucz publiczny. Możesz go wysłać jako załącznik. Aby to zrobić, kliknij polecenie <span class="guibutton"><strong>Dołącz mój klucz publiczny</strong></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Jeśli używasz szyfrowania PGP:</p>
-<p role="presentation">Jeśli opcja <span class="guibutton"><strong>Pokaż ustawienia zaawansowane</strong></span> jest włączona w ustawieniach aplikacji <span class="phrase">Strażnik</span>, możesz ustawić format PGP.</p>
+<p role="presentation">Format PGP można ustawić, jeśli włączono opcję <span class="guibutton"><strong>Pokazuj ustawienia zaawansowane podczas tworzenia wiadomości</strong></span> w ustawieniach aplikacji <span class="phrase">Strażnik</span> w sekcji <span class="guibutton"><strong>Zaawansowane</strong></span>.</p>
 <p role="presentation">Domyślnie zaszyfrowane wiadomości e-mail są wysyłane w formacie <span class="guibutton"><strong>Mime</strong></span>. Niektóre starsze klienty poczty e-mail obsługują tylko format PGP/Inline. Jeśli adresat używa takiego klienta, włącz opcję <span class="guibutton"><strong>W tekście</strong></span>.</p>
 <p role="presentation">Uwaga: w przypadku użycia opcji <span class="guibutton"><strong>W tekście</strong></span> nie możesz wysyłać wiadomości e-mail w formacie HTML.</p>
 </li>
@@ -98,7 +98,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.read.html">Odczytywanie zaszyfrowanych konwersacji e-mail</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.external.html">Jak adresaci zewnętrzni mogą odczytać zaszyfrowaną wiadomość e-mail?</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowej wiadomości e-mail</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Wysyłanie nowych wiadomości e-mail</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji <span class="phrase">Strażnik</span></a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.email.send">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.guard.email.html">Szyfrowanie konwersacji e-mail</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.html b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.html
index 136910f57..b195f5669 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Szyfrowanie danych za pomocą aplikacji Strażnik">
-<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Zarządzanie hasłem">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Usuwanie funkcji resetowania hasła">
 <link rel="next" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Zarządzanie własnymi kluczami PGP">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Dalej</a></li>
@@ -44,9 +44,24 @@
 <p id="ox.appsuite.user.possibilities.guard.keys">Dostępne są następujące możliwości: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Zarządzanie własnymi kluczami PGP</a></p></li>
-<li class="listitem cap-smime" id="id-1.14.13.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Zarządzanie własnymi kluczami S/MIME</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">ZarzÄ…dzanie kluczami publicznymi</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Zarządzanie kluczami PGP odbiorców</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Zarządzanie własnymi kluczami S/MIME</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Zarządzanie kluczami S/MIME odbiorców</a></p></li>
 </ul>
+<p id="ox.appsuite.user.related.guard.keys">
+      </p>
+<p class="title">PowiÄ…zane tematy:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji <span class="phrase">Strażnik</span></a>
+          </p></li>
+</ul>
+<p>
+    </p>
+<p id="ox.appsuite.user.parent.guard.keys">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Szyfrowanie danych za pomocą aplikacji <span class="phrase">Strażnik</span></i></a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.pgppublickeys.html b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
index a94308fb3..344c2efa2 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
@@ -1,13 +1,13 @@
 <html lang="pl">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>ZarzÄ…dzanie kluczami publicznymi</title>
+<title>Zarządzanie kluczami PGP odbiorców</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="ZarzÄ…dzanie kluczami">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Zarządzanie własnymi kluczami S/MIME">
-<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Ustawienia aplikacji Strażnik">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Zarządzanie własnymi kluczami PGP">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Zarządzanie własnymi kluczami S/MIME">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Dalej</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Dalej</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,55 +33,36 @@
 </h1>
 <h2 class="sr-only">ZarzÄ…dzanie kluczami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.pgppublickeys">
-<div class="titlepage"><div><div><h3 class="title">ZarzÄ…dzanie kluczami publicznymi</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">Na stronie <span class="phrase"><span class="guilabel"><strong>Ustawienia zabezpieczeń aplikacji Strażnik</strong></span></span>    są dostępne następujące możliwości: </p>
+<div class="titlepage"><div><div><h3 class="title">Zarządzanie kluczami PGP odbiorców</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.8.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">Dostępne są następujące możliwości: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">wyświetlanie kluczy publicznych</p></li>
+<li class="listitem"><p role="presentation">wyświetlanie lub usuwanie kluczy publicznych</p></li>
 <li class="listitem"><p role="presentation">przesyłanie kluczy publicznych</p></li>
-<li class="listitem"><p role="presentation">usuwanie własnego klucza publicznego</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.guard.pgppublickeys">
-<p class="title">Jak używać funkcji zarządzania kluczami:</p>
+<p class="title">Jak wyświetlić klucze PGP odbiorcy:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
-<p role="presentation">Możesz też kliknąć pozycję <span class="guibutton"><strong>Ustawienia</strong></span> w sekcji Uruchamianie aplikacji.</p>
-<p role="presentation">Pojawi siÄ™ okno <span class="guilabel"><strong>Ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>Klucze PGP odbiorcy</strong></span> w prawym okienku.</p>
+<p role="presentation">Zostaną wyświetlone funkcje zarządzania kluczami PGP odbiorców.</p>
 </li>
 <li class="step">
-<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku.</p>
-<p role="presentation">Zostanie wyświetlona strona <span class="phrase"><span class="guilabel"><strong>Ustawienia zabezpieczeń aplikacji Strażnik</strong></span></span>Ustawienia zabezpieczeń aplikacji .</p>
-</li>
-<li class="step">
-<p role="presentation">Włącz opcję <span class="guibutton"><strong>Pokaż ustawienia zaawansowane</strong></span>.</p>
-<p role="presentation">Zostaną wyświetlone funkcje zarządzania kluczami.</p>
+<p role="presentation">Aby wyświetlić szczegóły klucza, kliknij jego identyfikator.</p>
+<p role="presentation">Aby usunąć klucz, kliknij ikonę <span class="guibutton"><strong>Usuń</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> widoczną obok klucza.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.display">
-<p class="title">Jak wyświetlić klucze publiczne:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
+<p class="title">Jak przesłać klucz publiczny odbiorcy:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Kliknij <span class="guibutton"><strong>Klucze publiczne adresatów</strong></span>. Pojawi się okno <span class="guilabel"><strong>Klucze publiczne</strong></span>.</p>
-<p role="presentation">Pojawią się klucze publiczne współużytkowane przez Ciebie lub innych użytkowników. Jeśli klucz publiczny użytkownika znajduje się na liście, możesz wysłać do tego użytkownika zaszyfrowaną wiadomość e-mail i zweryfikować podpisane wiadomości e-mail wysłane przez tego użytkownika.</p>
-</li>
-<li class="step">
-<p role="presentation">Aby wyświetlić szczegóły klucza, kliknij ikonę <span class="guibutton"><strong>Szczegóły</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> widoczną obok klucza. Pojawi się okno <span class="guilabel"><strong>Szczegóły klucza publicznego</strong></span>.</p>
-<p role="presentation">Klucze publiczne można udostępniać, włączając opcję <span class="guibutton"><strong>Udostępnij klucz</strong></span>. Inni użytkownicy mogą wyświetlać i pobierać udostępnione klucze. Klucze publiczne są dostępne tylko dla użytkowników oprogramowania do pracy grupowej.</p>
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>Klucze PGP odbiorcy</strong></span> w prawym okienku.</p>
 </li>
+<li class="step"><p role="presentation">Kliknij przycisk <span class="guibutton"><strong>Prześlij klucz odbiorcy</strong></span>. Wybierz plik z kluczem publicznym.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
-<p class="title">Jak przesłać klucz publiczny adresata w oknie <span class="guilabel"><strong>Klucze publiczne</strong></span>:</p>
-<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Dodaj</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.upload.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> widocznÄ… obok pozycji <span class="guilabel"><strong>Lista kluczy publicznych PGP</strong></span>. Wybierz plik z kluczem publicznym.</p></li></ul></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.delete">
-<p class="title">Jak usunąć klucz publiczny w oknie <span class="guilabel"><strong>Klucze publiczne</strong></span>:</p>
-<div class="procedure"><ul class="procedure"><li class="step">
-<p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Usuń</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> widoczną obok klucza publicznego.</p>
-<p role="presentation">Potwierdź, że chcesz usunąć własny klucz publiczny.</p>
-</li></ul></div>
-</div>
 <p id="ox.appsuite.user.related.guard.keys.pgppublickeys">
         </p>
 <p class="title">PowiÄ…zane tematy:</p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.smimepublickeys.html b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
new file mode 100644
index 000000000..6ca2a2b73
--- /dev/null
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
@@ -0,0 +1,85 @@
+<html lang="pl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Zarządzanie kluczami S/MIME odbiorców</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="podręcznik użytkownika">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="ZarzÄ…dzanie kluczami">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Zarządzanie własnymi kluczami S/MIME">
+<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Ustawienia aplikacji Strażnik">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Wróć</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Dalej</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Szyfrowanie danych za pomocą aplikacji <span class="phrase">Strażnik</span>
+</h1>
+<h2 class="sr-only">ZarzÄ…dzanie kluczami</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.keys.smimepublickeys">
+<div class="titlepage"><div><div><h3 class="title">Zarządzanie kluczami S/MIME odbiorców</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.10.2"></a><p id="ox.appsuite.user.concept.guard.keys.smimepublickeys">Dostępne są następujące możliwości: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">wyświetlanie kluczy publicznych</p></li>
+<li class="listitem"><p role="presentation">przesyłanie kluczy publicznych</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.smimepublickeys">
+<p class="title">Jak wyświetlić klucz S/MIME odbiorcy:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>Odbiorcy S/MIME</strong></span> w prawym okienku.</p>
+</li>
+<li class="step">
+<p role="presentation">Wpisz adres e-mail w polu <span class="guibutton"><strong>Szukaj certyfikatu</strong></span>. Kliknij <span class="guibutton"><strong>Szukaj</strong></span>.</p>
+<p role="presentation">Jeżeli znaleziono certyfikat, pojawią się jego dane.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.guard.keys.smimepublickeys.upload">
+<p class="title">Jak przesłać klucz publiczny odbiorcy:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>Odbiorcy S/MIME</strong></span> w prawym okienku.</p>
+</li>
+<li class="step"><p role="presentation">Kliknij <span class="guibutton"><strong>Prześlij certyfikat odbiorcy</strong></span>. Wybierz plik z kluczem publicznym.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.keys.smimepublickeys">
+        </p>
+<p class="title">PowiÄ…zane tematy:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Zarządzanie własnymi kluczami PGP</a>
+            </p>
+<p role="presentation" class="cap-smime">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Zarządzanie własnymi kluczami S/MIME</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a>
+            </p>
+</li></ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.keys.smimepublickeys">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Zarządzanie kluczami</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
index d11f43fb2..5e1a2f7ae 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="ZarzÄ…dzanie kluczami">
 <link rel="prev" href="ox.appsuite.user.sect.guard.keys.html" title="ZarzÄ…dzanie kluczami">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Zarządzanie własnymi kluczami S/MIME">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Zarządzanie kluczami PGP odbiorców">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Dalej</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Dalej</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,121 +34,93 @@
 <h2 class="sr-only">ZarzÄ…dzanie kluczami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yourpgpkeys">
 <div class="titlepage"><div><div><h3 class="title">Zarządzanie własnymi kluczami PGP</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.5.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">Na stronie <span class="phrase"><span class="guilabel"><strong>Ustawienia zabezpieczeń aplikacji Strażnik</strong></span></span>    są dostępne następujące możliwości: </p>
+<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">Dostępne są następujące możliwości: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">dodawanie nowych kluczy PGP</p></li>
 <li class="listitem"><p role="presentation">wyświetlanie własnych kluczy PGP, wyświetlanie szczegółów</p></li>
-<li class="listitem">
-<p role="presentation">dodawanie nowych kluczy PGP</p>
-<p role="presentation">Jeśli masz kilka kluczy, możesz zdefiniować, który z nich powinien być kluczem bieżącym. Klucz bieżący jest używany do szyfrowania danych.</p>
-</li>
-<li class="listitem">
-<p role="presentation">Dodawanie identyfikatorów użytkowników</p>
-<p role="presentation">Przy dodawaniu kolejnych identyfikatorów użytkownika do klucza możesz go wprowadzić do wielu kont e-mail.</p>
-</li>
-<li class="listitem"><p role="presentation">pobieranie kluczy</p></li>
-<li class="listitem"><p role="presentation">usuwanie kluczy</p></li>
+<li class="listitem"><p role="presentation">zarządzanie własnymi kluczami PGP: ustawianie kluczy jako bieżących, edytowanie identyfikatorów, odwoływanie, pobieranie, usuwanie </p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys">
-<p class="title">Jak używać funkcji zarządzania kluczami PGP:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.add">
+<p class="title">Jak dodać nowy klucz PGP:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
-<p role="presentation">Możesz też kliknąć pozycję <span class="guibutton"><strong>Ustawienia</strong></span> w sekcji Uruchamianie aplikacji.</p>
-<p role="presentation">Pojawi siÄ™ okno <span class="guilabel"><strong>Ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.addkey"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>Twoje klucze PGP</strong></span> w prawym okienku.</p>
 </li>
 <li class="step">
-<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku.</p>
-<p role="presentation">Zostanie wyświetlona strona <span class="phrase"><span class="guilabel"><strong>Ustawienia zabezpieczeń aplikacji Strażnik</strong></span></span>Ustawienia zabezpieczeń aplikacji .</p>
+<p role="presentation">Dostępne są następujące możliwości: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">Aby utworzyć nową parę kluczy, kliknij <span class="guibutton"><strong>Utwórz nowy</strong></span>. Pojawi się okno <span class="phrase"><span class="guilabel"><strong>Utwórz klucze zabezpieczenia Strażnik</strong></span></span>.</p>
+<p role="presentation">Wpisz hasło do nowego klucza i potwierdź je.</p>
+<p role="presentation">Nowy klucz składa się z klucza głównego i odpowiedniego klucza zależnego.</p>
 </li>
-<li class="step">
-<p role="presentation">Włącz opcję <span class="guibutton"><strong>Pokaż ustawienia zaawansowane</strong></span>.</p>
-<p role="presentation">Zostaną wyświetlone funkcje zarządzania kluczami.</p>
+<li class="listitem">
+<p role="presentation">Aby dodać istniejący klucz prywatny, kliknij <span class="guibutton"><strong>Prześlij prywatny klucz</strong></span>. Wybierz plik z kluczem prywatnym. Pojawi się okno <span class="guilabel"><strong>Prześlij prywatne klucze</strong></span>.</p>
+<p role="presentation">Aby przesłać nowy klucz, wpisz hasło zabezpieczające aplikacji <span class="phrase">Strażnik</span>. Wpisz nowe hasło do nowego klucza.</p>
+</li>
+<li class="listitem"><p role="presentation">Aby dodać istniejący klucz publiczny, kliknij przycisk <span class="guibutton"><strong>Prześlij publiczny klucz</strong></span>. Wybierz plik z kluczem publicznym.</p></li>
+</ul></p>
+<p role="presentation">Nowy klucz zostanie umieszczony na górze listy kluczy i stanie się automatycznie kluczem bieżącym.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.display">
-<p class="title">Jak wyświetlić własne klucze PGP lub ustawić klucz PGP jako bieżący:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.display">
+<p class="title">Jak wyświetlić własne istniejące klucze PGP:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Kliknij polecenie <span class="guibutton"><strong>Twoje klucze</strong></span> w obszarze <span class="guilabel"><strong>Klucze</strong></span>.</p>
-<p role="presentation" class="cap-smime">W niektórych konfiguracjach zostanie otwarte okno <span class="guilabel"><strong>Wybierz typ kluczy do zmiany</strong></span>. Wybierz <span class="guibutton"><strong>PGP</strong></span>.</p>
-<p role="presentation">Pojawi siÄ™ okno <span class="guilabel"><strong>Twoje klucze</strong></span>.</p>
-<p role="presentation">
-              <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Zostaną wyświetlone Twoje klucze PGP. Każdy klucz PGP składa się z klucza głównego i odpowiedniego podklucza. <ul class="itemizedlist" style="list-style-type: circle; ">
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>Twoje klucze PGP</strong></span> w prawym okienku.</p>
+<p role="presentation">Wyświetlone zostaną Twoje klucze PGP. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Nowy klucz składa się z klucza głównego i klucza zależnego. <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Klucz główny służy między innymi do podpisywania wiadomości e-mail.</p></li>
 <li class="listitem"><p role="presentation">Podklucz będzie służyć do szyfrowania i odszyfrowywania.</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">Przy odpowiedniej konfiguracji program <span class="phrase">Strażnik</span> automatycznie użyje klucza głównego lub zależnego.</p></li>
-</ul>
-            </p>
+</ul></p>
 </li>
-<li class="step"><p role="presentation">Jeśli lista kluczy ma zawierać więcej niż jeden klucz główny i zależny, możesz zdefiniować bieżący klucz. Aby to zrobić, kliknij przycisk <span class="guibutton"><strong>Bieżące</strong></span> obok głównego klucza. Od teraz szyfrowanie będzie realizowane za pomocą klucza bieżącego.</p></li>
-<li class="step"><p role="presentation">Aby wyświetlić szczegóły klucza, kliknij ikonę <span class="guibutton"><strong>Szczegóły</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> widoczną obok klucza. Pojawi się okno <span class="guilabel"><strong>Szczegóły klucza</strong></span>. Aby wyświetlić podpisy danego klucza, kliknij <span class="guibutton"><strong>Podpisy</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addkey">
-<p class="title">Jak dodać nowy klucz PGP w oknie <span class="guilabel"><strong>Twoje klucze</strong></span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Dodaj klucz użytkownika</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> widoczną obok elementu <span class="guibutton"><strong>Lista Twoich kluczy</strong></span>. Pojawi się okno <span class="guilabel"><strong>Dodawanie kluczy</strong></span>.</p></li>
 <li class="step">
-<p role="presentation">Dostępne są następujące możliwości: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-<p role="presentation">Aby dodać klucz prywatny, kliknij przycisk <span class="guibutton"><strong>Prześlij prywatny klucz</strong></span>. Wybierz plik z kluczem prywatnym. Pojawi się okno <span class="guilabel"><strong>Prześlij prywatne klucze</strong></span>.</p>
-<p role="presentation">Aby przesłać nowy klucz, wpisz hasło zabezpieczające aplikacji <span class="phrase">Strażnik</span>. Wpisz nowe hasło do nowego klucza.</p>
-</li>
-<li class="listitem"><p role="presentation">Aby dodać klucz publiczny, kliknij przycisk <span class="guibutton"><strong>Prześlij tylko klucz publiczny</strong></span>. Wybierz plik z kluczem publicznym.</p></li>
-<li class="listitem">
-<p role="presentation">Aby utworzyć nową parę kluczy, kliknij polecenie <span class="guibutton"><strong>Utwórz nowe klucze</strong></span>. Pojawi się okno <span class="phrase"><span class="guilabel"><strong>Utwórz nowe klucze aplikacji Strażnik</strong></span></span>.</p>
-<p role="presentation">Wpisz hasło do nowego klucza i potwierdź je.</p>
-<p role="presentation">Nowy klucz składa się z klucza głównego i odpowiedniego klucza zależnego.</p>
-</li>
-</ul></p>
-<p role="presentation">Nowy klucz zostanie umieszczony na górze listy kluczy i stanie się automatycznie kluczem bieżącym.</p>
+<p role="presentation">Aby wyświetlić szczegóły klucza, kliknij ikonę <span class="guibutton"><strong>Zarządzaj kluczami</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> obok klucza głównego. Pojawi się okno <span class="guilabel"><strong>Szczegóły klucza</strong></span>.</p>
+<p role="presentation">Aby wyświetlić podpisy pod kluczem, kliknij <span class="guibutton"><strong>Podpisy</strong></span>.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addaccount">
-<p class="title">Jak dodać kolejny identyfikator użytkownika w oknie <span class="guilabel"><strong>Twoje klucze</strong></span>:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.manage">
+<p class="title">Jak zarządzać istniejącymi kluczami PGP:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Edytuj identyfikatory</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addaccount.edit"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> widoczną obok klucza. Pojawi się okno <span class="guilabel"><strong>Dodaj ID użytkownika</strong></span>.</p></li>
 <li class="step">
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> na pasku menu. Kliknij polecenie <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>Twoje klucze PGP</strong></span> w prawym okienku.</p>
+<p role="presentation">Wyświetlone zostaną Twoje klucze PGP.</p>
+</li>
+<li class="step"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Zarządzaj kluczami</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> obok klucza głównego. Użyj następujących funkcji. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Jeśli lista kluczy ma zawierać więcej niż jeden klucz, możesz zdefiniować bieżący klucz. Aby to zrobić, kliknij przycisk <span class="guibutton"><strong>Oznacz jako bieżący</strong></span> obok klucza. Od teraz szyfrowanie będzie realizowane za pomocą klucza bieżącego.</p></li>
+<li class="listitem">
+<p role="presentation">Jeśli chcesz użyć klucza do innego konta e-mail, kliknij polecenie <span class="guibutton"><strong>Edytuj identyfikatory</strong></span>. Otworzy się okno <span class="guilabel"><strong>Dodaj identyfikator użytkownika</strong></span>.</p>
 <p role="presentation">Wpisz nazwę identyfikatora użytkownika i adres e-mail, którego chcesz użyć w tym kluczu.</p>
 <p role="presentation">Wpisz hasło do danego klucza.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.download">
-<p class="title">Jak pobrać klucz w oknie <span class="guilabel"><strong>Twoje klucze</strong></span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Pobierz</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> widocznÄ… obok klucza.</p></li>
-<li class="step">
+<li class="listitem">
+<p role="presentation">Aby pobrać klucz prywatny, kliknij <span class="guibutton"><strong>Pobierz</strong></span>.</p>
 <p role="presentation">Określ, czy pobrać tylko klucz prywatny, tylko klucz publiczny czy oba klucze.</p>
 <p role="presentation"><span class="phrase"><strong>Uwaga:</strong></span> klucz prywatny zostanie pobrany w postaci zaszyfrowanej. Nie należy jednak pobierać klucza prywatnego do systemu dostępnego publicznie.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.delete">
-<p class="title">Jak usunąć klucz w oknie <span class="guilabel"><strong>Twoje klucze</strong></span>:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Ostrzeżenie:</strong></span> w razie usunięcia klucza prywatnego nie będzie już można odszyfrowywać obiektów zaszyfrowanych za pomocą tego klucza. Jeśli nie masz pewności, co robić, nie usuwaj klucza, tylko go odwołaj. Odwołanego klucza nie można już używać do szyfrowania. Można go jednak użyć do odszyfrowania obiektów zaszyfrowanych za jego pomocą.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Usuń</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> widoczną obok klucza. Pojawi się okno <span class="guilabel"><strong>Usuń klucz prywatny</strong></span>.</p></li>
-<li class="step"><p role="presentation">Dostępne są następujące opcje:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Aby odwołać lub usunąć klucz prywatny, kliknij <span class="guibutton"><strong>Usuń</strong></span>. Pojawi się okno <span class="guilabel"><strong>Usuń klucz prywatny</strong></span>. Uwagi: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Jeśli odwołasz klucz, nie będzie on już używany. Będzie jednak nadal można odszyfrować obiekty zaszyfrowane za jego pomocą. Dlatego odwołanie klucza jest lepszym rozwiązaniem niż jego usunięcie.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Ostrzeżenie:</strong></span> Jeśli usuniesz klucz prywatny, stracisz możliwość odszyfrowywania obiektów zaszyfrowanych za jego pomocą.</p></li>
+</ul> <p role="presentation">Masz następujące możliwości:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
-<p role="presentation">Aby odwołać klucz prywatny, kliknij <span class="guibutton"><strong>Odwołaj</strong></span>. </p>
-<p role="presentation">Odwołany klucz nie będzie już używany. Będzie jednak nadal można odszyfrować obiekty zaszyfrowane za jego pomocą. Dlatego odwołanie klucza jest lepszym rozwiązaniem niż jego usunięcie.</p>
+<p role="presentation">Aby odwołać klucz prywatny, kliknij <span class="guibutton"><strong>Odwołaj</strong></span>.</p>
 <p role="presentation">Wprowadź hasło do klucza prywatnego. W razie potrzeby wybierz powód odwołania klucza.</p>
 <p role="presentation">Kliknij <span class="guibutton"><strong>Odwołaj</strong></span>.</p>
+<p role="presentation">Możesz także kliknąć <span class="guibutton"><strong>Odwołaj</strong></span> w menu.</p>
 </li>
 <li class="listitem">
-<p role="presentation">Aby usunąć klucz prywatny, kliknij <span class="guibutton"><strong>Usuń</strong></span>. </p>
-<p role="presentation"><span class="phrase"><strong>Ostrzeżenie:</strong></span> jeśli usuniesz klucz prywatny, nie będzie już można odszyfrować obiektów zaszyfrowanych za jego pomocą.</p>
+<p role="presentation">Aby usunąć klucz prywatny, kliknij <span class="guibutton"><strong>Usuń</strong></span>.</p>
 <p role="presentation">Wprowadź hasło do klucza prywatnego.</p>
 <p role="presentation">Kliknij przycisk <span class="guibutton"><strong>Usuń</strong></span>.</p>
 </li>
-</ul>Usunięcie klucza głównego spowoduje usunięcie również powiązanego z nim klucza zależnego.</p></li>
+</ul> Usunięcie klucza głównego spowoduje usunięcie również powiązanego z nim klucza zależnego.</p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yourpgpkeys">
@@ -156,7 +128,7 @@
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">ZarzÄ…dzanie kluczami publicznymi</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Zarządzanie kluczami PGP odbiorców</a>
             </p>
 <p role="presentation" class="cap-smime">
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Zarządzanie własnymi kluczami S/MIME</a>
@@ -167,7 +139,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yourpgpkeys">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Zarządzanie kluczami</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yourpgpkeys">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Zarządzanie kluczami</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
index da25d5c52..a7198062d 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="ZarzÄ…dzanie kluczami">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Zarządzanie własnymi kluczami PGP">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="ZarzÄ…dzanie kluczami publicznymi">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Zarządzanie kluczami PGP odbiorców">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Zarządzanie kluczami S/MIME odbiorców">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Dalej</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Dalej</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,46 +34,27 @@
 <h2 class="sr-only">ZarzÄ…dzanie kluczami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yoursmimekeys">
 <div class="titlepage"><div><div><h3 class="title">Zarządzanie własnymi kluczami S/MIME</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.6.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">Na stronie <span class="phrase"><span class="guilabel"><strong>Ustawienia zabezpieczeń aplikacji Strażnik</strong></span></span>    są dostępne następujące możliwości: </p>
+<a class="indexterm" name="id-1.14.13.9.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">Dostępne są następujące możliwości: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">dodawanie nowych kluczy S/MIME</p>
 <p role="presentation">Jeśli masz kilka kluczy, możesz zdefiniować, który z nich powinien być kluczem bieżącym. Klucz bieżący jest używany do szyfrowania danych.</p>
 </li>
 <li class="listitem"><p role="presentation">wyświetlanie własnych kluczy S/MIME, wyświetlanie szczegółów</p></li>
-<li class="listitem"><p role="presentation">pobieranie kluczy</p></li>
-<li class="listitem"><p role="presentation">usuwanie kluczy</p></li>
+<li class="listitem"><p role="presentation">zarządzanie własnymi kluczami S/MIME: ustawianie kluczy jako bieżących, edytowanie identyfikatorów, odwoływanie, pobieranie, usuwanie</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys">
-<p class="title">Jak używać funkcji zarządzania kluczami S/MIME:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
-<p role="presentation">Możesz też kliknąć pozycję <span class="guibutton"><strong>Ustawienia</strong></span> w sekcji Uruchamianie aplikacji.</p>
-<p role="presentation">Pojawi siÄ™ okno <span class="guilabel"><strong>Ustawienia</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku.</p>
-<p role="presentation">Zostanie wyświetlona strona <span class="phrase"><span class="guilabel"><strong>Ustawienia zabezpieczeń aplikacji Strażnik</strong></span></span>Ustawienia zabezpieczeń aplikacji .</p>
-</li>
-<li class="step">
-<p role="presentation">Aktywuj opcję <span class="guibutton"><strong>Włącz S/MIME</strong></span>.</p>
-<p role="presentation">Włącz opcję <span class="guibutton"><strong>Pokaż ustawienia zaawansowane</strong></span>.</p>
-<p role="presentation">Zostaną wyświetlone funkcje zarządzania kluczami.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.addkey">
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.add">
 <p class="title">Jak dodać nowy klucz S/MIME:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Kliknij <span class="guibutton"><strong>Twoje klucze</strong></span> w obszarze <span class="guibutton"><strong>Klucze</strong></span>. Pojawi siÄ™ okno <span class="guilabel"><strong>Wybierz typ kluczy do zmiany</strong></span>.</p>
-<p role="presentation">Wybierz <span class="guibutton"><strong>S/MIME</strong></span>. Pojawi siÄ™ okno <span class="guilabel"><strong>Twoje certyfikaty</strong></span>.</p>
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>S/MIME</strong></span> w prawym okienku.</p>
+<p role="presentation">Zaznacz opcję <span class="guibutton"><strong>Włącz S/MIME</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Dodaj</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> widoczną obok pozycji <span class="guilabel"><strong>Lista Twoich kluczy</strong></span>. Pojawi się okno <span class="guilabel"><strong>Prześlij klucze S/MIME</strong></span>.</p></li>
 <li class="step">
+<p role="presentation">Kliknij <span class="guibutton"><strong>Prześlij prywatny certyfikat</strong></span>. Pojawi się okno <span class="guilabel"><strong>Prześlij klucze S/MIME</strong></span>.</p>
 <p role="presentation">Wpisz następujące hasła: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Aby przesłać nowy klucz, wpisz hasło zabezpieczające aplikacji <span class="phrase">Strażnik</span>. Wpisz nowe hasło do nowego klucza.</p></li>
+<li class="listitem"><p role="presentation">W celu przesłania nowego klucza wpisz hasło zabezpieczające aplikacji <span class="phrase">Strażnik</span>.</p></li>
 <li class="listitem">
 <p role="presentation">Nowe hasło do szyfrowania wiadomości e-mail.</p>
 <p role="presentation">Potwierdź nowe hasło.</p>
@@ -85,48 +66,51 @@
 </ol></div>
 </div>
 <div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.display">
-<p class="title">Jak wyświetlić własne klucze S/MIME lub ustawić klucz S/MIME jako bieżący:</p>
+<p class="title">Jak wyświetlić własne klucze S/MIME:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Kliknij <span class="guibutton"><strong>Twoje klucze</strong></span> w obszarze <span class="guilabel"><strong>Klucze</strong></span>. Pojawi siÄ™ okno <span class="guilabel"><strong>Wybierz typ kluczy do zmiany</strong></span>.</p>
-<p role="presentation">Wybierz <span class="guibutton"><strong>S/MIME</strong></span>.</p>
-<p role="presentation">Pojawi się okno <span class="guilabel"><strong>Twoje certyfikaty</strong></span>. Zostaną wyświetlone Twoje klucze S/MIME.</p>
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>S/MIME</strong></span> w prawym okienku.</p>
+<p role="presentation">Zaznacz opcję <span class="guibutton"><strong>Włącz S/MIME</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Aby wyświetlić szczegóły klucza, kliknij ikonę <span class="guibutton"><strong>Zarządzaj kluczami</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> obok klucza. Pojawi się okno <span class="guilabel"><strong>Szczegóły klucza</strong></span>.</p>
+<p role="presentation">Aby wyświetlić podpisy pod kluczem, kliknij <span class="guibutton"><strong>Podpisy</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Jeśli lista kluczy ma zawierać więcej niż jeden klucz główny i zależny, możesz zdefiniować bieżący klucz. Aby to zrobić, kliknij przycisk <span class="guibutton"><strong>Bieżące</strong></span> obok głównego klucza. Od teraz szyfrowanie będzie realizowane za pomocą klucza bieżącego.</p></li>
-<li class="step"><p role="presentation">Aby wyświetlić szczegóły klucza, kliknij ikonę <span class="guibutton"><strong>Szczegóły</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> widoczną obok klucza. Pojawi się okno <span class="guilabel"><strong>Szczegóły klucza</strong></span>. Aby wyświetlić podpisy danego klucza, kliknij <span class="guibutton"><strong>Podpisy</strong></span>.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.download">
-<p class="title">Jak pobrać klucz w oknie <span class="guilabel"><strong>Twoje klucze</strong></span>:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.manage">
+<p class="title">Jak zarządzać własnym kluczami S/MIME:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Pobierz</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> widocznÄ… obok klucza.</p></li>
 <li class="step">
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>S/MIME</strong></span> w prawym okienku.</p>
+<p role="presentation">Zaznacz opcję <span class="guibutton"><strong>Włącz S/MIME</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Zarządzaj kluczami</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> obok klucza głównego. Użyj następujących funkcji. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Jeśli lista kluczy ma zawierać więcej niż jeden klucz, możesz zdefiniować bieżący klucz. Aby to zrobić, kliknij przycisk <span class="guibutton"><strong>Oznacz jako bieżący</strong></span> obok klucza. Od teraz szyfrowanie będzie realizowane za pomocą klucza bieżącego.</p></li>
+<li class="listitem">
+<p role="presentation">Aby pobrać klucz prywatny, kliknij <span class="guibutton"><strong>Pobierz</strong></span>.</p>
 <p role="presentation">Określ, czy pobrać tylko klucz prywatny, tylko klucz publiczny czy oba klucze.</p>
 <p role="presentation"><span class="phrase"><strong>Uwaga:</strong></span> klucz prywatny zostanie pobrany w postaci zaszyfrowanej. Nie należy jednak pobierać klucza prywatnego do systemu dostępnego publicznie.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.delete">
-<p class="title">Jak usunąć klucz w oknie <span class="guilabel"><strong>Twoje klucze</strong></span>:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Ostrzeżenie:</strong></span> w razie usunięcia klucza prywatnego nie będzie już można odszyfrowywać obiektów zaszyfrowanych za pomocą tego klucza. Jeśli nie masz pewności, co robić, nie usuwaj klucza, tylko go odwołaj. Odwołanego klucza nie można już używać do szyfrowania. Można go jednak użyć do odszyfrowania obiektów zaszyfrowanych za jego pomocą.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Kliknij ikonę <span class="guibutton"><strong>Usuń</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> widoczną obok klucza. Pojawi się okno <span class="guilabel"><strong>Usuń klucz prywatny</strong></span>.</p></li>
-<li class="step"><p role="presentation">Dostępne są następujące możliwości: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Aby odwołać lub usunąć klucz prywatny, kliknij <span class="guibutton"><strong>Usuń</strong></span> Pojawi się okno <span class="guilabel"><strong>Usuń klucz prywatny</strong></span>. Uwaga: <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Odwołany klucz nie będzie już używany. Nadal jednak będzie można odszyfrować obiekty zaszyfrowane za jego pomocą. Dlatego odwołanie klucza jest lepszym rozwiązaniem niż jego usunięcie.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Ostrzeżenie:</strong></span> w razie usunięcia klucza prywatnego nie będzie już można odszyfrowywać obiektów zaszyfrowanych za jego pomocą.</p></li>
+</ul> <p role="presentation">Dostępne są następujące możliwości:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">Aby odwołać klucz prywatny, kliknij <span class="guibutton"><strong>Odwołaj</strong></span>.</p>
-<p role="presentation">Odwołany klucz nie będzie już używany. Nadal jednak będzie można odszyfrować obiekty zaszyfrowane za jego pomocą. Dlatego odwołanie klucza jest lepszym rozwiązaniem niż jego usunięcie.</p>
 <p role="presentation">Wpisz hasło do klucza prywatnego. Jeśli jest to wymagane, wybierz powód odwołania klucza.</p>
 <p role="presentation">Kliknij <span class="guibutton"><strong>Odwołaj</strong></span>.</p>
+<p role="presentation">Możesz też kliknąć polecenie <span class="guibutton"><strong>Odwołaj</strong></span> w menu.</p>
 </li>
 <li class="listitem">
 <p role="presentation">Aby usunąć klucz prywatny, kliknij <span class="guibutton"><strong>Usuń</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Ostrzeżenie:</strong></span> w razie usunięcia klucza prywatnego nie będzie już można odszyfrowywać obiektów zaszyfrowanych za jego pomocą.</p>
 <p role="presentation">Wpisz hasło do klucza prywatnego.</p>
 <p role="presentation">Kliknij przycisk <span class="guibutton"><strong>Usuń</strong></span>.</p>
 </li>
 </ul></p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yoursmimekeys">
@@ -137,7 +121,7 @@
               <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Zarządzanie własnymi kluczami PGP</a>
             </p>
 <p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">ZarzÄ…dzanie kluczami publicznymi</a>
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Zarządzanie kluczami PGP odbiorców</a>
             </p>
 <p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a>
@@ -145,7 +129,7 @@
 </li></ul>
 <p>
       </p>
-<p id="ox.appsuite.user.parent.keys.yoursmimekeys">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Zarządzanie kluczami</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yoursmimekeys">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Zarządzanie kluczami</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.change.html b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.change.html
new file mode 100644
index 000000000..88524e20f
--- /dev/null
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.change.html
@@ -0,0 +1,75 @@
+<html lang="pl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Zmiana hasła</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="podręcznik użytkownika">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Zarządzanie hasłem">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Zarządzanie hasłem">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.reset.html" title="Resetowanie hasła">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Wróć</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.reset.html">Dalej</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Szyfrowanie danych za pomocą aplikacji <span class="phrase">Strażnik</span>
+</h1>
+<h2 class="sr-only">Zarządzanie hasłem</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.change">
+<div class="titlepage"><div><div><h3 class="title">Zmiana hasła</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.6.2"></a><a class="indexterm" name="id-1.14.12.6.3"></a><p role="presentation" class="cap-smime">W niektórych konfiguracjach zamiast PGP można używać do szyfrowania protokołu S/MIME. W przypadku standardów PGP i S/MIME będą używane osobne hasła.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.change">
+<p class="title">Jak zmienić hasło do aplikacji <span class="phrase">Strażnik</span>:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.change"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>Zarządzanie hasłem (PGP)</strong></span><span class="cap-smime"> lub <span class="guibutton"><strong>Zarządzanie hasłem (S/MIME)</strong></span></span> w prawym okienku.</p>
+</li>
+<li class="step">
+<p role="presentation">W polu <span class="guibutton"><strong>Stare hasło</strong></span> wprowadź hasło, którego do tej pory używano do szyfrowania danych.</p>
+<p role="presentation">W polu <span class="guibutton"><strong>Nowe hasło</strong></span> wprowadź hasło, którego chcesz od tej pory używać do szyfrowania danych.</p>
+<p role="presentation">Potwierdź hasło, wprowadzając je ponownie w polu <span class="guibutton"><strong>Potwierdź nowe hasło</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Kliknij <span class="guibutton"><strong>Zmień hasło</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.change">
+        </p>
+<p class="title">PowiÄ…zane tematy:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">Resetowanie hasła</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Usuwanie funkcji resetowania hasła</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">ZarzÄ…dzanie kluczami</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.change">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.deleterecovery.html b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.deleterecovery.html
new file mode 100644
index 000000000..5cee2a011
--- /dev/null
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.deleterecovery.html
@@ -0,0 +1,74 @@
+<html lang="pl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Usuwanie funkcji resetowania hasła</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="podręcznik użytkownika">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Zarządzanie hasłem">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.reset.html" title="Resetowanie hasła">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="ZarzÄ…dzanie kluczami">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.reset.html">Wróć</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Dalej</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Szyfrowanie danych za pomocą aplikacji <span class="phrase">Strażnik</span>
+</h1>
+<h2 class="sr-only">Zarządzanie hasłem</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.deleterecovery">
+<div class="titlepage"><div><div><h3 class="title">Usuwanie funkcji resetowania hasła</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.8.2"></a><p id="ox.appsuite.user.concept.guard.password.deleterecovery">Aby w razie potrzeby móc zresetować hasło, trzeba je zapisać na serwerze w wersji zaszyfrowanej. Jeśli nie chcesz, aby hasło było zapisane na serwerze, możesz usunąć funkcję odzyskiwania hasła.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
+<p class="title">Jak usunąć funkcję resetowania hasła:</p>
+<div class="taskprerequisites">
+          <p><span class="phrase"><strong>Ostrzeżenie:</strong></span> jeśli usuniesz funkcję resetowania hasła, zresetowanie hasła przestanie być możliwe. Jeśli więc później zdarzy Ci się zapomnieć hasło, nie odszyfrujesz zaszyfrowanych danych.</p>
+        </div>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.remove"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>Zaawansowane</strong></span> w prawym okienku.</p>
+</li>
+<li class="step"><p role="presentation">Kliknij widoczną poniżej nagłówka <span class="guibutton"><strong>Opcje resetowania</strong></span> opcję <span class="guibutton"><strong>Usuń opcję odzyskiwania hasła</strong></span>. Pojawi się okno <span class="guilabel"><strong>Usuń opcję odzyskiwania</strong></span>.</p></li>
+<li class="step"><p role="presentation">Kliknij przycisk <span class="guibutton"><strong>Usuń</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.deleterecovery">
+        </p>
+<p class="title">PowiÄ…zane tematy:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Zmiana hasła</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">Resetowanie hasła</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">ZarzÄ…dzanie kluczami</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.deleterecovery">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.html b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.html
index 1c1805f63..dc83a7361 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Szyfrowanie danych za pomocą aplikacji Strażnik">
 <link rel="prev" href="ox.appsuite.user.sect.guard.logout.html" title="Wylogowywanie się z aplikacji Strażnik">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="ZarzÄ…dzanie kluczami">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.change.html" title="Zmiana hasła">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.logout.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Dalej</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.change.html">Dalej</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,102 +33,24 @@
 </h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.password">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Zarządzanie hasłem</h2></div></div></div>
-<a class="indexterm" name="id-1.14.12.2"></a><a class="indexterm" name="id-1.14.12.3"></a><a class="indexterm" name="id-1.14.12.4"></a><a class="indexterm" name="id-1.14.12.5"></a><a class="indexterm" name="id-1.14.12.6"></a><p id="ox.appsuite.user.concept.guard.password">Dostępne są następujące możliwości: </p>
+<a class="indexterm" name="id-1.14.12.2"></a><p id="ox.appsuite.user.concept.guard.password"></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Zmiana hasła zabezpieczeń aplikacji <span class="phrase">Strażnik</span></p></li>
-<li class="listitem"><p role="presentation">W przypadku utraty hasła zabezpieczeń aplikacji <span class="phrase">Strażnik</span> można poprosić o tymczasowe hasło zabezpieczeń aplikacji <span class="phrase">Strażnik</span> w ramach procedury zresetowania hasła zabezpieczeń aplikacji <span class="phrase">Strażnik</span>.</p></li>
-<li class="listitem"><p role="presentation">Zdefiniowanie adresu e-mail na potrzeby zresetowania hasła.</p></li>
-<li class="listitem"><p role="presentation">Aby móc w razie potrzeby zresetować hasło, musi ono zostać zapisane na serwerze w wersji zaszyfrowanej. Jeśli nie chcesz, aby Twoje hasło zostało zapisane na serwerze, możesz usunąć opcję odzyskiwania hasła.</p></li>
-<li class="listitem cap-smime" id="id-1.14.12.7.1.5"><p role="presentation">W niektórych konfiguracjach do szyfrowanie można też użyć metody S/MIME, zamiast PGP. W takim przypadku dla PGP i S/MIME zostaną użyte osobne hasła.</p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Zmiana hasła</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">Resetowanie hasła</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Usuwanie funkcji resetowania hasła</a></p></li>
 </ul>
-<p> Uwaga: w pewnych konfiguracjach niektóre z tych funkcji mogą być niedostępne.</p>
-<div class="task help-hide-inline" id="ox.appsuite.user.task.guard.password">
-<p class="title">Jak otworzyć funkcje zarządzania hasłem:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
-<p role="presentation">Możesz też kliknąć pozycję <span class="guibutton"><strong>Ustawienia</strong></span> w sekcji Uruchamianie aplikacji.</p>
-<p role="presentation">Pojawi siÄ™ okno <span class="guilabel"><strong>Ustawienia</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku.</p>
-<p role="presentation">Zostanie wyświetlona strona <span class="phrase"><span class="guilabel"><strong>Ustawienia zabezpieczeń aplikacji Strażnik</strong></span></span>Ustawienia zabezpieczeń aplikacji .</p>
-<p role="presentation">Zostaną wyświetlone funkcje zarządzania hasłem.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.change">
-<p class="title">Jak zmienić hasło do aplikacji <span class="phrase">Strażnik</span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Kliknij <span class="guibutton"><strong>Zmień hasło</strong></span>.</p>
-<p role="presentation" class="cap-smime">W niektórych konfiguracjach zostanie otwarte okno <span class="guilabel"><strong>Wybierz typ kluczy do zmiany</strong></span>. W zależności od typu szyfrowania, dla którego chcesz zresetować hasło, wybierz <span class="guibutton"><strong>PGP</strong></span> lub <span class="guibutton"><strong>S/MIME</strong></span>. Zostanie otwarte okno <span class="guilabel"><strong>Resetowanie hasła</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">W polu <span class="phrase"><span class="guibutton"><strong>Wprowadź bieżące hasło zabezpieczające aplikacji Strażnik</strong></span></span> wpisz hasło, które do tej pory było używane do szyfrowania danych.</p>
-<p role="presentation">W polu <span class="phrase"><span class="guibutton"><strong>Wprowadź nowe hasło zabezpieczające aplikacji Strażnik</strong></span></span> wpisz hasło, którego od teraz chcesz używać do szyfrowania danych.</p>
-<p role="presentation">Potwierdź nowe hasło, wpisując je ponownie do pola <span class="phrase"><span class="guibutton"><strong>Potwierdź nowe hasło zabezpieczające aplikacji Strażnik</strong></span></span>.</p>
-</li>
-<li class="step"><p role="presentation">Kliknij polecenie <span class="guibutton"><strong>Zmień</strong></span>.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.reset">
-<p class="title">Jak zresetować hasło do aplikacji <span class="phrase">Strażnik</span>:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Kliknij <span class="guibutton"><strong>Resetuj hasło</strong></span>.</p>
-<p role="presentation" class="cap-smime">W niektórych konfiguracjach zostanie otwarte okno <span class="guilabel"><strong>Wybierz typ kluczy do zmiany</strong></span>. W zależności od typu szyfrowania, dla którego chcesz zresetować hasło, wybierz <span class="guibutton"><strong>PGP</strong></span> lub <span class="guibutton"><strong>S/MIME</strong></span>. Zostanie otwarte okno <span class="guilabel"><strong>Resetowanie hasła</strong></span>.</p>
-<p role="presentation">Kliknij przycisk <span class="guibutton"><strong>Resetuj</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">Na dodatkowy adres e-mail zostanie wysłane nowe hasło.</p>
-<p role="presentation">Jeśli nie został wprowadzony zapasowy adres e-mail, nowe hasło zostanie wysłane na podstawowy adres e-mail.</p>
-<p role="presentation">Nowe hasło od razu zostanie zastąpione bieżącym hasłem zabezpieczającym aplikacji <span class="phrase">Strażnik</span>. Należy je natychmiast <a class="link" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.task.guard.settings">zmienić</a>.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.secondarymail">
-<p class="title">Jak zmienić zapasowy adres e-mail na potrzeby resetowania hasła:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Kliknij <span class="guibutton"><strong>Ustaw adres e-mail do resetowania</strong></span>.</p>
-<p role="presentation" class="cap-smime">W niektórych konfiguracjach zostanie otwarte okno <span class="guilabel"><strong>Wybierz typ kluczy do zmiany</strong></span>. W zależności od typu szyfrowania, dla którego chcesz zresetować hasło, wybierz <span class="guibutton"><strong>PGP</strong></span> lub <span class="guibutton"><strong>S/MIME</strong></span>. Zostanie otwarte okno <span class="guilabel"><strong>Zapasowy adres e-mail</strong></span>.</p>
-</li>
-<li class="step">
-<p role="presentation">W polu <span class="phrase"><span class="guibutton"><strong>Wprowadź bieżące hasło zabezpieczające aplikacji Strażnik</strong></span></span> wpisz hasło, które do tej pory było używane do szyfrowania danych.</p>
-<p role="presentation">W polu <span class="guibutton"><strong>Wpisz nowy dodatkowy adres e-mail</strong></span> wpisz adres, na który otrzymasz hasło tymczasowe pozwalające na zresetowanie hasła zabezpieczającego aplikacji <span class="phrase">Strażnik</span>.</p>
-<p role="presentation">Wpisz ponownie adres e-mail do okna <span class="guibutton"><strong>Potwierdź adres e-mail</strong></span>.</p>
-<p role="presentation">Kliknij polecenie <span class="guibutton"><strong>Zmień adres e-mail</strong></span>.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
-<p class="title">Jak usunąć funkcję resetowania hasła:</p>
-<div class="taskprerequisites">
-        <p><span class="phrase"><strong>Ostrzeżenie:</strong></span> jeśli usuniesz funkcję resetowania hasła, zresetowanie hasła przestanie być możliwe. Jeśli więc później zdarzy Ci się zapomnieć hasło, nie odszyfrujesz zaszyfrowanych danych.</p>
-      </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Włącz opcję <span class="guibutton"><strong>Pokaż ustawienia zaawansowane</strong></span>.</p>
-<p role="presentation">Kliknij opcję <span class="guibutton"><strong>Usuń odzyskiwanie hasła</strong></span>. Pojawi się okno <span class="guilabel"><strong>Usuń odzyskiwanie</strong></span>.</p>
-</li>
-<li class="step"><p role="presentation">Kliknij przycisk <span class="guibutton"><strong>Usuń</strong></span>.</p></li>
-</ol></div>
-</div>
+<p> Uwaga: w niektórych konfiguracjach niektóre funkcje mogą być niedostępne.</p>
 <p id="ox.appsuite.user.related.guard.password">
       </p>
 <p class="title">PowiÄ…zane tematy:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Zarządzanie własnymi kluczami PGP</a>
-          </p>
-<p role="presentation" class="cap-smime">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Zarządzanie własnymi kluczami S/MIME</a>
-          </p>
-<p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">ZarzÄ…dzanie kluczami publicznymi</a>
-          </p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">ZarzÄ…dzanie kluczami</a>
+          </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji <span class="phrase">Strażnik</span></a>
+          </p></li>
+</ul>
 <p>
     </p>
 <p id="ox.appsuite.user.parent.guard.password">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Szyfrowanie danych za pomocą aplikacji <span class="phrase">Strażnik</span></i></a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.reset.html b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.reset.html
new file mode 100644
index 000000000..6c9580e94
--- /dev/null
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.password.reset.html
@@ -0,0 +1,91 @@
+<html lang="pl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Resetowanie hasła</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="podręcznik użytkownika">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Zarządzanie hasłem">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.change.html" title="Zmiana hasła">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Usuwanie funkcji resetowania hasła">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.change.html">Wróć</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Dalej</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Szyfrowanie danych za pomocą aplikacji <span class="phrase">Strażnik</span>
+</h1>
+<h2 class="sr-only">Zarządzanie hasłem</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.reset">
+<div class="titlepage"><div><div><h3 class="title">Resetowanie hasła</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.7.2"></a><a class="indexterm" name="id-1.14.12.7.3"></a><p id="ox.appsuite.user.concept.guard.password.reset">Dostępne są następujące możliwości: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">W przypadku utraty hasła do aplikacji <span class="phrase">Strażnik</span> można zażądać hasła tymczasowego do aplikacji <span class="phrase">Strażnik</span>. Służy do tego funkcja resetowania hasła do aplikacji <span class="phrase">Strażnik</span>.</p></li>
+<li class="listitem"><p role="presentation">Jak zdefiniować adres e-mail potrzebny do zresetowania hasła.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.password.reset">
+<p class="title">Jak zresetować hasło do aplikacji <span class="phrase">Strażnik</span>:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Kliknij ikonÄ™ <span class="guibutton"><strong>Ustawienia</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.reset"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> widocznÄ… na pasku menu. Kliknij <span class="guibutton"><strong>Wszystkie ustawienia</strong></span>.</p>
+<p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku. Kliknij <span class="guibutton"><strong>Zarządzanie hasłem (PGP)</strong></span><span class="cap-smime"> lub <span class="guibutton"><strong>Zarządzanie hasłem (S/MIME)</strong></span></span> w prawym okienku.</p>
+</li>
+<li class="step">
+<p role="presentation">Aby ustawić dodatkowy adres e-mail, na który zostanie przesłane hasło tymczasowe, kliknij <span class="guibutton"><strong>Ustaw adres e-mail do resetowania</strong></span>. Pojawi się okno <span class="guilabel"><strong>Zapasowy adres e-mail</strong></span>.</p>
+<p role="presentation">Wpisz bieżące hasło. Wpisz adres e-mail, którego chcesz użyć do zresetowania hasła.</p>
+</li>
+<li class="step">
+<p role="presentation">Kliknij <span class="guibutton"><strong>Resetuj hasło</strong></span>. Pojawi się okno <span class="guilabel"><strong>Resetowanie hasła</strong></span>.</p>
+<p role="presentation">Kliknij przycisk <span class="guibutton"><strong>Resetuj</strong></span>.</p>
+</li>
+</ol></div>
+<div class="taskrelated">
+          <p>Wynik: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">Na dodatkowy adres e-mail zostanie wysłane nowe hasło.</p>
+<p role="presentation">Jeśli nie został wprowadzony zapasowy adres e-mail, nowe hasło zostanie wysłane na podstawowy adres e-mail.</p>
+</li>
+<li class="listitem"><p role="presentation">Nowe hasło od razu zostanie bieżącym hasłem zabezpieczającym aplikacji <span class="phrase">Strażnik</span>. Należy je natychmiast zmienić.</p></li>
+</ul>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.reset">
+        </p>
+<p class="title">PowiÄ…zane tematy:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Zmiana hasła</a>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Usuwanie funkcji resetowania hasła</a>
+            </p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">ZarzÄ…dzanie kluczami</a>
+            </p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.guard.password.reset">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.settings.html b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.settings.html
index 2e464828c..0e6eead84 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.guard.settings.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.guard.settings.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Szyfrowanie danych za pomocą aplikacji Strażnik">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="ZarzÄ…dzanie kluczami publicznymi">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Zarządzanie kluczami S/MIME odbiorców">
 <link rel="next" href="ox.appsuite.user.index.html" title="Indeks">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.index.html">Dalej</a></li>
@@ -44,84 +44,170 @@
 </li>
 <li class="step"><p role="presentation">Kliknij <span class="phrase"><span class="guibutton"><strong>Strażnik</strong></span></span> w lewym okienku.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>Zostanie wyświetlona strona <span class="phrase"><span class="guilabel"><strong>Ustawienia zabezpieczeń aplikacji Strażnik</strong></span></span>Ustawienia zabezpieczeń aplikacji .</p>
-      </div>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings">Dostępne są następujące ustawienia:</p>
+<p id="ox.appsuite.user.reference.guard.settings">W pewnych konfiguracjach dostępne są następujące ustawienia:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.default">Ustawienia domyślne aplikacji <span class="phrase">Strażnik</span></a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.pgppasswords">Zarządzanie hasłem (PGP)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.smimepasswords">Zarządzanie hasłem (S/MIME)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yourpgpkeys">Twoje klucze PGP</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientpgpkeys">Klucze PGP odbiorcy</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yoursmime">S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientsmime">Odbiorcy S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.advanced">Zaawansowane</a></p></li>
+</ul>
+<p>Zobacz też: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Wyszukiwanie ustawień</a></p>
 <p id="ox.appsuite.user.reference.guard.settings.default"></p>
-<h3 class="title">Ustawienia domyślne</h3>
+<h3 class="title">Ustawienia domyślne aplikacji <span class="phrase">Strażnik</span>
+</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.encrypt"><b>Domyślnie podczas tworzenia wiadomości do wysłania w formie zaszyfrowanej. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>Określa, czy nowa wiadomość e-mail ma być domyślnie szyfrowana.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.sign"><b>Domyślne dodawanie podpisu do wychodzących wiadomości e-mail. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Określa, czy nowa wiadomość e-mail ma być domyślnie szyfrowana.</p></li>
-<li class="listitem cap-smime" id="id-1.14.14.7.2.1.3">
-<p id="ox.appsuite.user.task.guard.settings.default.smime"><b>Używaj domyślnie S/MIME do podpisywania i szyfrowania. </b><a class="indexterm" name="id-1.14.14.7.2.1.3.1.2"></a>
+<li class="listitem">
+<p id="ox.appsuite.user.reference.guard.settings.default.create"><b>Opcje tworzenia. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>
                 </p>
-<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p role="presentation">Umożliwia określenie, czy do podpisywania i szyfrowania domyślnie jest używana metoda S/MIME. </p></li></ul>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.encrypt"><b>Domyślnie podczas tworzenia wiadomości do wysłania w formie zaszyfrowanej. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.1.1.2"></a>Określa, czy nowa wiadomość e-mail ma być domyślnie szyfrowana.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.sign"><b>Domyślne dodawanie podpisu do wychodzących wiadomości e-mail. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.2.1.2"></a>Określa, czy nowa wiadomość e-mail ma być domyślnie szyfrowana.</p></li>
+<li class="listitem cap-smime" id="id-1.14.14.7.2.1.1.1.3.1.3">
+<p id="ox.appsuite.user.task.guard.settings.default.create.smime"><b>Używaj domyślnie S/MIME do podpisywania i szyfrowania. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.3.1.2"></a>
+                        </p>
+<ul class="itemizedlist" style="list-style-type: square; "><li class="listitem"><p role="presentation">Umożliwia określenie, czy do podpisywania i szyfrowania domyślnie jest używana metoda S/MIME.</p></li></ul>
 <p>
-              </p>
+                      </p>
 </li>
-<li class="listitem">
-<p id="ox.appsuite.user.task.guard.settings.default.inline"><b>Ustaw domyślnie w nowych wiadomościach PGP w tekście. </b><a class="indexterm" name="id-1.14.14.7.2.1.4.1.2"></a>Uwaga: ta opcja jest dostępna tylko wtedy, gdy jest zaznaczone pole wyboru <span class="guibutton"><strong>Ustawienia zaawansowane</strong></span>. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">Umożliwia określenie, czy do szyfrowania domyślnie jest używana metoda PGP/Inline.</p></li>
-<li class="listitem"><p role="presentation">Użyj tego ustawienia tylko wtedy, gdy klient poczty e-mail adresata nie obsługuje szyfrowania PGP. Dzięki opcji PGP/Inline adresat będzie mógł mimo wszystko odszyfrować wiadomość.</p></li>
-<li class="listitem"><p role="presentation">W przypadku użycia tego ustawienia nie można wysyłać wiadomości e-mail w formacie HTML.</p></li>
 </ul>
+<p>
+              </p>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Zapamiętaj ustawienia domyślne hasła. </b><a class="indexterm" name="id-1.14.14.7.2.1.5.1.2"></a>Określa domyślny zakres czasowy pamiętania hasła do aplikacji <span class="phrase">Strażnik</span>. Możesz zmienić to ustawienie domyślne, gdy pojawi się monit w aplikacji <span class="phrase">Strażnik</span>.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Zapamiętaj ustawienia domyślne hasła. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Określa domyślny zakres czasowy pamiętania hasła do aplikacji <span class="phrase">Strażnik</span>. Możesz zmienić to ustawienie domyślne, gdy pojawi się monit w aplikacji <span class="phrase">Strażnik</span>.</p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.pgppasswords"></p>
+<h3 class="title">Zarządzanie hasłem (PGP)</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Zawiera funkcje umożliwiające zmianę lub zresetowanie hasła PGP.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Zobacz <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a></p></li>
 </ul>
 <p>
       </p>
-<p id="ox.appsuite.user.reference.guard.settings.password"></p>
-<h3 class="title">Zarządzanie hasłem</h3>
+<div id="ox.appsuite.user.reference.guard.settings.smimepasswords" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.smimepasswords"></p>
+<h3 class="title">Zarządzanie hasłem (S/MIME)</h3>
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">Zawiera funkcje umożliwiające zmianę lub zresetowanie hasła.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Zawiera funkcje umożliwiające zmianę lub zresetowanie hasła S/MIME.</p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">Zobacz <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Zarządzanie hasłem</a></p></li>
 </ul>
 <p>
       </p>
-<div id="ox.appsuite.user.reference.guard.settings.smime" class="cap-smime">
-<p id="ox.appsuite.user.reference.guard.settings.smime"></p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.yourpgpkeys"></p>
+<h3 class="title">Twoje klucze PGP</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Zawiera funkcje umożliwiające zarządzanie kluczami PGP.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Zobacz <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Zarządzanie własnymi kluczami PGP</a></p></li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.reference.guard.settings.recipientpgpkeys"></p>
+<h3 class="title">Klucze PGP odbiorcy</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Zawiera funkcje umożliwiające zarządzanie kluczami PGP u odbiorców.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Zobacz <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Zarządzanie kluczami PGP odbiorców</a></p></li>
+</ul>
+<p>
+      </p>
+<div id="ox.appsuite.user.reference.guard.settings.yoursmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.yoursmime"></p>
 <h3 class="title">S/MIME</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.smime.enable"><b>Włącz S/MIME. </b><a class="indexterm" name="id-1.14.14.9.2.1.1.1.2"></a>Umożliwia określenie, czy można wysyłać i odbierać wiadomości e-mail z szyfrowaniem S/MIME.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">Zawiera funkcje umożliwiające zarządzanie szyfrowaniem typu S/MIME.</p>
+<p role="presentation">Zobacz <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">ZarzÄ…dzanie kluczami</a></p>
+</li></ul>
 <p>
       </p>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings.extended"></p>
+<div id="ox.appsuite.user.reference.guard.settings.recipientsmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.recipientsmime"></p>
+<h3 class="title">Odbiorcy S/MIME</h3>
+<p>
+        </p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Zawiera funkcje umożliwiające wyświetlanie i dodawanie certyfikatów odbiorców typu S/MIME. </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Zobacz <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">ZarzÄ…dzanie kluczami</a></p></li>
+</ul>
+<p>
+      </p>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.advanced"></p>
 <h3 class="title">Zaawansowane</h3>
 <p>
         </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<p id="ox.appsuite.user.reference.guard.settings.extended.advanced"><b>Ustawienia zaawansowane. </b><a class="indexterm" name="id-1.14.14.10.2.1.1.1.2"></a>W przypadku włączenia opcji <span class="guibutton"><strong>Pokaż ustawienia zaawansowane</strong></span> dostępne są niżej wymienione ustawienia i funkcje. </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
+<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Pamięć podręczna poczty</strong></span></p>
-<p role="presentation">Umożliwia określenie, czy odszyfrowana wiadomość e-mail jest przechowywana w pamięci podręcznej przeglądarki w czytelnym formacie po wyświetleniu innej wiadomości e-mail lub przełączeniu na inną aplikację z pakietu oprogramowania do pracy grupowej.</p>
-<p role="presentation">Aby usunąć odszyfrowaną wiadomość e-mail z pamięci podręcznej przeglądarki, włącz opcję <span class="guibutton"><strong>Nie przechowuj wiadomości e-mail w odszyfrowanej formie</strong></span>.</p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.email"><b>Pokaż zaawansowane ustawienia tworzenia wiadomości. </b>
+                </p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<a class="indexterm" name="id-1.14.14.14.2.1.1.1.2.1.1.1"></a><p role="presentation">Po włączeniu tej opcji możesz skorzystać z kolejnych funkcji dostępnych podczas wysyłania zaszyfrowanych wiadomości e-mail.</p>
+<p role="presentation">Zobacz <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Wysyłanie zaszyfrowanych wiadomości e-mail</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Sekcja <span class="guibutton"><strong>Klucze</strong></span></p>
-<p role="presentation">Zarządzanie własnymi kluczami, kluczami publicznymi lub kluczami Autocrypt</p>
-<p role="presentation">Zobacz <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">ZarzÄ…dzanie kluczami</a></p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.inline"><b>Ustaw domyślnie w nowych wiadomościach PGP w tekście. </b><a class="indexterm" name="id-1.14.14.14.2.1.2.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Umożliwia określenie, czy do szyfrowania domyślnie jest używana metoda PGP/Inline.</p></li>
+<li class="listitem"><p role="presentation">Użyj tego ustawienia tylko wtedy, gdy klient poczty e-mail adresata nie obsługuje szyfrowania PGP. Dzięki opcji PGP/Inline adresat będzie mógł mimo wszystko odszyfrować wiadomość.</p></li>
+<li class="listitem"><p role="presentation">W przypadku użycia tego ustawienia nie można wysyłać wiadomości e-mail w formacie HTML.</p></li>
+</ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Sekcja <span class="guibutton"><strong>Autocrypt</strong></span></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.autocrypt"><b>Ustawienie automatycznego szyfrowania. </b><a class="indexterm" name="id-1.14.14.14.2.1.3.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
 <p role="presentation">Konfiguruje działanie funkcji Autocrypt dla przychodzących wiadomości e-mail oraz przesyłanie kluczy Autocrypt do innych klientów.</p>
 <p role="presentation">Zobacz <a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">Szyfrowanie konwersacji e-mail przy użyciu protokołu Autocrypt</a></p>
+</li></ul>
+<p>
+              </p>
 </li>
 <li class="listitem">
-<p role="presentation">Podczas wysyłania zaszyfrowanych wiadomości e-mail dostępne są dodatkowe opcje.</p>
-<p role="presentation">Zobacz <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Wysyłanie zaszyfrowanych wiadomości e-mail</a></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.cache"><b>Pamięć podręczna poczty. </b><a class="indexterm" name="id-1.14.14.14.2.1.4.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation">Umożliwia określenie, czy odszyfrowana wiadomość e-mail jest przechowywana w pamięci podręcznej przeglądarki w czytelnym formacie po wyświetleniu innej wiadomości e-mail lub przełączeniu na inną aplikację z pakietu oprogramowania do pracy grupowej.</p>
+<p role="presentation">Aby usunąć odszyfrowaną wiadomość e-mail z pamięci podręcznej przeglądarki, włącz opcję <span class="guibutton"><strong>Nie przechowuj wiadomości e-mail w odszyfrowanej formie</strong></span>.</p>
+</li></ul>
+<p>
+              </p>
 </li>
-</ul>
+<li class="listitem">
+<p id="ox.appsuite.user.task.guard.settings.advanced.reset"><b>Opcje resetowania. </b><a class="indexterm" name="id-1.14.14.14.2.1.5.1.2"></a>
+                </p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation"><span class="guibutton"><strong>Usuń opcję odzyskiwania hasła</strong></span>. Usuwa funkcję odzyskiwania utraconego hasła.</p>
+<p role="presentation"><span class="phrase"><strong>Ostrzeżenie:</strong></span> jeśli usuniesz funkcję resetowania hasła, zresetowanie hasła przestanie być możliwe. Jeśli więc później zdarzy Ci się zapomnieć hasło, nie odszyfrujesz zaszyfrowanych danych.</p>
+<p role="presentation">Zobacz <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Usuwanie funkcji resetowania hasła</a></p>
 </li></ul>
+<p>
+              </p>
+</li>
+</ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.guard.settings">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Szyfrowanie danych za pomocą aplikacji <span class="phrase">Strażnik</span></i></a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.settings.commonsettings.html b/help/l10n/pl_PL/ox.appsuite.user.sect.settings.commonsettings.html
index 07f9ba4e7..b9748de4c 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.settings.commonsettings.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.settings.commonsettings.html
@@ -165,7 +165,7 @@
               </p>
 </li>
 <li class="listitem cap-deputy" id="id-1.4.6.11.2.1.3">
-<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Zarządzanie zastępcami. </b>
+<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Zarządzaj zastępcami. </b>
                 </p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Zobacz <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Zarządzanie zastępcami</a></p></li></ul>
 <p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.settings.notificationarea.html b/help/l10n/pl_PL/ox.appsuite.user.sect.settings.notificationarea.html
index 7b3211d44..fa84a318d 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.settings.notificationarea.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.settings.notificationarea.html
@@ -61,10 +61,10 @@
 <li class="listitem"><p role="presentation">Aby wyświetlić propozycję zaproszenia na spotkanie w kalendarzu, kliknij datę.</p></li>
 <li class="listitem"><p role="presentation">Aby zaakceptować lub odrzucić zaproszenie, kliknij odpowiedni przycisk.</p></li>
 </ul></p>
-<p role="presentation" class="feat-io-ox-core-managedResources">Otrzymawszy prośbę o rezerwację zasobu zarządzanego, można skorzystać z następujących funkcji: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Aby wyświetlić prośbę o rezerwację w kalendarzu zasobu, kliknij datę.</p></li>
+<p role="presentation" class="feat-io-ox-core-managedResources">Po odebraniu prośby o rezerwację zasobów zarządzanych można skorzystać z następujących funkcji: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Aby wyświetlić żądanie rezerwacji w kalendarzu zasobów, kliknij datę.</p></li>
 <li class="listitem"><p role="presentation">Aby zaakceptować lub odrzucić prośbę o rezerwację, kliknij odpowiedni przycisk.</p></li>
-</ul></p>
+</ul> </p>
 <p role="presentation">Jeśli są jakieś zadania z przekroczonym terminem, można skorzystać z następujących funkcji: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Aby wyświetlić szczegóły w wyskakującym okienku, kliknij przypomnienie.</p></li>
 <li class="listitem"><p role="presentation">Aby edytować zadanie, użyj funkcji dostępnych w wyskakującym okienku.</p></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.settings.notifications.html b/help/l10n/pl_PL/ox.appsuite.user.sect.settings.notifications.html
index 6c3d258bb..7af5d944e 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.settings.notifications.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.settings.notifications.html
@@ -60,7 +60,7 @@
 <p>
         </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>Pokazuj powiadomienia na pulpicie. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Wskazuje, czy na pulpicie mają się pojawiać powiadomienia o przychodzących wiadomościach e-mail, jeśli oprogramowanie do pracy grupowej działa w tle.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>Pokaż powiadomienia na pulpicie. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Wskazuje, czy na pulpicie mają się pojawiać powiadomienia o przychodzących wiadomościach e-mail, jeśli oprogramowanie do pracy grupowej działa w tle.</p></li>
 <li class="listitem">
 <p role="presentation">W zależności od ustawień przeglądarki może być wyświetlany przycisk <span class="guibutton"><strong>Zarządzaj uprawnieniami przeglądarki</strong></span>. Kliknij przycisk. Przeglądarka zapyta, czy zezwolić na odbiór powiadomień. Przyznaj to uprawnienie.</p>
 <p role="presentation">Uwaga: aby powyższe ustawienie zaczęło działać, w niektórych przeglądarkach może być konieczne zezwolenie na odbiór powiadomień w ustawieniach przeglądarki. Informacje na ten temat można znaleźć na stronach pomocy przeglądarki.</p>
@@ -98,9 +98,9 @@
 <p id="ox.appsuite.user.reference.settings.notifications.calendar.email"><b>Powiadomienia e-mail. </b>Określa, czy masz otrzymać powiadomienie e-mail w następujących sytuacjach: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.changes"><b>Otrzymuj powiadomienia o utworzeniu, zmodyfikowaniu lub usunięciu spotkania, w którym uczestniczysz. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.1.1.2"></a>Spotkanie, w którym uczestniczysz, zostało ponownie utworzone, zmienione lub usunięte.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>Otrzymywanie powiadomienia jako twórca spotkania po przyjęciu lub odrzuceniu zaproszenia przez uczestnika. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Uczestnik zaakceptował lub odrzucił zaproszenie na utworzone przez Ciebie spotkanie.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>otrzymuj powiadomienia jako uczestnik spotkania po przyjęciu lub odrzuceniu zaproszenia przez innego uczestnika. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>Uczestnik zaakceptował lub odrzucił zaproszenie na spotkanie, w którym uczestniczysz.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>Automatyczne usuwanie wiadomości e-mail z zaproszeniem po jego przyjęciu lub odrzuceniu. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Określa, czy powiadomienie e-mail o zaproszeniu na spotkanie zostanie automatycznie usunięte po przyjęciu lub odrzuceniu zaproszenia. Zobacz <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Odpowiadanie na zaproszenia na spotkanie</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>Otrzymuj powiadomienia jako twórca spotkania po przyjęciu lub odrzuceniu zaproszenia przez uczestnika. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Uczestnik zaakceptował lub odrzucił zaproszenie na utworzone przez Ciebie spotkanie.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>Otrzymuj powiadomienia jako uczestnik spotkania po przyjęciu lub odrzuceniu zaproszenia przez innego uczestnika. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>Uczestnik zaakceptował lub odrzucił zaproszenie na spotkanie, w którym uczestniczysz.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>Usuń automatycznie wiadomość e-mail z zaproszeniem po jego przyjęciu lub odrzuceniu. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Określa, czy powiadomienie e-mail o zaproszeniu na spotkanie zostanie automatycznie usunięte po przyjęciu lub odrzuceniu zaproszenia. Zobacz <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Odpowiadanie na zaproszenia na spotkanie</a></p></li>
 </ul>
 </li>
 </ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.settings.search.html b/help/l10n/pl_PL/ox.appsuite.user.sect.settings.search.html
index 45b87c359..27696b061 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.settings.search.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.settings.search.html
@@ -80,6 +80,9 @@
 <p role="presentation" class="cap-infostore">
             <a class="xref" href="ox.appsuite.user.sect.drive.settings.html">Ustawienia aplikacji <span class="phrase">Pliki</span></a>
           </p>
+<p role="presentation" class="cap-guard">
+            <a class="xref" href="ox.appsuite.user.sect.guard.settings.html">Ustawienia aplikacji <span class="phrase">Strażnik</span></a>
+          </p>
 </li>
 </ul>
 <p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.detailview.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.detailview.html
index a36c0cda4..28ce97bed 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.detailview.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.detailview.html
@@ -55,7 +55,7 @@
 <li class="listitem"><p role="presentation">Temat zadania</p></li>
 <li class="listitem"><p role="presentation">Data przypomnienia zadania, jeśli zostało ustawione</p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.7.10.4.1.5">
-<p role="presentation">Przypisane kategorie</p>
+<p role="presentation">przypisane kategorie</p>
 <p role="presentation">Kliknięcie kategorii powoduje wyszukanie zadań, do których ta kategoria została przypisana.</p>
 </li>
 <li class="listitem"><p role="presentation">Parametry cykliczności (w przypadku zadania cyklicznego)</p></li>
@@ -70,7 +70,7 @@
 <li class="listitem"><p role="presentation">data rozpoczęcia</p></li>
 <li class="listitem"><p role="presentation">definicja</p></li>
 <li class="listitem"><p role="presentation">informacje rozliczeniowe</p></li>
-<li class="listitem"><p role="presentation">załączniki</p></li>
+<li class="listitem"><p role="presentation">Załączniki</p></li>
 <li class="listitem">
 <p role="presentation">imiona i nazwiska uczestników</p>
 <p role="presentation">Po kliknięciu nazwiska pojawi się wyskakujące okienko z <span class="guibutton"><strong>widokiem halo</strong></span> uczestnika.</p>
@@ -87,14 +87,11 @@
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Widok listy w aplikacji <span class="phrase">Zadania</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.create.html">Okno edycji</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Wyświetlanie zadań</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Wyświetlanie lub zapisywanie załączników do zadań</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">Łączenie się z uczestnikami zadania</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">ZarzÄ…dzanie zadaniami</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Wyświetlanie kontaktów w widoku halo</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.gui.detailview">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Składniki aplikacji <span class="phrase">Zadania</span></a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.foldertree.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.foldertree.html
index ed379387b..aa9fab6b3 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.foldertree.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.foldertree.html
@@ -59,6 +59,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Wyświetlanie zadań</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Dodawanie list zadań</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">ZarzÄ…dzanie zadaniami</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">ZarzÄ…dzanie danymi z folderami</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.list.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.list.html
index 12d8f2705..f888fe797 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.list.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.list.html
@@ -59,17 +59,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.list.html">Widok listy</a></p></li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.settingsmenu.html">Menu Ustawienia aplikacji <span class="phrase">Zadania</span></a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.detailview.html">Widok szczegółów aplikacji <span class="phrase">Zadania</span></a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Wyświetlanie zadań</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Wyświetlanie lub zapisywanie załączników do zadań</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">ZarzÄ…dzanie zadaniami</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.list">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Składniki aplikacji <span class="phrase">Zadania</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.settingsmenu.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
index f98321a0f..e21e6c86a 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
@@ -53,10 +53,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.menubar.html">Pasek menu</a></p></li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Widok listy w aplikacji <span class="phrase">Zadania</span></a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subskrybowanie publicznych i udostępnionych list zadań</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subskrybowanie publicznych i udostępnionych list zadań</a></p></li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.settingsmenu">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Składniki aplikacji <span class="phrase">Zadania</span></a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.toolbar.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.toolbar.html
index c37d66c0e..bd843d349 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.toolbar.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.gui.toolbar.html
@@ -60,13 +60,7 @@
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Edycja zadań</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Zmienianie terminu zadania</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Oznaczanie zadań jako wykonanych</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Przenoszenie zadań do innego folderu</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Zmienianie potwierdzeń zadań</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Eksportowanie zadań</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.print.html">Drukowanie zadań</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.delete.html">Usuwanie zadań</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">ZarzÄ…dzanie zadaniami</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.toolbar">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">Składniki aplikacji <span class="phrase">Zadania</span></a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.categories.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.categories.html
new file mode 100644
index 000000000..91c9380d6
--- /dev/null
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.categories.html
@@ -0,0 +1,103 @@
+<html lang="pl">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Używanie kategorii w odniesieniu do zadań</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="podręcznik użytkownika">
+<link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="ZarzÄ…dzanie zadaniami">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Zmienianie terminu zadania">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Przenoszenie zadań do innego folderu">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Wróć</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Dalej</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+    <span class="phrase">Zadania</span>
+    
+    
+    
+  </h1>
+<h2 class="sr-only">ZarzÄ…dzanie zadaniami</h2>
+<div class="sect2" id="ox.appsuite.user.sect.tasks.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Używanie kategorii w odniesieniu do zadań</h3></div></div></div>
+<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.categories">Za pomocą kategorii można porządkować zadania bez korzystania z folderów. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Można oznaczać zadania kategoriami.</p></li>
+<li class="listitem"><p role="presentation">Można wyświetlać wszystkie zadania oznaczone określoną kategorią.</p></li>
+</ul>
+<p> Można tworzyć, edytować lub usuwać własne kategorie — zobacz sekcję <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Zarządzanie kategoriami</a>.</p>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories">
+<p class="title">Jak oznaczyć zadania kategorią:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Wybierz zadanie. Kliknij na pasku narzędzi ikonę <span class="guibutton"><strong>Edytuj zadanie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.mark.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>.</p>
+<p role="presentation">Otworzy siÄ™ okno edycji zadania.</p>
+</li>
+<li class="step">
+<p role="presentation">W tym celu kliknij <span class="guibutton"><strong>Dodaj kategoriÄ™</strong></span> obok pozycji <span class="guibutton"><strong>Kategorie</strong></span>. Wybierz kategoriÄ™.</p>
+<p role="presentation">Aby usunąć kategorię z zadania, kliknij widoczną obok niej ikonę <span class="guibutton"><strong>Usuń kategorię</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories.view">
+<p class="title">Jak wyświetlić zadania oznaczone określoną kategorią:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Wybierz zadanie oznaczone kategoriÄ….</p></li>
+<li class="step"><p role="presentation">Kliknij kategorię w widoku szczegółów.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Wynik: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">W widoku listy pojawiÄ… siÄ™ wszystkie zadania oznaczone tÄ… kategoriÄ….</p></li>
+<li class="listitem"><p role="presentation">Aby wyświetlić poprzednią listę, kliknij ikonę <span class="guibutton"><strong>Anuluj wyszukiwanie</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> w polu wyszukiwania.</p></li>
+</ul>
+          <p>Wskazówka: kategorię można też znaleźć przy użyciu opcji wyszukiwania.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.tasks.manage.categories">
+        </p>
+<p class="title">PowiÄ…zane tematy:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">ZarzÄ…dzanie kategoriami</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Wyszukiwanie zadań</a>
+            </p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail">
+              <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Ustaw domyślne stosowanie PGP Inline w przypadku nowych wiadomości e-mail</a>
+            </p>
+<p role="presentation" class="cap-calendar">
+              <a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">używanie kategorii w odniesieniu do spotkań</a>
+            </p>
+<p role="presentation" class="cap-contacts">
+              <a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Używanie kategorii w odniesieniu do kontaktów</a>
+            </p>
+</li>
+</ul>
+<p>
+      </p>
+<p id="ox.appsuite.user.parent.tasks.manage.categories">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Zarządzanie zadaniami</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.changeduedate.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.changeduedate.html
index 22efc327a..b06ce51b7 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.changeduedate.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.changeduedate.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="ZarzÄ…dzanie zadaniami">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="Oznaczanie zadań jako wykonanych">
-<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Przenoszenie zadań do innego folderu">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Używanie kategorii w odniesieniu do zadań">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Dalej</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Dalej</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -48,7 +48,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changeduedate"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Zadania</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Zadania</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Widok listy w aplikacji <span class="phrase">Zadania</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.changestatus.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.changestatus.html
index b53db00a3..fe53b093d 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.changestatus.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.changestatus.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie zadaniami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.changestatus">
 <div class="titlepage"><div><div><h3 class="title">Zmienianie potwierdzeń zadań</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.10.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Jeśli jesteś uczestnikiem zadania, możesz później zmienić swoje potwierdzenie tego zadania. Możesz też dodać komentarz, który będzie widoczny dla innych uczestników zadania.</p>
+<a class="indexterm" name="id-1.10.15.11.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Jeśli jesteś uczestnikiem zadania, możesz później zmienić swoje potwierdzenie tego zadania. Możesz też dodać komentarz, który będzie widoczny dla innych uczestników zadania.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.changestatus">
 <p class="title">Jak zmienić potwierdzenie:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changestatus"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Zadania</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Zadania</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Widok listy w aplikacji <span class="phrase">Zadania</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.delete.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.delete.html
index a03ec249e..081906b27 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.delete.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.delete.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie zadaniami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Usuwanie zadań</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Ostrzeżenie:</strong></span> usuniętych zadań <span class="phrase"><strong>nie</strong></span> można przywrócić.</p>
+<a class="indexterm" name="id-1.10.15.15.2"></a><a class="indexterm" name="id-1.10.15.15.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Ostrzeżenie:</strong></span> usuniętych zadań <span class="phrase"><strong>nie</strong></span> można przywrócić.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.delete">
 <p class="title">Jak usunąć zadania:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -50,9 +50,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.delete">
         </p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Zadania</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Widok listy w aplikacji <span class="phrase">Zadania</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.delete">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Zarządzanie zadaniami</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.export.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.export.html
index 7ee2c9d3c..88da1babb 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.export.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.export.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie zadaniami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Eksportowanie zadań</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">Zadania można eksportować w formacie iCal. Pozwala to na wymianę zadań z innymi aplikacjami kalendarza. Można wyeksportować zarówno wybrane zadanie, jak i wszystkie zadania z folderu.</p>
+<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><a class="indexterm" name="id-1.10.15.13.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">Zadania można eksportować w formacie iCal. Pozwala to na wymianę zadań z innymi aplikacjami kalendarza. Można wyeksportować zarówno wybrane zadanie, jak i wszystkie zadania z folderu.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.export.selected">
 <p class="title">Jak wyeksportować jedno zadanie:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -63,12 +63,16 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.export"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Zadania</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">Zadania</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Zadania</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Widok listy w aplikacji <span class="phrase">Zadania</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importowanie zadań</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.10.15.12.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Pobieranie danych osobowych</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.10.15.13.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Pobieranie danych osobowych</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.manage.export">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Zarządzanie zadaniami</a></p>
 </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.html
index b7940e8a3..e372cbefd 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.html
@@ -41,6 +41,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Oznaczanie zadań jako wykonanych</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Zmienianie terminu zadania</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Używanie kategorii w odniesieniu do zadań</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Przenoszenie zadań do innego folderu</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Zmienianie potwierdzeń zadań</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importowanie zadań</a></p></li>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.import.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.import.html
index 8201ccc5f..d26225be4 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.import.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.import.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie zadaniami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importowanie zadań</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.11.2"></a><a class="indexterm" name="id-1.10.15.11.3"></a><a class="indexterm" name="id-1.10.15.11.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">Istnieje możliwość importowania zadań z plików w formacie iCal.</p>
+<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">Istnieje możliwość importowania zadań z plików w formacie iCal.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.import">
 <p class="title">Jak zaimportować zadania z pliku iCal:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -54,19 +54,15 @@
           <p>Wynik: zadania zostanÄ… dodane do folderu.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.related.tasks.manage.import">
-        </p>
+<p id="ox.appsuite.user.related.tasks.manage.import"></p>
+<p class="title">Interfejs użytkownika:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">Zadania</span></a></p></li></ul>
+<p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Eksportowanie zadań</a>
-            </p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation">
-              <a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Tworzenie zadań</a>
-            </p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Eksportowanie zadań</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Tworzenie zadań</a></p></li>
 </ul>
-<p>
-      </p>
 <p id="ox.appsuite.user.parent.tasks.manage.import">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Zarządzanie zadaniami</a></p>
 </div>
           </div>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.markasdone.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.markasdone.html
index 4657c4aef..acc2a36d7 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.markasdone.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.markasdone.html
@@ -51,7 +51,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.markasdone"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Zadania</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Zadania</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Widok listy w aplikacji <span class="phrase">Zadania</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.move.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.move.html
index a6458a95c..976d2b19d 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.move.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.move.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="podręcznik użytkownika">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="ZarzÄ…dzanie zadaniami">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Zmienianie terminu zadania">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Używanie kategorii w odniesieniu do zadań">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.changestatus.html" title="Zmienianie potwierdzeń zadań">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Informacja Prawna">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Przełącz nawigację</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Wróć</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Wróć</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Strona startowa</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Spis treści</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Dalej</a></li>
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie zadaniami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Przenoszenie zadań do innego folderu</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">Możesz przenieść zadania do innego folderu</p>
+<a class="indexterm" name="id-1.10.15.10.2"></a><a class="indexterm" name="id-1.10.15.10.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">Możesz przenieść zadania do innego folderu</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.move">
 <p class="title">Jak przenieść zadania do innego folderu:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 <p id="ox.appsuite.user.tip.tasks.manage.move">Wskazówka: wybrane obiekty można też przenieść przez przeciągnięcie ich do folderu z widoku folderów.</p>
 <p id="ox.appsuite.user.related.tasks.manage.move"></p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Zadania</span></a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">Widok folderów w aplikacji <span class="phrase">Zadania</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Zadania</span></a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Widok listy w aplikacji <span class="phrase">Zadania</span></a></p>
+</li></ul>
 <p> </p>
 <p class="title">PowiÄ…zane tematy:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">Dodawanie osobistych list zadań</a></p></li></ul>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.print.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.print.html
index 560df8399..9c1c779e1 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.print.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.manage.print.html
@@ -38,7 +38,7 @@
 <h2 class="sr-only">ZarzÄ…dzanie zadaniami</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Drukowanie zadań</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">Możesz wydrukować dane jednego zadania lub wielu zadań.</p>
+<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">Możesz wydrukować dane jednego zadania lub wielu zadań.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.print.data">
 <p class="title">Jak wydrukować dane zadania:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,9 +51,14 @@
 <p id="ox.appsuite.user.related.tasks.manage.print">
         </p>
 <p class="title">Interfejs użytkownika:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">
               <a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">Pasek narzędzi aplikacji <span class="phrase">Zadania</span></a>
-            </p></li></ul>
+            </p>
+<p role="presentation">
+              <a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html">Widok listy w aplikacji <span class="phrase">Zadania</span></a>
+            </p>
+</li></ul>
 <p>
       </p>
 <p id="ox.appsuite.user.parent.tasks.manage.print">Temat nadrzędny: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Zarządzanie zadaniami</a></p>
diff --git a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.search.html b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.search.html
index 7c9408ebd..c7ca4aec0 100644
--- a/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.search.html
+++ b/help/l10n/pl_PL/ox.appsuite.user.sect.tasks.search.html
@@ -90,7 +90,7 @@
             <a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Wyświetlanie zadań</a>
           </p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation">
-            <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">ZarzÄ…dzanie kategoriami</a>
+            <a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Używanie kategorii w odniesieniu do zadań</a>
           </p></li>
 </ul>
 <p>
diff --git a/help/l10n/tr_TR/bk01-toc.html b/help/l10n/tr_TR/bk01-toc.html
index 104125d01..91c9a1c31 100644
--- a/help/l10n/tr_TR/bk01-toc.html
+++ b/help/l10n/tr_TR/bk01-toc.html
@@ -63,8 +63,8 @@
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.search.html">Ayar Arama</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.commonsettings.html">Genel Ayarları Düzenleme</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a></li>
-<li class="sect1 feat-io-ox-core-countdown"><a href="ox.appsuite.user.sect.settings.countdown.html">Randevular için Geri Sayımı Kullanma</a></li>
-<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">Bildirim alanını kullanma</a></li>
+<li class="sect1 feat-io-ox-core-countdown"><a href="ox.appsuite.user.sect.settings.countdown.html">Randevular için geri sayım kullanma</a></li>
+<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">bildirim alanını kullanma</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.personaldata.html">Kişisel İletişim Bilgilerini Değiştirme</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.wizard.html">Yerel Uygulamaları Sihirbaz Yardımıyla Ayarlama</a></li>
 <li class="sect1 cap-switchboard"><a href="ox.appsuite.user.sect.settings.presencestatus.html">Uygunluk durumunu ayarlama</a></li>
@@ -124,7 +124,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.new.html">Yeni e-posta düğmesi</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">E-posta</span> klasör görünümü</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html"><span class="phrase">E-posta</span> sekme çubuğu</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">Gelen kutusu kategorileri çubuğu</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.popup.html"><span class="phrase">E-posta</span> açılır pencere</a></li>
@@ -134,13 +134,13 @@
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.view.html">E-postaları Görüntüleme</a></li>
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.attachments.html">E-posta Eklerini Görüntüleme ve Kaydetme</a></li>
 <li class="sect1 cap-webmail">
-<a href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a><ul>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">Gönderen adresi seçme</a></li>
+<a href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a><ul>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">gönderen adresi seçme</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.replyto.html">Yanıt ayarlama</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">Dosya ekleme</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">dosya ekleme</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Mevcut e-postalardan dosya ekleme</a></li>
-<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">Ekleri bağlantı olarak gönderme</a></li>
+<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">ekleri bağlantı olarak gönderme</a></li>
 <li class="sect2 feat-io-ox-core-templates"><a href="ox.appsuite.user.sect.email.send.templates.html">Şablonları kullanma</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.signatures.html">İmzaları kullanma</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.reply.html">E-postaları yanıtlama</a></li>
@@ -164,6 +164,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.movecopy.html">E-postaları taşıma ve kopyalama</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.mark.html">E-postaları okundu veya okunmadı olarak işaretleme</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.collectaddress.html">Adresleri toplama</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">Yeni e-postalarda varsayılan olarak PGP inline kullan</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.label.html">E-postaları kategorize etme</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.source.html">E-posta kaynağını gösterme</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.draft.html">E-posta taslaklarını kullanma</a></li>
@@ -175,6 +176,9 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.print.html">E-postaları yazdırma</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.archive.html">E-postaları arşivleme</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.delete.html">E-postaları silme</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.recover.html">E-postaları kurtarma</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-postaları silme</a></li>
+<li class="sect2 cap-dumpster"><a href="ox.appsuite.user.sect.email.manage.undelete.html">Kalıcı olarak silinmiş e-postaları kurtarma</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-posta klasörlerini temizleme</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Birleşik e-postayı kullanma</a></li>
 </ul>
@@ -223,7 +227,7 @@
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.attachments.html">Randevu Eklerini Görüntüleme ve Kaydetme</a></li>
 <li class="sect1 cap-calendar">
-<a href="ox.appsuite.user.sect.calendar.add.html">randevu oluÅŸturma</a><ul>
+<a href="ox.appsuite.user.sect.calendar.add.html">Randevu oluÅŸturma</a><ul>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.create.html">Yeni randevu oluÅŸturma</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.datepicker.html">Tarih seçiciyi kullanma</a></li>
 <li class="sect2 cap-calendar cap-switchboard"><a href="ox.appsuite.user.sect.calendar.add.call.html">Sesli/görüntülü görüşme planlama</a></li>
@@ -232,12 +236,12 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.alarms.html">Randevu anımsatıcılarını kullanma</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.participants.html">Katılımcı veya kaynak ekleme</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attachments.html">Dosya ekleme</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.followup.html">Takip randevusu oluÅŸturma</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">Katılımcıları yeni bir randevuya davet etme</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.recipients.html">E-posta alıcılarını yeni randevulara davet etme</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.icalattachment.html">iCal eklerinden randevu oluÅŸturma</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">çakışmaları çözme</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Çakışmaları çözme</a></li>
 </ul>
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.invitation.html">Randevu Davetlerini Yanıtlama</a></li>
@@ -258,6 +262,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Randevu anımsatıcılarını değiştirme</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Organizatörü değiştirme</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.timezones.html">Favori saat dilimlerini yönetme</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">Randevular için kategorileri kullanma</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.colors.html">Takvim renklerini kullanma</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.move.html">Randevuları başka bir takvime taşıma</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.import.html">Randevuları içe aktarma</a></li>
@@ -340,6 +345,7 @@
 <a href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Adres defteri içinden e-posta gönderme</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">KiÅŸileri bir randevuya davet etme</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">Kişiler için kategorileri kullanma</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Kişileri taşıma ve kopyalama</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Kişileri vCard olarak gönderme</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.import.html">Kişileri içe aktarma</a></li>
@@ -388,6 +394,7 @@
 <a href="ox.appsuite.user.sect.tasks.manage.html">Görevleri Yönetme</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Görevleri bitmiş olarak işaretleme</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Bir görevin bitiş tarihini değiştirme</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">Görevler için kategorileri kullanma</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.move.html">Görevleri başka bir klasöre taşıma</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Görev onaylarını değiştirme</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.import.html">Görevleri içe aktarma</a></li>
@@ -485,7 +492,7 @@
 </ul>
 </li>
 <li class="sect1 cap-deputy">
-<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vekilleri Yönetme</a><ul>
+<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">vekilleri yönet</a><ul>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.add.html">Vekil ekleme</a></li>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">Vekilleri görüntüleme, düzenleme, silme</a></li>
 </ul>
@@ -547,22 +554,29 @@
 </ul>
 </li>
 <li class="sect1 cap-guard">
-<a href="ox.appsuite.user.sect.guard.documents.html">Office belgelerini ÅŸifreleme</a><ul>
+<a href="ox.appsuite.user.sect.guard.documents.html">Office Belgelerini Åžifreleme</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.createencrypted.html">ÅžifrelenmiÅŸ yeni belge oluÅŸturma</a></li>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Seçili belgeleri şifrelenmiş biçimde kaydetme</a></li>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.documents.open.html">Şifrelenmiş belgeleri açma</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.logout.html"><span class="phrase">Guard</span>'dan Çıkış Yapma</a></li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a></li>
+<li class="sect1 cap-guard">
+<a href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a><ul>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.change.html">Parola deÄŸiÅŸtirme</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.reset.html">parolayı sıfırlama</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Parola sıfırlama işlevini kaldırma</a></li>
+</ul>
+</li>
 <li class="sect1 cap-guard">
 <a href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Kendi PGP anahtarlarınızı yönetme</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Alıcıların PGP anahtarlarını yönetme</a></li>
 <li class="sect2 cap-smime"><a href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">S/MIME anahtarlarınızı yönetme</a></li>
-<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Ortak anahtarları yönetme</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Alıcıların S/MIME anahtarlarını yönetme</a></li>
 </ul>
 </li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Ayarları</a></li>
+<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Ayarları</a></li>
 </ul>
 </li>
 <li class="index"><a href="ox.appsuite.user.index.html">Dizin</a></li>
diff --git a/help/l10n/tr_TR/index.html b/help/l10n/tr_TR/index.html
index 18447438c..b7837844d 100644
--- a/help/l10n/tr_TR/index.html
+++ b/help/l10n/tr_TR/index.html
@@ -34,7 +34,7 @@
 </h3></div></div>
 <div><p class="copyright">Telif Hakkı ©  OX Software GmbH</p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">Yasal Uyarı</a></div>
-<div><p class="pubdate"> 14 Kasım 2023 Salı, Sürüm 8.19.0</p></div>
+<div><p class="pubdate"> 21 Aralık 2023 Perşembe, Sürüm 8.20.0</p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">Yardım Konularına Genel Bakış</h2>
@@ -60,13 +60,20 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Ayar Arama</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Genel Ayarları Düzenleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için Geri Sayımı Kullanma</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Bildirim alanını kullanma</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için geri sayım kullanma</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">bildirim alanını kullanma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Yerel Uygulamaları Sihirbaz Yardımıyla Ayarlama</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.3.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Uygunluk durumunu ayarlama</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Hesapları Yönetme</a></p></li>
 </ul>
 </li>
+<li class="listitem" id="ox.appsuite.user.startpage.toc.keyboard" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.chap.keyboard.html"><i>Klavye GiriÅŸi</i></a></p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.keyboard.navigation.html">Klavye ile Gezinme</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.keyboard.shortkeys.html">Klavye Kısayollarını Kullanma</a></p></li>
+</ul>
+</li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.portal" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.chap.portal.html"><i><span class="phrase">Portal</span></i></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -80,16 +87,16 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">E-posta</span> BileÅŸenleri</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-postaları Görüntüleme</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.5.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">Yapay zekâ entegrasyonunu kullanma</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Göndereni veya başka Bir alıcıyı arama</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.6.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">Yapay zekâ entegrasyonunu kullanma</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Göndereni veya başka Bir alıcıyı arama</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">E-posta Klasörleri Ekleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">E-posta Filtrelerini Kullanma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">E-postalarda Arama</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.5.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Vekil Olarak E-posta Gönderme ve Alma</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Vekil Olarak E-posta Gönderme ve Alma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">E-posta Hesapları Ekleme</a></p></li>
-<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.5.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p></li>
+<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-calendar" id="ox.appsuite.user.startpage.toc.calendar">
@@ -97,19 +104,19 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">Takvim</span> BileÅŸenleri</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Randevuları Görüntüleme</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluÅŸturma</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluÅŸturma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Randevu Davetlerini Yanıtlama</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Randevuları Düzenleme</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Randevu Katılımcılarını Arama</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Randevu Katılımcılarını Arama</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.html">Takvim Ekleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a></p></li>
-<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.6.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Kaynak Takvimleri Kullanma</a></p></li>
+<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.7.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Kaynak Takvimleri Kullanma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Randevu Arama</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Vekil Olarak Randevu Oluşturma, Düzenleme ve Yönetme</a></p></li>
-<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">Grupları Kullanma</a></p></li>
-<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.6.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">Kaynakları Kullanma</a></p></li>
-<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.6.1.15"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">Yönetilen Kaynakları Kullanma</a></p></li>
-<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.6.1.16"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.7.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Vekil Olarak Randevu Oluşturma, Düzenleme ve Yönetme</a></p></li>
+<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.7.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">Grupları Kullanma</a></p></li>
+<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">Kaynakları Kullanma</a></p></li>
+<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.7.1.15"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">Yönetilen Kaynakları Kullanma</a></p></li>
+<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.7.1.16"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-contacts" id="ox.appsuite.user.startpage.toc.contacts">
@@ -118,16 +125,16 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">Adres Defteri</span> BileÅŸenleri</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Bir adres defterindeki kişileri görüntüleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Kişileri veya Kaynakları Bir Adres Defterinden Otomatik Olarak Ekleme</a></p></li>
-<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Kişileri veya Kaynakları Bir Adres Dizininden Otomatik Olarak Ekleme</a></p></li>
+<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.8.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Kişileri veya Kaynakları Bir Adres Dizininden Otomatik Olarak Ekleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">KiÅŸi Ekleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.html">Dağıtım Listeleri Ekleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Kişileri ve Dağıtım Listelerini Düzenleme</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">KiÅŸileri arama</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.8.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">KiÅŸileri arama</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adres Defteri Ekleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.managesubscribed.html">Adres defteri aboneliklerini yenileme ve yönetme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">KiÅŸi Arama</a></p></li>
-<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Adres Defteri Ayarları</a></p></li>
+<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.8.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Adres Defteri Ayarları</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-tasks" id="ox.appsuite.user.startpage.toc.tasks">
@@ -154,18 +161,18 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Dosyaları ve <span class="phrase">Drive</span> Klasörlerini Yönetme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.search.html">Dosya ve Klasör Arama</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Depolama Hesabı Ekleme</a></p></li>
-<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.9.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span> Ayarları</a></p></li>
+<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.10.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span> Ayarları</a></p></li>
 </ul>
 </li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.dataorganisation" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>Veri Organizasyonu ve Paylaşımlar</i></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Klasörleri Kullanarak Verileri Yönetme</a></p></li>
-<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.10.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Veri PaylaÅŸma</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.10.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vekilleri Yönetme</a></p></li>
+<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.11.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Veri PaylaÅŸma</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.11.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">vekilleri yönet</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Hesapları Yönetme</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.10.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.10.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Kişisel Verileri İndirme</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.11.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.11.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Kişisel Verileri İndirme</a></p></li>
 </ul>
 </li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.security" style="list-style-type: none">
@@ -174,7 +181,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Otomatik Çıkış Yapma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.emaillinkedimages.html">E-postalardaki Dış Bağlantılı Resimler</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.sessions.html">Aktif İstemcileri Görüntüleme ve Oturumlarını Kapatma</a></p></li>
-<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.11.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Çok Faktörlü Kimlik Doğrulama</a></p></li>
+<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.12.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Çok Faktörlü Kimlik Doğrulama</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-guard" id="ox.appsuite.user.startpage.toc.guard">
@@ -184,11 +191,11 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.html">E-posta Yazışmalarını Şifreleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">E-posta Yazışmalarını Autocrypt ile Şifreleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Dosyaları Şifreleme ve Şifrelerini Çözme</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office belgelerini ÅŸifreleme</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office Belgelerini Åžifreleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.logout.html"><span class="phrase">Guard</span>'dan Çıkış Yapma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Ayarları</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Ayarları</a></p></li>
 </ul>
 </li>
 </ul>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.chap.calendar.html b/help/l10n/tr_TR/ox.appsuite.user.chap.calendar.html
index d2270ee9b..f70770e48 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.chap.calendar.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.chap.calendar.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="index.html" title="Kullanım Kılavuzu">
-<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="E-posta Ayarları">
+<link rel="prev" href="ox.appsuite.user.sect.email.mailfilter.apply.html" title="Bir kuralı mevcut e-postalara uygulama">
 <link rel="next" href="ox.appsuite.user.sect.calendar.gui.html" title="Takvim BileÅŸenleri">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.mailfilter.apply.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.gui.html">Sonraki</a></li>
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">Takvim</span> BileÅŸenleri</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Randevuları Görüntüleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.attachments.html">Randevu Eklerini Görüntüleme ve Kaydetme</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluÅŸturma</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluÅŸturma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Randevu Davetlerini Yanıtlama</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Randevuları Düzenleme</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.8.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Randevu Katılımcılarını Arama</a></p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/tr_TR/ox.appsuite.user.chap.dataorganisation.html
index 831722329..660d3aed8 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.chap.dataorganisation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="index.html" title="Kullanım Kılavuzu">
-<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="Windows'ta WebDAV kurulumu">
+<link rel="prev" href="ox.appsuite.user.sect.drive.settings.html" title="Drive Ayarları">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.folder.html" title="Klasörleri Kullanarak Verileri Yönetme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.settings.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.folder.html">Sonraki</a></li>
@@ -35,7 +35,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Klasörleri Kullanarak Verileri Yönetme</a></p></li>
 <li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.12.2.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Veri PaylaÅŸma</a></p></li>
-<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vekilleri Yönetme</a></p></li>
+<li class="listitem cap-deputy" id="id-1.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">vekilleri yönet</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Hesapları Yönetme</a></p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.12.2.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li>
 <li class="listitem cap-dataexport" id="id-1.12.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Kişisel Verileri İndirme</a></p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.chap.drive.html b/help/l10n/tr_TR/ox.appsuite.user.chap.drive.html
index 56829dd8e..4b2a082ad 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.chap.drive.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="index.html" title="Kullanım Kılavuzu">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.search.html" title="Görevlerde Arama Yapma">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.delete.html" title="Görevleri silme">
 <link rel="next" href="ox.appsuite.user.sect.drive.gui.html" title="Drive BileÅŸenleri">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.search.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.delete.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.drive.gui.html">Sonraki</a></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.chap.email.html b/help/l10n/tr_TR/ox.appsuite.user.chap.email.html
index a7232d72e..1a529a587 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.chap.email.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.chap.email.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">E-posta</span> BileÅŸenleri</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-postaları Görüntüleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">E-posta Eklerini Görüntüleme ve Kaydetme</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">Yapay zekâ entegrasyonunu kullanma</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.7.7.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Göndereni veya başka Bir alıcıyı arama</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">E-posta Klasörleri Ekleme</a></p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.chap.guard.html b/help/l10n/tr_TR/ox.appsuite.user.chap.guard.html
index ed4a3ac88..1548f03ea 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.chap.guard.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="index.html" title="Kullanım Kılavuzu">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="Doğrulama yöntemlerini yönetme">
+<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="Otomatik Çıkış Yapma">
 <link rel="next" href="ox.appsuite.user.sect.guard.setup.html" title="Guard kurulumu">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.autologout.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.setup.html">Sonraki</a></li>
@@ -45,11 +45,11 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.html">E-posta Yazışmalarını Şifreleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">E-posta Yazışmalarını Autocrypt ile Şifreleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Dosyaları Şifreleme ve Şifrelerini Çözme</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office belgelerini ÅŸifreleme</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office Belgelerini Åžifreleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.logout.html"><span class="phrase">Guard</span>'dan Çıkış Yapma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Ayarları</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Ayarları</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.guard">Güvenlikle ilgili diğer konuları <a class="xref" href="ox.appsuite.user.chap.security.html"><i>Veri Güvenliği</i></a> bölümünde bulabilirsiniz.</p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.chap.security.html b/help/l10n/tr_TR/ox.appsuite.user.chap.security.html
index e6aea3308..1871bca80 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.chap.security.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.chap.security.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="index.html" title="Kullanım Kılavuzu">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="Hesapları görüntüleme, düzenleme, silme">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="Kişisel Verileri İndirme">
 <link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="Aktif İstemcileri Görüntüleme ve Oturumlarını Kapatma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">Sonraki</a></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.chap.settings.html b/help/l10n/tr_TR/ox.appsuite.user.chap.settings.html
index e8863d920..44193e6db 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.chap.settings.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.chap.settings.html
@@ -36,8 +36,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Ayar Arama</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Genel Ayarları Düzenleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için Geri Sayımı Kullanma</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Bildirim alanını kullanma</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için geri sayım kullanma</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">bildirim alanını kullanma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.personaldata.html">Kişisel İletişim Bilgilerini Değiştirme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Yerel Uygulamaları Sihirbaz Yardımıyla Ayarlama</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.4.3.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Uygunluk durumunu ayarlama</a></p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.chap.tasks.html b/help/l10n/tr_TR/ox.appsuite.user.chap.tasks.html
index 2c422f882..ffbda3780 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.chap.tasks.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.chap.tasks.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="index.html" title="Kullanım Kılavuzu">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="Adres Defteri Ayarları">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.delete.html" title="KiÅŸileri silme">
 <link rel="next" href="ox.appsuite.user.sect.tasks.gui.html" title="Görevler Bileşenleri">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.settings.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.delete.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.gui.html">Sonraki</a></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.index.html b/help/l10n/tr_TR/ox.appsuite.user.index.html
index d5eaedc7f..2231578a3 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.index.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="index.html" title="Kullanım Kılavuzu">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="Guard Ayarları">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Alıcıların S/MIME anahtarlarını yönetme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -21,7 +21,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.settings.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 </ul></div>
@@ -69,7 +69,7 @@
 </dt>
 <dt class="cap-contacts">gezinti çubuğu, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.navbar.html">Adres Defteri gezinti çubuğu</a>
 </dt>
-<dt class="cap-contacts">klasör gürünümü, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">The Adres Defteri klasör gürünümü</a>
+<dt class="cap-contacts">Klasör gürünümü, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">The Adres Defteri klasör gürünümü</a>
 </dt>
 <dt class="cap-contacts">liste görünümü, <a class="indexterm" href="ox.appsuite.user.sect.contacts.gui.list.html">Adres Defteri liste görünümü</a>
 </dt>
@@ -95,7 +95,7 @@
 <dd><dl>
 <dt class="cap-contacts">ilk açılacak klasör, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Adres Defteri Ayarları</a>
 </dt>
-<dt class="cap-contacts">isimler, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Adres Defteri Ayarları</a>
+<dt class="cap-contacts">İsimler, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Adres Defteri Ayarları</a>
 </dt>
 <dt class="cap-contacts">posta adreslerini harita servisine bağla, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Adres Defteri Ayarları</a>
 </dt>
@@ -168,12 +168,12 @@
 </dt>
 <dt class="">bildirimler, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>
 </dt>
+<dt class="cap-infostore">Drive, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Ayarları</a>
+</dt>
 <dt class="cap-webmail">E-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
 </dt>
 <dt class="">genel ayarlar, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Genel Ayarları Düzenleme</a>
 </dt>
-<dt class="cap-guard">Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Ayarları</a>
-</dt>
 <dt class="">hesaplar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Hesapları Yönetme</a>
 </dt>
 <dt class="">kişisel iletişim bilgileri, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Kişisel İletişim Bilgilerini Değiştirme</a>
@@ -188,13 +188,13 @@
 </dt>
 <dt class="cap-switchboard">uygunluk durumunu ayarlama, <a class="indexterm" href="ox.appsuite.user.sect.settings.presencestatus.html">Uygunluk durumunu ayarlama</a>
 </dt>
-<dt class="cap-deputy">vekilleri yönet, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vekilleri Yönetme</a>
+<dt class="cap-deputy">vekilleri yönet, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">vekilleri yönet</a>
 </dt>
 <dt class="">yerel uygulamaları sihirbaz yardımıyla ayarlama, <a class="indexterm" href="ox.appsuite.user.sect.settings.wizard.html">Yerel Uygulamaları Sihirbaz Yardımıyla Ayarlama</a>
 </dt>
 </dl></dd>
-<dt class="cap-infostore">ayarlar</dt>
-<dd><dl><dt class="cap-infostore">Drive, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Ayarları</a>
+<dt class="cap-guard">ayarlar</dt>
+<dd><dl><dt class="cap-guard">Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardAyarları</a>
 </dt></dl></dd>
 <dt class="">ayrıntı görünümü, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.detailview.html">Ayrıntı görünümü</a>
 </dt>
@@ -214,22 +214,24 @@
 </dl></dd>
 <dt class="">Bildirim alanı, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.notificationarea.html">Bildirim alanı</a>
 </dt>
-<dt class="">Bildirim alanını kullanma, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Bildirim alanını kullanma</a>
+<dt class="">bildirim alanını kullanma, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">bildirim alanını kullanma</a>
 </dt>
 <dt class="">bildirimler, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>
 </dt>
 <dd><dl>
-<dt class="">Bildirim alanını kullanma, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Bildirim alanını kullanma</a>
+<dt class="">bildirim alanını kullanma, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">bildirim alanını kullanma</a>
 </dt>
 <dt class="">Bildirim alanını otomatik olarak aç, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>
 </dt>
-<dt class="">Randevular için geri sayım kullan, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için Geri Sayımı Kullanma</a>
-</dt>
 </dl></dd>
 <dt class="">Bildirimler</dt>
-<dd><dl><dt class="">masaüstü bildirimlerini göster, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>
-</dt></dl></dd>
-<dt class="cap-webmail">Birleşik E-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Birleşik e-postayı kullanma</a>
+<dd><dl>
+<dt class="">masaüstü bildirimlerini göster, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>
+</dt>
+<dt class="">randevular için geri sayım kullan, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için geri sayım kullanma</a>
+</dt>
+</dl></dd>
+<dt class="cap-webmail">Birleşik e-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Birleşik e-postayı kullanma</a>
 </dt>
 <dt class="cap-infostore">Bulut depolama</dt>
 <dd><dl><dt class="cap-infostore">bkz. depolama hesapları ekleme, <a class="indexterm" href="ox.appsuite.user.sect.drive.accounts.html">Depolama Hesabı Ekleme</a>
@@ -343,7 +345,7 @@
 </dl></dd>
 <dt class="cap-webmail">Dosya ekle</dt>
 <dd><dl>
-<dt class="cap-webmail">e-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Dosya ekleme</a>
+<dt class="cap-webmail">e-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">dosya ekleme</a>
 </dt>
 <dt class="cap-contacts">kiÅŸi, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.attachments.html">Dosya ekleme</a>, <a class="indexterm" href="ox.appsuite.user.sect.tasks.add.attachments.html">Dosya ekleme</a>
 </dt>
@@ -430,7 +432,7 @@
 <dd><dl>
 <dt class="cap-infostore">gizli dosya ve klasörleri göster, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Ayarları</a>
 </dt>
-<dt class="cap-infostore">resimler için slayt gösterisi, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Ayarları</a>
+<dt class="cap-infostore">Resimler için slayt gösterisi, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Ayarları</a>
 </dt>
 <dt class="cap-infostore">sürüm geçmişi, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Ayarları</a>
 </dt>
@@ -527,9 +529,7 @@
 </dt>
 <dt class="cap-webmail">bileÅŸenleri, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.html">E-posta BileÅŸenleri</a>
 </dt>
-<dt class="cap-webmail">birleşik e-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Birleşik e-postayı kullanma</a>
-</dt>
-<dt class="cap-webmail">dosya ekleme, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Dosya ekleme</a>
+<dt class="cap-webmail">Birleşik e-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Birleşik e-postayı kullanma</a>
 </dt>
 <dt class="cap-webmail">düzenleme penceresi, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.create.html">E-posta düzenleme penceresi</a>
 </dt>
@@ -543,8 +543,6 @@
 </dt>
 <dt class="cap-webmail">eki kaydet, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">E-posta Eklerini Görüntüleme ve Kaydetme</a>
 </dt>
-<dt class="cap-infostore">Ekleri bağlantı olarak gönderme, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Ekleri bağlantı olarak gönderme</a>
-</dt>
 <dt class="cap-infostore">ekleri görüntüleme, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Drive uygulamasında e-posta eklerini görüntüleme</a>
 </dt>
 <dt class="cap-webmail">EML olarak kaydetme, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">E-postaları kaydetme</a>
@@ -555,15 +553,13 @@
 </dt>
 <dt class="cap-guard">gelen e-postaları şifreleme, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Gelen e-postaları filtre kuralı kullanarak şifreleme</a>
 </dt>
-<dt class="cap-webmail">Gelen kutusu kategorileri, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Gelen kutusu kategorileriyle çalışma</a>
-</dt>
-<dt class="cap-webmail">gönderen adresi seçme, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">Gönderen adresi seçme</a>
+<dt class="cap-webmail">gelen kutusu kategorileri çubuğu, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">Gelen kutusu kategorileri çubuğu</a>
 </dt>
 <dt class="cap-webmail cap-switchboard">göndereni veya başka bir alıcıyı arama, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Göndereni veya başka Bir alıcıyı arama</a>
 </dt>
-<dt class="cap-webmail">gönderme, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a>
+<dt class="cap-webmail">gönderme, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a>
 </dt>
-<dt class="cap-webmail">görüntüleme, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">E-postaları Görüntüleme</a>
+<dt class="cap-webmail">görünüm, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">E-postaları Görüntüleme</a>
 </dt>
 <dt class="cap-webmail">iletme, <a class="indexterm" href="ox.appsuite.user.sect.email.send.forward.html">E-postaları iletme</a>
 </dt>
@@ -571,11 +567,15 @@
 </dt>
 <dt class="cap-webmail">işlevsel e-posta hesaplarını devre dışı bırakma ve etkinleştirme, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">İşlevsel e-posta hesaplarını devre dışı bırakma ve etkinleştirme</a>
 </dt>
+<dt class="cap-webmail">kalıcı olarak silme, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-postaları silme</a>
+</dt>
+<dt class="feat-io-ox-core-categories">kategorileri kullanma, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Yeni e-postalarda varsayılan olarak PGP inline kullan</a>
+</dt>
 <dt class="cap-webmail">kategorize etme, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">E-postaları kategorize etme</a>
 </dt>
-<dt class="cap-webmail">klasör ekleme, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">E-posta Klasörleri Ekleme</a>
+<dt class="cap-webmail">Klasör ekleme, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">E-posta Klasörleri Ekleme</a>
 </dt>
-<dt class="cap-webmail">klasör görünümü, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">E-posta klasör görünümü</a>
+<dt class="cap-webmail">Klasör görünümü, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">E-posta klasör görünümü</a>
 </dt>
 <dt class="cap-webmail">klasörleri temizleme, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-posta klasörlerini temizleme</a>
 </dt>
@@ -585,8 +585,6 @@
 </dt>
 <dt class="cap-webmail">liste görünümü, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.list.html">E-posta liste görünümü</a>
 </dt>
-<dt class="cap-webmail">mevcut e-postalardan dosya ekleme, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Mevcut e-postalardan dosya ekleme</a>
-</dt>
 <dt class="cap-webmail">okundu olarak işaretle, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">E-postaları okundu veya okunmadı olarak işaretleme</a>
 </dt>
 <dt class="cap-webmail">okundu olarak işaretle ayarı, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
@@ -597,8 +595,6 @@
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">paylaş, bkz. paylaşım, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Veri Paylaşma</a>
 </dt>
-<dt class="feat-io-ox-core-mailPDFExport">PDF olarak dışa aktar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">E-postaları PDF olarak dışa aktarma</a>
-</dt>
 <dt class="cap-portal">portale ekleme, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.addportal.html">Portale e-posta ekleme</a>
 </dt>
 <dt class="cap-calendar">randevu katılımcılarına gönderme, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attendees.html">Randevu katılımcılarına e-posta gönderme</a>
@@ -607,15 +603,13 @@
 </dt>
 <dt class="feat-io-ox-core-templates">şablonları kullanma, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Şablonları kullanma</a>
 </dt>
-<dt class="cap-webmail">sekme çubuğu, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">E-posta sekme çubuğu</a>
-</dt>
 <dt class="cap-guard">şifrelenmiş e-postalar gönderme, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Şifrelenmiş e-posta gönderme</a>
 </dt>
 <dt class="cap-guard">şifrelenmiş e-postaları okuma, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Şifrelenmiş e-postaları okuma</a>
 </dt>
 <dt class="cap-webmail">silme, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">E-postaları silme</a>
 </dt>
-<dt class="cap-webmail">taslak kullanma, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">E-posta taslaklarını kullanma</a>
+<dt class="cap-webmail">taslakları kullanma, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">E-posta taslaklarını kullanma</a>
 </dt>
 <dt class="cap-webmail">taşıma, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">E-postaları taşıma ve kopyalama</a>
 </dt>
@@ -625,24 +619,42 @@
 </dt>
 <dt class="cap-deputy">vekil olarak gönderme, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Vekil Olarak E-posta Gönderme ve Alma</a>
 </dt>
-<dt class="cap-webmail">yanıt adreslerini ayarlama, <a class="indexterm" href="ox.appsuite.user.sect.email.send.replyto.html">Yanıt ayarlama</a>
-</dt>
 <dt class="cap-webmail">yanıtlama, <a class="indexterm" href="ox.appsuite.user.sect.email.send.reply.html">E-postaları yanıtlama</a>
 </dt>
-<dt class="feat-io-ox-core-openai">yanıtlarda yapay zekâ işlevlerini kullanma, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">E-postaları yanıtlarken yapay zekâ işlevlerini kullanma</a>
-</dt>
-<dt class="feat-io-ox-core-openai">yapay zekâ entegrasyonunu kullanma, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Yapay zekâ entegrasyonunu kullanma</a>
-</dt>
 <dt class="cap-webmail">yazdırma, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">E-postaları yazdırma</a>
 </dt>
 <dt class="cap-webmail">Yeni e-posta düğmesi, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.new.html">Yeni e-posta düğmesi</a>
 </dt>
+</dl></dd>
+<dt class="cap-webmail">e-posta</dt>
+<dd><dl>
+<dt class="cap-webmail">dosya ekleme, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">dosya ekleme</a>
+</dt>
+<dt class="">dış resimler, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">E-postalardaki Dış Bağlantılı Resimler</a>
+</dt>
+<dt class="cap-infostore">ekleri bağlantı olarak gönderme, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">ekleri bağlantı olarak gönderme</a>
+</dt>
+<dt class="cap-webmail">Gelen kutusu kategorileri, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Gelen kutusu kategorileriyle çalışma</a>
+</dt>
+<dt class="cap-webmail">gönderen adresi seçme, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">gönderen adresi seçme</a>
+</dt>
+<dt class="cap-dumpster">Kalıcı olarak silinmiş e-postaları kurtarma, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Kalıcı olarak silinmiş e-postaları kurtarma</a>
+</dt>
+<dt class="cap-webmail">Kurtarma, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">E-postaları kurtarma</a>
+</dt>
+<dt class="cap-webmail">mevcut e-postalardan dosya ekleme, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Mevcut e-postalardan dosya ekleme</a>
+</dt>
+<dt class="feat-io-ox-core-mailPDFExport">PDF olarak dışa aktar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">E-postaları PDF olarak dışa aktarma</a>
+</dt>
+<dt class="cap-webmail">yanıt adreslerini ayarlama, <a class="indexterm" href="ox.appsuite.user.sect.email.send.replyto.html">Yanıt ayarlama</a>
+</dt>
+<dt class="feat-io-ox-core-openai">yanıtlarda yapay zekâ işlevlerini kullanma, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">E-postaları yanıtlarken yapay zekâ işlevlerini kullanma</a>
+</dt>
+<dt class="feat-io-ox-core-openai">yapay zekâ entegrasyonunu kullanma, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Yapay zekâ entegrasyonunu kullanma</a>
+</dt>
 <dt class="cap-webmail">Yönetme, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a>
 </dt>
 </dl></dd>
-<dt class="">e-posta</dt>
-<dd><dl><dt class="">dış resimler, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">E-postalardaki Dış Bağlantılı Resimler</a>
-</dt></dl></dd>
 <dt class="">E-posta ayarları</dt>
 <dd><dl>
 <dt class="cap-webmail">asıl e-posta metnini yanıta ekle, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
@@ -653,7 +665,7 @@
 </dt>
 <dt class="cap-webmail">düzen, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
 </dt>
-<dt class="cap-webmail">e-postaları iletme biçimi, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
+<dt class="cap-webmail">E-postaları iletme biçimi, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
 </dt>
 <dt class="cap-webmail">e-postaları otomatik olarak BCC'ye gönder, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
 </dt>
@@ -671,13 +683,15 @@
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">IMAP klasör aboneliği, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Paylaşılan veya kişisel e-posta klasörlerine abone olma</a>
 </dt>
+<dt class="cap-webmail">kategorileri göster, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
+</dt>
 <dt class="cap-webmail">mailto bağlantılarını kaydetmeyi sor, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
 </dt>
 <dt class="cap-webmail">metin ön izlemesini göster, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
 </dt>
 <dt class="cap-webmail">okuma bölmesi, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
 </dt>
-<dt class="cap-webmail">okundu bilgisi isteklerini göster, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
+<dt class="cap-webmail">Okundu bilgisi isteklerini göster, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
 </dt>
 <dt class="cap-webmail">okundu olarak işaretle, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
 </dt>
@@ -687,7 +701,7 @@
 </dt>
 <dt class="cap-webmail">sabit genişlikli yazı tipi, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
 </dt>
-<dt class="cap-webmail">silinen e-postaları kalıcı olarak kaldır, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
+<dt class="cap-webmail">Silinen e-postaları kalıcı olarak kaldır, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
 </dt>
 <dt class="cap-webmail">tarih ve saati göster, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a>
 </dt>
@@ -789,7 +803,7 @@
 </dt>
 <dt class="cap-webmail">Gönderme</dt>
 <dd><dl>
-<dt class="cap-webmail">e-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a>
+<dt class="cap-webmail">e-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a>
 </dt>
 <dt class="cap-contacts">kişileri vCard olarak gönderme, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Kişileri vCard olarak gönderme</a>
 </dt>
@@ -842,11 +856,13 @@
 </dt>
 <dt class="cap-tasks">içe aktarma, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Görevleri içe aktarma</a>
 </dt>
+<dt class="feat-io-ox-core-categories">kategorileri kullanma, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Görevler için kategorileri kullanma</a>
+</dt>
 <dt class="cap-tasks">katılımcı ekle, <a class="indexterm" href="ox.appsuite.user.sect.tasks.add.participants.html">Göreve katılımcı ekleme</a>
 </dt>
 <dt class="cap-tasks">kişisel görev listesi ekleme, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.personal.html">Kişisel görev listesi ekleme</a>
 </dt>
-<dt class="cap-tasks">klasör görünümü, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">Görevler klasör görünümü</a>
+<dt class="cap-tasks">Klasör görünümü, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">Görevler klasör görünümü</a>
 </dt>
 <dt class="cap-tasks">liste görünümü, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.list.html">Görevler liste görünümü</a>
 </dt>
@@ -913,7 +929,11 @@
 <dt class="cap-guard">Guard, <a class="indexterm" href="ox.appsuite.user.chap.guard.html">Guard ile Veri Åžifreleme</a>
 </dt>
 <dd><dl>
-<dt class="cap-guard">anahtar yönetimi, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a>
+<dt class="cap-guard">alıcıların PGP anahtarlarını yönetme, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Alıcıların PGP anahtarlarını yönetme</a>
+</dt>
+<dt class="cap-guard">alıcıların S/MIME anahtarlarını yönetme, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Alıcıların S/MIME anahtarlarını yönetme</a>
+</dt>
+<dt class="cap-guard">Anahtar Yönetimi, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a>
 </dt>
 <dt class="cap-guard">Autocrypt anahtarlarını başka istemcilere aktarma, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Autocrypt anahtarlarını başka istemcilere aktarma</a>
 </dt>
@@ -925,7 +945,7 @@
 </dt>
 <dt class="cap-guard">Autocrypt anahtarlarını silme, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Autocrypt anahtarlarını yönetme</a>
 </dt>
-<dt class="cap-guard">ayarlar, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Ayarları</a>
+<dt class="cap-guard">ayarlar, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardAyarları</a>
 </dt>
 <dt class="cap-guard">çıkış yapma, <a class="indexterm" href="ox.appsuite.user.sect.guard.logout.html">Guard'dan Çıkış Yapma</a>
 </dt>
@@ -941,15 +961,15 @@
 </dt>
 <dt class="cap-guard">kurulum, <a class="indexterm" href="ox.appsuite.user.sect.guard.setup.html">Guard kurulumu</a>
 </dt>
-<dt class="cap-guard">Office belgesi ÅŸifreleme, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office belgelerini ÅŸifreleme</a>
+<dt class="cap-guard">Office belgesi ÅŸifreleme, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office Belgelerini Åžifreleme</a>
 </dt>
-<dt class="cap-guard">ortak anahtarları yönetme, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Ortak anahtarları yönetme</a>
+<dt class="cap-guard">parola deÄŸiÅŸtirme, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Parola deÄŸiÅŸtirme</a>
 </dt>
-<dt class="cap-guard">parola değiştirme, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a>
+<dt class="cap-guard">parola sıfırlama işlevini kaldırma, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Parola sıfırlama işlevini kaldırma</a>
 </dt>
 <dt class="cap-guard">parola yönetimi, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a>
 </dt>
-<dt class="cap-guard">parolayı sıfırlama, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a>
+<dt class="cap-guard">parolayı sıfırlama, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">parolayı sıfırlama</a>
 </dt>
 <dt class="cap-smime">S/MIME anahtarlarınızı yönetme, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">S/MIME anahtarlarınızı yönetme</a>
 </dt>
@@ -972,22 +992,29 @@
 <dt class="cap-guard">şifrelenmiş yeni dosya oluşturma, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.upload.html">Şifreleme kullanarak dosyaları güvenli bir şekilde yükleme</a>
 </dt>
 </dl></dd>
+<dt class="cap-guard">Guard ayarları</dt>
+<dd><dl><dt class="cap-guard">oluşturma seçenekleri, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardAyarları</a>
+</dt></dl></dd>
 <dt class="cap-guard">Guard güvenlik ayarları</dt>
-<dd><dl><dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Ayarları</a>
+<dd><dl><dt class="cap-guard">e-posta yazarken gelişmiş ayarları göster, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardAyarları</a>
 </dt></dl></dd>
 <dt class="cap-guard">Guardgüvenlik ayarları</dt>
 <dd><dl>
-<dt class="cap-guard">e-posta yazarken varsayılan olarak şifreleme yap, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Ayarları</a>
+<dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardAyarları</a>
 </dt>
-<dt class="cap-guard">gelişmiş ayarlar, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Ayarları</a>
+<dt class="cap-guard">Autocrypt ayarı, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardAyarları</a>
 </dt>
-<dt class="cap-guard">Giden e-postalara varsayılan olarak imza ekle, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Ayarları</a>
+<dt class="cap-guard">e-posta önbelleği ayarı, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardAyarları</a>
 </dt>
-<dt class="cap-guard">S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Ayarları</a>
+<dt class="cap-guard">e-posta yazarken varsayılan olarak şifreleme yap, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardAyarları</a>
 </dt>
-<dt class="cap-guard">Varsayılan olarak parolayı hatırla, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Ayarları</a>
+<dt class="cap-guard">Giden e-postalara varsayılan olarak imza ekle, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardAyarları</a>
 </dt>
-<dt class="cap-guard">yeni e-postalarda varsayılan olarak PGP inline kullan, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Ayarları</a>
+<dt class="cap-guard">seçenekleri sıfırla, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardAyarları</a>
+</dt>
+<dt class="cap-guard">Varsayılan olarak parolayı hatırla, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardAyarları</a>
+</dt>
+<dt class="cap-guard">yeni e-postalarda varsayılan olarak PGP inline kullan, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardAyarları</a>
 </dt>
 </dl></dd>
 <dt class="">Güvenlik</dt>
@@ -1004,7 +1031,7 @@
 </dt>
 <dt class="cap-guard">e-postaları şifreleme, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.html">E-posta Yazışmalarını Şifreleme</a>
 </dt>
-<dt class="cap-guard">Office belgelerini ÅŸifreleme, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office belgelerini ÅŸifreleme</a>
+<dt class="cap-guard">Office belgelerini ÅŸifreleme, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office Belgelerini Åžifreleme</a>
 </dt>
 <dt class="">Otomatik çıkış yapma, <a class="indexterm" href="ox.appsuite.user.sect.security.autologout.html">Otomatik Çıkış Yapma</a>
 </dt>
@@ -1016,7 +1043,7 @@
 <div class="indexdiv">
 <h3>H</h3>
 <dl>
-<dt class="cap-webmail cap-calendar cap-tasks">hale görünümü, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Kişileri hale görünümünde görüntüleme</a>
+<dt class="cap-webmail cap-calendar cap-tasks">Hale görünümü, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Kişileri hale görünümünde görüntüleme</a>
 </dt>
 <dt class="">Hale görünümü, bkz. açılır pencere, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.popup.html">Açılır pencere</a>
 </dt>
@@ -1064,11 +1091,15 @@
 </dt></dl></dd>
 <dt class="cap-calendar">İçe aktarma</dt>
 <dd><dl>
+<dt class="cap-contacts">CSV biçiminde içe aktarma, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Kişileri içe aktarma</a>
+</dt>
 <dt class="cap-tasks">görevler, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Görevleri içe aktarma</a>
 </dt>
 <dt class="cap-calendar">randevular, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Randevuları içe aktarma</a>
 </dt>
-<dt class="cap-calendar">Takvim, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Dosyalardan takvimleri içe aktarma</a>
+<dt class="cap-calendar">takvim, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Dosyalardan takvimleri içe aktarma</a>
+</dt>
+<dt class="cap-contacts">vCard biçiminde içe aktarma, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Kişileri içe aktarma</a>
 </dt>
 </dl></dd>
 <dt class="cap-infostore">İçeriği görüntüleme</dt>
@@ -1085,10 +1116,7 @@
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">İzin örnekleri, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">İzinlerin kullanım alanları</a>
 </dt>
-<dt class="">izinler</dt>
-<dd><dl><dt class="">tanım, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">İzinlerin amacı nedir?</a>
-</dt></dl></dd>
-<dt class="cap-share_links cap-share_mail_attachments">İzinler</dt>
+<dt class="">İzinler</dt>
 <dd><dl>
 <dt class="cap-share_links cap-share_mail_attachments">düzenleyici, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Hangi izinleri kullanabilirim?</a>
 </dt>
@@ -1096,6 +1124,8 @@
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">örnekler, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">İzinlerin kullanım alanları</a>
 </dt>
+<dt class="">tanım, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">İzinlerin amacı nedir?</a>
+</dt>
 <dt class="cap-share_links cap-share_mail_attachments">uygulama, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Hangi izinleri kullanabilirim?</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">yazar, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Hangi izinleri kullanabilirim?</a>
@@ -1114,7 +1144,7 @@
 </dt>
 <dt class="cap-tasks cap-switchboard">görev katılımcılarını arama, <a class="indexterm" href="ox.appsuite.user.sect.tasks.call.html">Görev Katılımcılarını Arama</a>
 </dt>
-<dt class="cap-contacts cap-switchboard">KiÅŸileri Arama, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">KiÅŸileri arama</a>
+<dt class="cap-contacts cap-switchboard">kiÅŸileri arama, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">KiÅŸileri arama</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">randevusu katılımcılarını arama, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Randevu Katılımcılarını Arama</a>
 </dt>
@@ -1122,7 +1152,7 @@
 </dt>
 </dl></dd>
 <dt class="cap-calendar">Jitsi ayarları</dt>
-<dd><dl><dt class="cap-calendar">Otomatik olarak bağlantıyı konuma kopyala, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
+<dd><dl><dt class="cap-calendar">otomatik olarak bağlantıyı konuma kopyala, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
 </dt></dl></dd>
 </dl>
 </div>
@@ -1130,15 +1160,25 @@
 <h3>K</h3>
 <dl>
 <dt class="feat-io-ox-core-categories">Kategoriler</dt>
-<dd><dl><dt class="feat-io-ox-core-categories">yönetme, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="feat-io-ox-core-categories">e-postalar için kullanma, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Yeni e-postalarda varsayılan olarak PGP inline kullan</a>
+</dt>
+<dt class="feat-io-ox-core-categories">görevler için kullanma, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Görevler için kategorileri kullanma</a>
+</dt>
+<dt class="feat-io-ox-core-categories">kişiler için kullanma, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Kişiler için kategorileri kullanma</a>
+</dt>
+<dt class="feat-io-ox-core-categories">randevular için kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Randevular için kategorileri kullanma</a>
+</dt>
+<dt class="feat-io-ox-core-categories">yönetme, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a>
+</dt>
+</dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Kaynak</dt>
 <dd><dl>
 <dt class="cap-contacts">adres defterinden otomatik olarak ekleme, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Kişileri veya Kaynakları Bir Adres Defterinden Otomatik Olarak Ekleme</a>
 </dt>
 <dt class="feat-io-ox-core-enterprisePicker">adres dizininden otomatik olarak ekleme, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Kişileri veya Kaynakları Bir Adres Dizininden Otomatik Olarak Ekleme</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Kaynak takvimlerini kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Kaynak Takvimleri Kullanma</a>
+<dt class="feat-io-ox-core-resourceCalendars">kaynak takvimlerini kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Kaynak Takvimleri Kullanma</a>
 </dt>
 <dt class="cap-edit_resource">kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resources.html">Kaynakları Kullanma</a>
 </dt>
@@ -1147,10 +1187,10 @@
 </dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Kaynak takvim grubu</dt>
 <dd><dl>
-<dt class="feat-io-ox-core-resourceCalendars">Kaynak takvimleri ekleme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Kaynak takvimleri ve kaynak takvim grupları oluşturma</a>
-</dt>
 <dt class="feat-io-ox-core-resourceCalendars">oluşturma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Kaynak takvimleri ve kaynak takvim grupları oluşturma</a>
 </dt>
+<dt class="feat-io-ox-core-resourceCalendars">raynak takvimleri ekleme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Kaynak takvimleri ve kaynak takvim grupları oluşturma</a>
+</dt>
 </dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Kaynak takvimi</dt>
 <dd><dl>
@@ -1205,6 +1245,8 @@
 </dt>
 <dt class="cap-webmail cap-calendar cap-tasks">hale görünümü, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Kişileri hale görünümünde görüntüleme</a>
 </dt>
+<dt class="feat-io-ox-core-categories">kategorileri kullanma, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Kişiler için kategorileri kullanma</a>
+</dt>
 <dt class="cap-calendar">katılımcı listesinden dağıtım listesi oluşturma, <a class="indexterm" href="ox.appsuite.user.sect.contacts.distributionlist.attendees.html">Katılımcı listesinden dağıtım listesi oluşturma</a>
 </dt>
 <dt class="cap-contacts">kiÅŸi resmi oluÅŸturma, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.create.html">Yeni bir kiÅŸi oluÅŸturma</a>
@@ -1236,14 +1278,7 @@
 <dt class="cap-contacts">yönetim, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a>
 </dt>
 </dl></dd>
-<dt class="cap-contacts">kiÅŸileri</dt>
-<dd><dl>
-<dt class="cap-contacts">CSV biçiminde içe aktarma, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Kişileri içe aktarma</a>
-</dt>
-<dt class="cap-contacts">vCard biçiminde içe aktarma, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Kişileri içe aktarma</a>
-</dt>
-</dl></dd>
-<dt class="">kişisel iletişim bilgileri, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Kişisel İletişim Bilgilerini Değiştirme</a>
+<dt class="">Kişisel iletişim bilgileri, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Kişisel İletişim Bilgilerini Değiştirme</a>
 </dt>
 <dt class="cap-dataexport">Kişisel verileri indirme, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Kişisel Verileri İndirme</a>
 </dt>
@@ -1266,10 +1301,11 @@
 </dl></dd>
 <dt class="">klasör görünümü, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.foldertree.html">Klasör görünümü</a>
 </dt>
+<dt class="">Klasör görünümü</dt>
 <dd><dl>
 <dt class="">aç, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Klasör yapısı içinde gezinme</a>
 </dt>
-<dt class="">Favoriler, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Klasörleri favorilere ekleme</a>
+<dt class="">favoriler, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Klasörleri favorilere ekleme</a>
 </dt>
 <dt class="">genişliği değiştir, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Klasör yapısı içinde gezinme</a>
 </dt>
@@ -1278,7 +1314,7 @@
 </dl></dd>
 <dt class="">Klasör yapısı</dt>
 <dd><dl>
-<dt class="">Favoriler, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Klasörleri favorilere ekleme</a>
+<dt class="">favoriler, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Klasörleri favorilere ekleme</a>
 </dt>
 <dt class="">gezinme, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Klasör yapısı içinde gezinme</a>
 </dt>
@@ -1290,8 +1326,6 @@
 <dd><dl>
 <dt class="">aç, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Klasör yapısı içinde gezinme</a>
 </dt>
-<dt class="">Adını değiştir, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Klasörleri yeniden adlandırma</a>
-</dt>
 <dt class="cap-infostore">favori ekleme, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.favorite.html">Dosyaları ve Drive klasörlerini Favoriler'e ekleme</a>
 </dt>
 <dt class="">favorilere klasör ekleme, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Klasörleri favorilere ekleme</a>
@@ -1312,6 +1346,8 @@
 </dt>
 <dt class="">tür, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.kind.html">Klasör türleri nelerdir?</a>
 </dt>
+<dt class="">yeniden adlandır, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">Klasörleri yeniden adlandırma</a>
+</dt>
 </dl></dd>
 <dt class="">Klavye girdisi</dt>
 <dd><dl>
@@ -1381,6 +1417,13 @@
 <dt class="">yeni nesne oluşturma düğmesi, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.new.html">Yeni nesne oluşturma düğmesi</a>
 </dt>
 </dl></dd>
+<dt class="cap-webmail">Kurtarma</dt>
+<dd><dl>
+<dt class="cap-webmail">e-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">E-postaları kurtarma</a>
+</dt>
+<dt class="cap-dumpster">kalıcı olarak silinmiş e-postalar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Kalıcı olarak silinmiş e-postaları kurtarma</a>
+</dt>
+</dl></dd>
 </dl>
 </div>
 <div class="indexdiv">
@@ -1415,7 +1458,7 @@
 <div class="indexdiv">
 <h3>O</h3>
 <dl>
-<dt class="cap-guard">Office belgelerini ÅŸifreleme, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office belgelerini ÅŸifreleme</a>
+<dt class="cap-guard">Office belgelerini ÅŸifreleme, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office Belgelerini Åžifreleme</a>
 </dt>
 <dt class="">Otomatik olarak çıkış yap, <a class="indexterm" href="ox.appsuite.user.sect.security.autologout.html">Otomatik Çıkış Yapma</a>
 </dt>
@@ -1430,9 +1473,9 @@
 <dd><dl>
 <dt class="">deÄŸiÅŸme, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.changepassword.html">Parola deÄŸiÅŸtirme</a>
 </dt>
-<dt class="cap-guard">Guard parola değiştirme, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a>
+<dt class="cap-guard">Guard parola deÄŸiÅŸtirme, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">Parola deÄŸiÅŸtirme</a>
 </dt>
-<dt class="cap-guard">Guard parolayı sıfırlama, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a>
+<dt class="cap-guard">Guard parolayı sıfırlama, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">parolayı sıfırlama</a>
 </dt>
 <dt class="">Uygulama Parolalarını Kullanma, <a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">Uygulama Parolalarını Kullanma</a>
 </dt>
@@ -1476,7 +1519,7 @@
 <dt class="feat-io-ox-core-mailPDFExport">e-postayı dışa aktar, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">E-postaları PDF olarak dışa aktarma</a>
 </dt>
 </dl></dd>
-<dt class="cap-calendar">Planlama görünümünü kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a>
+<dt class="cap-calendar">Planlama görünümünü kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a>
 </dt>
 <dt class="cap-portal">Portal, <a class="indexterm" href="ox.appsuite.user.chap.portal.html">Portal</a>
 </dt>
@@ -1542,13 +1585,13 @@
 </dt>
 <dt class="cap-calendar">başka bir takvime taşıma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.move.html">Randevuları başka bir takvime taşıma</a>
 </dt>
-<dt class="cap-calendar">boş zamanları bulma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a>
+<dt class="cap-calendar">boş zamanları bulma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a>
 </dt>
-<dt class="cap-calendar">çakışmaları çözme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">çakışmaları çözme</a>
+<dt class="cap-calendar">çakışmaları çözme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Çakışmaları çözme</a>
 </dt>
 <dt class="cap-calendar">davetleri yanıtlama, <a class="indexterm" href="ox.appsuite.user.sect.calendar.invitation.html">Randevu Davetlerini Yanıtlama</a>
 </dt>
-<dt class="cap-calendar">Dosya ekleme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Dosya ekleme</a>
+<dt class="cap-calendar">dosya ekleme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Dosya ekleme</a>
 </dt>
 <dt class="cap-calendar">düzenleme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Randevuları Düzenleme</a>
 </dt>
@@ -1562,17 +1605,19 @@
 </dt>
 <dt class="cap-calendar">Favori saat dilimlerini yönetme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Favori saat dilimlerini yönetme</a>
 </dt>
-<dt class="">geri sayım kullanma, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için Geri Sayımı Kullanma</a>
+<dt class="">geri sayım kullanma, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için geri sayım kullanma</a>
 </dt>
 <dt class="cap-calendar">görüntüleme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.html">Randevuları Görüntüleme</a>
 </dt>
 <dt class="cap-calendar">iCal'den oluÅŸturma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">iCal eklerinden randevu oluÅŸturma</a>
 </dt>
-<dt class="cap-calendar">İçe aktarma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Randevuları içe aktarma</a>
+<dt class="cap-calendar">içe aktarma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Randevuları içe aktarma</a>
+</dt>
+<dt class="feat-io-ox-core-categories">kategorileri kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Randevular için kategorileri kullanma</a>
 </dt>
 <dt class="cap-calendar">katılımcı veya kaynak ekleme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.participants.html">Katılımcı veya kaynak ekleme</a>
 </dt>
-<dt class="cap-calendar">Katılımcıları yeni bir randevuya davet etme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Katılımcıları yeni bir randevuya davet etme</a>
+<dt class="cap-calendar">katılımcıları yeni bir randevuya davet etme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Katılımcıları yeni bir randevuya davet etme</a>
 </dt>
 <dt class="feat-io-ox-core-resourceCalendars">kaynak takvimini kullanarak randevu oluÅŸturma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Kaynak takvimini kullanarak randevu oluÅŸturma</a>
 </dt>
@@ -1580,7 +1625,7 @@
 </dt>
 <dt class="cap-calendar">organizatörü değiştirme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Organizatörü değiştirme</a>
 </dt>
-<dt class="cap-calendar">planlama görünümünü kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a>
+<dt class="cap-calendar">planlama görünümünü kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a>
 </dt>
 <dt class="cap-calendar">randevu anımsatıcılarını kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.alarms.html">Randevu anımsatıcılarını kullanma</a>
 </dt>
@@ -1617,7 +1662,7 @@
 <dt class="cap-calendar">yönetme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a>
 </dt>
 </dl></dd>
-<dt class="">Randevular için Geri Sayımı Kullanma, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için Geri Sayımı Kullanma</a>
+<dt class="">Randevular için geri sayım kullan, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için geri sayım kullanma</a>
 </dt>
 <dt class="cap-calendar">Randevuları</dt>
 <dd><dl>
@@ -1648,7 +1693,7 @@
 <dt class="feat-io-ox-core-templates">Şablonları kullanma, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Şablonları kullanma</a>
 </dt>
 <dt class="cap-guard">Security</dt>
-<dd><dl><dt class="cap-guard">Guard ayarları, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Ayarları</a>
+<dd><dl><dt class="cap-guard">Guardayarlar, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardAyarları</a>
 </dt></dl></dd>
 <dt class="cap-webmail">Sekmeler</dt>
 <dd><dl><dt class="cap-webmail">gelen kutusu kategorileriyle çalışma, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Gelen kutusu kategorileriyle çalışma</a>
@@ -1663,7 +1708,7 @@
 </dt>
 <dt class="cap-guard">E-postalar, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.html">E-posta Yazışmalarını Şifreleme</a>
 </dt>
-<dt class="cap-guard">Office belgelerini ÅŸifreleme, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office belgelerini ÅŸifreleme</a>
+<dt class="cap-guard">Office belgelerini ÅŸifreleme, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Office Belgelerini Åžifreleme</a>
 </dt>
 <dt class="cap-guard">seçili belgeleri şifrelenmiş biçimde kaydetme, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">Seçili belgeleri şifrelenmiş biçimde kaydetme</a>
 </dt>
@@ -1699,7 +1744,7 @@
 <dd><dl>
 <dt class="cap-infostore">dosya, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.delete.html">Dosyaları ve Drive klasörlerini silme</a>
 </dt>
-<dt class="cap-webmail">E-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">E-postaları silme</a>
+<dt class="cap-webmail">e-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">E-postaları silme</a>, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-postaları silme</a>
 </dt>
 <dt class="cap-tasks">görevler, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.delete.html">Görevleri silme</a>
 </dt>
@@ -1743,25 +1788,29 @@
 </dt>
 <dt class="cap-calendar">iCal takvimlerine abone olma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">iCal adresiyle harici takvimlere abone olma</a>
 </dt>
-<dt class="cap-calendar">İçe aktarma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Dosyalardan takvimleri içe aktarma</a>
+<dt class="cap-calendar">içe aktarma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Dosyalardan takvimleri içe aktarma</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Kaynak takvimini kullanarak randevu oluÅŸturma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Kaynak takvimini kullanarak randevu oluÅŸturma</a>
+<dt class="feat-io-ox-core-categories">kategorileri kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Randevular için kategorileri kullanma</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">Kaynak takvimlerini kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Kaynak Takvimleri Kullanma</a>
+<dt class="feat-io-ox-core-resourceCalendars">kaynak takvimini kullanarak randevu oluÅŸturma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Kaynak takvimini kullanarak randevu oluÅŸturma</a>
+</dt>
+<dt class="feat-io-ox-core-resourceCalendars">kaynak takvimlerini kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Kaynak Takvimleri Kullanma</a>
 </dt>
 <dt class="cap-calendar">kiÅŸisel takvimler ekleme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.personal.html">KiÅŸisel takvimler ekleme</a>
 </dt>
-<dt class="cap-calendar">klasör görünümü, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Takvim klasör görünümü</a>
+<dt class="cap-calendar">Klasör görünümü, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">Takvim klasör görünümü</a>
 </dt>
-<dt class="cap-calendar">Liste görünümü, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">Takvim liste görünümü</a>
+<dt class="cap-calendar">liste görünümü, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">Takvim liste görünümü</a>
 </dt>
 <dt class="cap-calendar">mini takvim, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">Mini takvim</a>
 </dt>
 <dt class="cap-calendar">Ortak ve paylaşılan takvimlere abone olma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Ortak ve paylaşılan takvimlere abone olma</a>
 </dt>
+<dt class="cap-share_links cap-share_mail_attachments">paylaş, bkz. paylaşım, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Veri Paylaşma</a>
+</dt>
 <dt class="cap-calendar">planlama görünümü, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.scheduling.html">Planlama görünümü</a>
 </dt>
-<dt class="cap-calendar">planlama görünümünü kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a>
+<dt class="cap-calendar">planlama görünümünü kullanma, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a>
 </dt>
 <dt class="cap-calendar">takvim ekleme, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Takvim Ekleme</a>
 </dt>
@@ -1774,9 +1823,6 @@
 <dt class="cap-calendar">Yeni randevu düğmesi, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.new.html">Yeni randevu düğmesi</a>
 </dt>
 </dl></dd>
-<dt class="cap-share_links cap-share_mail_attachments">takvim</dt>
-<dd><dl><dt class="cap-share_links cap-share_mail_attachments">paylaş, bkz. paylaşım, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Veri Paylaşma</a>
-</dt></dl></dd>
 <dt class="">Takvim ayarları</dt>
 <dd><dl>
 <dt class="cap-calendar">başlangıç, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
@@ -1793,7 +1839,7 @@
 </dt>
 <dt class="cap-portal">gelişmiş ayarlar, <a class="indexterm" href="ox.appsuite.user.sect.portal.settings.html">Portal Ayarları</a>, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Adres Defteri Ayarları</a>
 </dt>
-<dt class="cap-calendar">İş haftası, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
+<dt class="cap-calendar">iş haftası, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
 </dt>
 <dt class="cap-calendar">Jitsi toplantıları, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
 </dt>
@@ -1803,15 +1849,15 @@
 </dt>
 <dt class="cap-calendar">paylaşılan takvimlere abone ol, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
 </dt>
-<dt class="cap-calendar">Randevu anımsatıcıları, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
+<dt class="cap-calendar">randevu anımsatıcıları, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
 </dt>
-<dt class="">randevu kabul veya reddedildikten sonra davet e-postasını otomatik olarak sil, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>
+<dt class="">Randevu kabul veya reddedildikten sonra davet e-postasını otomatik olarak sil, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>
 </dt>
-<dt class="">randevu katılımcısıysam diğer katılımcılar kabul veya reddettiğinde bildirim gönder, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>
+<dt class="">Randevu katılımcısıysam diğer katılımcılar kabul veya reddettiğinde bildirim gönder, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a>
 </dt>
 <dt class="cap-calendar">randevular için birinci kategori rengini kullan, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
 </dt>
-<dt class="cap-calendar">Reddedilen randevuları göster, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
+<dt class="cap-calendar">reddedilen randevuları görüntüle, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
 </dt>
 <dt class="cap-calendar">serbest/meşgul görünürlüğü, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
 </dt>
@@ -1837,7 +1883,7 @@
 <dd><dl>
 <dt class="cap-tasks cap-switchboard">görev katılımcılarını arama, <a class="indexterm" href="ox.appsuite.user.sect.tasks.call.html">Görev Katılımcılarını Arama</a>
 </dt>
-<dt class="cap-contacts cap-switchboard">KiÅŸileri arama, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">KiÅŸileri arama</a>
+<dt class="cap-contacts cap-switchboard">kiÅŸileri arama, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">KiÅŸileri arama</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">randevusu katılımcılarını arama, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Randevu Katılımcılarını Arama</a>
 </dt>
@@ -1900,7 +1946,7 @@
 </dt>
 <dt class="cap-deputy">silme, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">Vekilleri görüntüleme, düzenleme, silme</a>
 </dt>
-<dt class="cap-deputy">yönet, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vekilleri Yönetme</a>
+<dt class="cap-deputy">yönet, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">vekilleri yönet</a>
 </dt>
 </dl></dd>
 <dt class="cap-share_mail_attachments">Veri paylaÅŸma, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.share.html">Veri paylaÅŸma</a>
@@ -1973,7 +2019,7 @@
 </dt>
 <dt class="cap-infostore">Driveklasörler, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.html">Drive: Klasör ekleme</a>, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.personal.html">Drive: klasör oluşturma</a>
 </dt>
-<dt class="cap-webmail">E-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a>
+<dt class="cap-webmail">E-posta, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a>
 </dt>
 <dt class="cap-webmail">E-posta klasörleri, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">E-posta Klasörleri Ekleme</a>
 </dt>
@@ -1999,7 +2045,7 @@
 </dt>
 <dt class="cap-guard">şifrelenmiş e-postalar gönderme, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Şifrelenmiş e-posta gönderme</a>
 </dt>
-<dt class="cap-calendar">Takvim, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Takvim Ekleme</a>
+<dt class="cap-calendar">takvim, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Takvim Ekleme</a>
 </dt>
 </dl></dd>
 <dt class="">yeni nesne oluşturma düğmesi, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.new.html">Yeni nesne oluşturma düğmesi</a>
@@ -2059,7 +2105,7 @@
 </dt>
 <dt class="cap-tasks cap-switchboard">görev katılımcılarını arama, <a class="indexterm" href="ox.appsuite.user.sect.tasks.call.html">Görev Katılımcılarını Arama</a>
 </dt>
-<dt class="cap-contacts cap-switchboard">KiÅŸileri arama, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">KiÅŸileri arama</a>
+<dt class="cap-contacts cap-switchboard">kiÅŸileri arama, <a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">KiÅŸileri arama</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">randevusu katılımcılarını arama, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Randevu Katılımcılarını Arama</a>
 </dt>
@@ -2070,9 +2116,9 @@
 <dd><dl>
 <dt class="cap-calendar">her zaman rastgele bir toplantı parolası ekle, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
 </dt>
-<dt class="cap-calendar">Otomatik olarak bağlantıyı konuma kopyala, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
+<dt class="cap-calendar">otomatik olarak bağlantıyı konuma kopyala, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
 </dt>
-<dt class="cap-calendar">Otomatik olarak telefon bilgisini açıklamaya kopyala, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
+<dt class="cap-calendar">otomatik olarak telefon bilgisini açıklamaya kopyala, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a>
 </dt>
 </dl></dd>
 </dl>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.about.glossary.html b/help/l10n/tr_TR/ox.appsuite.user.sect.about.glossary.html
index 168ed834e..cc80cf9d8 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.about.glossary.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.about.glossary.html
@@ -82,11 +82,11 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
 </li></ul></p>
 </dd>
-<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Gelen kutusu sekmeleri</span></dt>
+<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Gelen kutusu kategorileri</span></dt>
 <dd class="glossdef cap-webmail">
 <p role="presentation">Gelen kutusu sekmeleri, <span class="guilabel"><strong>Gelen Kutusu</strong></span> klasörünü düzenli tutmanız için basit bir yol sunar. Sekmeler sayesinde, gelen e-postalar <span class="guilabel"><strong>Gelen Kutusu</strong></span> klasöründe gönderenlere ayrılmış olarak kaydedilir. Yapılandırmaya bağlı olarak, belli gelen kutusu sekmeleri hazır halde gelir. İhtiyaçlarınıza bağlı olarak yeni gelen kutusu sekmeleri ekleyebilirsiniz.</p>
 <p role="presentation">Gelen kutusu sekmeleri yalnızca <span class="guilabel"><strong>Gelen Kutusu</strong></span> klasöründe kullanılabilir. Daha fazla depolama seçeneğine ihtiyacınız varsa e-posta klasörleri oluşturmak için klasör görünümünü kullanabilirsiniz.</p>
-<p role="presentation" class="feat-io-ox-core-categories">Not: Gelen kutusu sekmelerini yalnızca e-postalar için kullanabilirsiniz. Yapılandırmaya bağlı olarak, randevular, kişiler ve görevler için ayrı kategoriler kullanabilirsiniz.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Not: Gelen kutusu kategorilerini yalnızca e-postalar için kullanabilirsiniz. Yapılandırmaya bağlı olarak, e-postalar, randevular, kişiler ve görevler için ayrı kategoriler kullanabilirsiniz.</p>
 <p role="presentation">İlgili konular:<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Gelen kutusu kategorileriyle çalışma</a></p></li></ul></p>
 </dd>
 <dt id="ox.appsuite.user.reference.about.glossary.groupware"><span class="glossterm">groupware</span></dt>
@@ -115,8 +115,8 @@
 </dd>
 <dt class="feat-io-ox-core-categories" id="ox.appsuite.user.reference.about.glossary.categories"><span class="glossterm">Kategoriler</span></dt>
 <dd class="glossdef feat-io-ox-core-categories">
-<p role="presentation">Randevuları, kişileri ve görevleri sınıflandırmak için kategorileri kullanabilirsiniz. Bu sayede birbiriyle ilişkili nesneleri sınıflandırıp kolayca bulabilirsiniz. Yapılandırmaya bağlı olarak belli kategoriler hazır halde gelir. Kendi kategorilerinizi de oluşturabilirsiniz.</p>
-<p role="presentation">Not: Bu kategoriler e-postalar için kullanılamaz. E-postalar için gelen kutusu sekmelerini kullanmalısınız.</p>
+<p role="presentation">Kategoriler, klasör yapısından bağımsız olarak uygulamalardaki e-postaları, randevuları, kişileri ve görevleri organize etmenize olanak tanır. Bu sayede, birbiriyle ilişkili nesneleri (örn. belirli bir projeye veya müşteriye ait tüm e-postalar, randevular, kişiler ve görevler) daha kolay tanımlayabilir ve bulabilirsiniz. Yapılandırmaya bağlı olarak belli kategoriler hazır halde gelir. Kendi kategorilerinizi de oluşturabilirsiniz.</p>
+<p role="presentation">Not: E-postalar için gelen kutusu sekmelerini de kullanabilirsiniz.</p>
 <p role="presentation">İlgili konular:<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li></ul></p>
 </dd>
 <dt id="ox.appsuite.user.reference.about.glossary.participant"><span class="glossterm">Katılımcı</span></dt>
@@ -187,7 +187,7 @@
 <li class="listitem"><p role="presentation">başka bir kullanıcının randevularını planlama, düzenleme ve organize etme</p></li>
 </ul></p>
 <p role="presentation">İlgili konular:<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vekilleri Yönetme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">vekilleri yönet</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Vekil Olarak E-posta Gönderme ve Alma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Vekil Olarak Randevu Oluşturma, Düzenleme ve Yönetme</a></p>
 </li></ul></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.alarms.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.alarms.html
index f94a2ff09..8de4fe74c 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.alarms.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.alarms.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.display.html" title="Randevunun görünümünü ayarlama">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Katılımcı veya kaynak ekleme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.alarms">
 <div class="titlepage"><div><div><h3 class="title">Randevu anımsatıcılarını kullanma</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.12.2"></a><p id="ox.appsuite.user.concept.calendar.add.alarms">Bir randevu oluştururken veya düzenlerken randevunun tarihini size anımsatacak şekilde ayarlayabilirsiniz. Bunun için aşağıdaki bildirimlerden birini veya birkaçını kullanabilirsiniz:</p>
@@ -59,7 +59,7 @@
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Randevu anımsatıcılarını değiştirme</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.alarms">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.alarms">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.attachments.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.attachments.html
index 94ee647c0..158f32eff 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.attachments.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.attachments.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Katılımcı veya kaynak ekleme">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="planlama görünümünü kullanma">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Planlama görünümünü kullanma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attachments">
 <div class="titlepage"><div><div><h3 class="title">Dosya ekleme</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.14.2"></a><a class="indexterm" name="id-1.8.10.14.3"></a><p id="ox.appsuite.user.concept.calendar.add.attachments">Yapılandırmaya bağlı olarak, bilgisayaranızda veya <span class="phrase">Drive</span> uygulamasında kayıtlı olan dosyaları ekleyebilirsiniz.</p>
@@ -53,7 +53,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Yeni randevu oluÅŸturma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Randevuları Düzenleme</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.attachments">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attachments">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.attendees.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.attendees.html
index 3d7caa3df..0d6a4ac28 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.attendees.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Takip randevusu oluÅŸturma">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="E-posta alıcılarını yeni randevulara davet etme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attendees">
 <div class="titlepage"><div><div><h3 class="title">Katılımcıları yeni bir randevuya davet etme</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.17.2"></a><p id="ox.appsuite.user.concept.calendar.add.attendees">Bir randevunun birden fazla katılımcı varsa bu katılımcıları yeni bir randevuya davet edebilirsiniz.</p>
@@ -61,11 +61,11 @@
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">E-posta alıcılarını yeni randevulara davet etme</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">çakışmaları çözme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Çakışmaları çözme</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.attendees">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attendees">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.call.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.call.html
index a98a5ac80..f52db4de9 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.call.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.call.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Tarih seçiciyi kullanma">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Tekrarlanan randevuları ayarlama">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.call">
 <div class="titlepage"><div><div><h3 class="title">Sesli/görüntülü görüşme planlama</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.9.2"></a><a class="indexterm" name="id-1.8.10.9.3"></a><a class="indexterm" name="id-1.8.10.9.4"></a><a class="indexterm" name="id-1.8.10.9.5"></a><a class="indexterm" name="id-1.8.10.9.6"></a><p id="ox.appsuite.user.precondition.calendar.add.call">Ön koşul: Bir sesli veya görüntülü konferans sağlayıcısında hesabınız olmalıdır.</p>
@@ -66,7 +66,7 @@
 <p role="presentation" class="feat-jitsi"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.jitsi">Jitsi toplantıları</a></p>
 <p role="presentation" class="feat-zoom"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.zoom">Zoom toplantıları</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.call">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.call">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.conflicthandling.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.conflicthandling.html
index f9a89b995..8c3435336 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.conflicthandling.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.conflicthandling.html
@@ -1,11 +1,11 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>çakışmaları çözme</title>
+<title>Çakışmaları çözme</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="iCal eklerinden randevu oluÅŸturma">
 <link rel="next" href="ox.appsuite.user.sect.calendar.invitation.html" title="Randevu Davetlerini Yanıtlama">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.conflicthandling">
-<div class="titlepage"><div><div><h3 class="title">çakışmaları çözme</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Çakışmaları çözme</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.20.2"></a><p id="ox.appsuite.user.concept.calendar.add.conflicthandling">Aşağıdaki durumlarda çakışma oluşur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
@@ -64,10 +64,10 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" id="ox.appsuite.user.related.calendar.add.conflicthandling" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Yeni randevu oluÅŸturma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Takip randevusu oluÅŸturma</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.create.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.create.html
index 6526b901e..73b0d75c6 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.create.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.create.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Tarih seçiciyi kullanma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.create">
 <div class="titlepage"><div><div><h3 class="title">Yeni randevu oluÅŸturma</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.7.2"></a><a class="indexterm" name="id-1.8.10.7.3"></a><div class="task" id="ox.appsuite.user.task.calendar.add.create">
@@ -100,18 +100,18 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Kaynak takvimini kullanarak randevu oluÅŸturma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Takip randevusu oluÅŸturma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Katılımcıları yeni bir randevuya davet etme</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">E-posta alıcılarını yeni randevulara davet etme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">iCal eklerinden randevu oluÅŸturma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">çakışmaları çözme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Çakışmaları çözme</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">KiÅŸileri bir randevuya davet etme</a></p>
 <p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Randevuları Düzenleme</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.create">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.create">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.datepicker.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.datepicker.html
index e3b344be5..c9a755421 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.datepicker.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.datepicker.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.create.html" title="Yeni randevu oluÅŸturma">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.call.html" title="Sesli/görüntülü görüşme planlama">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.datepicker">
 <div class="titlepage"><div><div><h3 class="title">Tarih seçiciyi kullanma</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.8.2"></a><p id="ox.appsuite.user.concept.calendar.add.datepicker">Tarih seçici, tarih alanına girilecek tarihi seçmenize olanak tanır.</p>
@@ -82,7 +82,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Görevleri Düzenleme</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.datepicker">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.datepicker">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.display.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.display.html
index ee4cc1009..8d90a226b 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.display.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.display.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Tekrarlanan randevuları ayarlama">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Randevu anımsatıcılarını kullanma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.display">
 <div class="titlepage"><div><div><h3 class="title">Randevunun görünümünü ayarlama</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.11.2"></a><p id="ox.appsuite.user.concept.calendar.add.display">Aşağıdaki seçenekler mevcuttur:</p>
@@ -70,7 +70,7 @@
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Randevular takvim görünümünde nasıl görüntülenir?</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.display">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.display">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.followup.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.followup.html
index a9927b555..520b28bcd 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.followup.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.followup.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="planlama görünümünü kullanma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Planlama görünümünü kullanma">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Katılımcıları yeni bir randevuya davet etme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.followup">
 <div class="titlepage"><div><div><h3 class="title">Takip randevusu oluÅŸturma</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.16.2"></a><a class="indexterm" name="id-1.8.10.16.3"></a><p id="ox.appsuite.user.concept.calendar.add.followup">Mevcut bir randevu için takip randevusu (onu izleyen bir randevu) oluşturabilirsiniz. Takip randevusunda gerekli bilgiler mevcut randevudan alınarak doldurulur.</p>
@@ -58,11 +58,11 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Yeni randevu oluÅŸturma</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">çakışmaları çözme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Çakışmaları çözme</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.followup">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.followup">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.html
index f5cf925b8..c79c2f0f9 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.html
@@ -1,7 +1,7 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>randevu oluÅŸturma</title>
+<title>Randevu oluÅŸturma</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.add">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">randevu oluÅŸturma</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Randevu oluÅŸturma</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.calendar.add">Randevu oluşturmayı ve randevu bilgilerini girmeyi öğrenin:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Yeni randevu oluÅŸturma</a></p></li>
@@ -42,12 +42,12 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.alarms.html">Randevu anımsatıcılarını kullanma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Katılımcı veya kaynak ekleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attachments.html">Dosya ekleme</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Takip randevusu oluÅŸturma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Katılımcıları yeni bir randevuya davet etme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">E-posta alıcılarını yeni randevulara davet etme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">iCal eklerinden randevu oluÅŸturma</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">çakışmaları çözme</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Çakışmaları çözme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.hint.calendar.add">Notlar:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.icalattachment.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.icalattachment.html
index a301b66bf..8419a0d94 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.icalattachment.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.icalattachment.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="E-posta alıcılarını yeni randevulara davet etme">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="çakışmaları çözme">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Çakışmaları çözme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.icalattachment">
 <div class="titlepage"><div><div><h3 class="title">iCal eklerinden randevu oluÅŸturma</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.19.2"></a><a class="indexterm" name="id-1.8.10.19.3"></a><p id="ox.appsuite.user.concept.calendar.add.icalattachment">Bir e-postanın iCal ekinden randevu oluşturabilirsiniz. iCal eklerini .ics şeklindeki dosya uzantısından tanıyabilirsiniz.</p>
@@ -45,9 +45,9 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Yeni randevu oluÅŸturma</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">çakışmaları çözme</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Çakışmaları çözme</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.participants.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.participants.html
index 343756f90..594740337 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.participants.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.participants.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Randevu anımsatıcılarını kullanma">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Dosya ekleme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.participants">
 <div class="titlepage"><div><div><h3 class="title">Katılımcı veya kaynak ekleme</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.13.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.participants">
@@ -62,6 +62,7 @@
 <li class="listitem"><p role="presentation">Dış katılımcılar randevuyu kabul ederse bir e-posta alırsınız.</p></li>
 </ul>
           <p role="presentation" class="feat-io-ox-core-managedResources">Not: Yönetilen bir kaynak eklediğinizde rezervasyon sorumlusuna o kaynak için rezervasyon isteği gönderilir. Rezervasyon sorumlusu rezervasyon istediğinizi kabul veya reddettiğinde size bilgi verilecektir.</p>
+          
         </div>
 </div>
 <p id="ox.appsuite.user.tip.calendar.add.participants">İpucu: tüm katılımcıların ve kaynakların serbest randevularını bulmak Için <a class="link" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanabilirsiniz</a>.</p>
@@ -77,7 +78,7 @@
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Kişileri veya Kaynakları Bir Adres Defterinden Otomatik Olarak Ekleme</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Kişileri veya Kaynakları Bir Adres Dizininden Otomatik Olarak Ekleme</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.participants">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.participants">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.recipients.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.recipients.html
index 1ccca136d..338e2aa77 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.recipients.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.recipients.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Katılımcıları yeni bir randevuya davet etme">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="iCal eklerinden randevu oluÅŸturma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.recipients">
 <div class="titlepage"><div><div><h3 class="title">E-posta alıcılarını yeni randevulara davet etme</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.18.2"></a><p id="ox.appsuite.user.concept.calendar.add.recipients">Gönderdiğiniz veya aldığınız bir e-postanın alıcılarını yeni bir randevuya davet edebilirsiniz.</p>
@@ -53,11 +53,11 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Katılımcıları yeni bir randevuya davet etme</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">çakışmaları çözme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Çakışmaları çözme</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.recipients">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.recipients">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.scheduling.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.scheduling.html
index 733d9d312..fcab94d6a 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.scheduling.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.scheduling.html
@@ -1,11 +1,11 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>planlama görünümünü kullanma</title>
+<title>Planlama görünümünü kullanma</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Dosya ekleme">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Takip randevusu oluÅŸturma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.scheduling">
-<div class="titlepage"><div><div><h3 class="title">planlama görünümünü kullanma</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Planlama görünümünü kullanma</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.15.2"></a><a class="indexterm" name="id-1.8.10.15.3"></a><a class="indexterm" name="id-1.8.10.15.4"></a><a class="indexterm" name="id-1.8.10.15.5"></a><p id="ox.appsuite.user.concept.calendar.add.scheduling">Birden fazla katılımcıya veya kaynağa sahip bir randevuyu planlarken Planlama görünümü kullanıcıların ve kaynakların boş ve meşgul zaman aralıklarını gösterir.</p>
 <p id="ox.appsuite.user.hint.calendar.add.scheduling">İpucu: Randevularınızın planlama görünümünde hangi kullanıcıların görebileceğini takvim ayarlarından ayarlayabilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.add.scheduling">
@@ -87,11 +87,11 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Yeni randevu oluÅŸturma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Katılımcıları yeni bir randevuya davet etme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">çakışmaları çözme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Çakışmaları çözme</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy">Serbest/meşgul bilgisini diğer kullanıcılara göster</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.scheduling">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.scheduling">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.serial.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.serial.html
index 7172ec4c0..f7f645a2a 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.serial.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.add.serial.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.call.html" title="Sesli/görüntülü görüşme planlama">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.display.html" title="Randevunun görünümünü ayarlama">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
-<h2 class="sr-only">randevu oluÅŸturma</h2>
+<h2 class="sr-only">Randevu oluÅŸturma</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.serial">
 <div class="titlepage"><div><div><h3 class="title">Tekrarlanan randevuları ayarlama</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.10.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.serial">
@@ -103,7 +103,7 @@
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.serial.html">Tekrarlanan görevler oluşturma</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.serial">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluşturma</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.serial">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluşturma</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.attachments.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.attachments.html
index a2f379a47..de869ec8e 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.attachments.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Takvim">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.view.appointments.html" title="Randevular takvim görünümünde nasıl görüntülenir?">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="randevu oluÅŸturma">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="Randevu oluÅŸturma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.deputy.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.deputy.html
index 2ddeb8384..e911c585f 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.deputy.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.deputy.html
@@ -58,12 +58,12 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluÅŸturma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluÅŸturma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Vekil Olarak E-posta Gönderme ve Alma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vekilleri Yönetme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">vekilleri yönet</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.deputy">Ana başlık:<a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">Takvim</span></i></a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.create.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.create.html
index efa67822d..1e64713ae 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.create.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.create.html
@@ -103,7 +103,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">Takvim</span> ayrıntı görünümü</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Yeni randevu oluÅŸturma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluÅŸturma</a></p>
 <p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Vekil Olarak Randevu Oluşturma, Düzenleme ve Yönetme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Randevuları Düzenleme</a></p>
 </li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.detailview.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.detailview.html
index b8dd9542d..3556af0f3 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.detailview.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.detailview.html
@@ -61,7 +61,7 @@
 <li class="listitem">
 <p role="presentation">Diğer randevu bilgileri (ayarlanmışsa):</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">ekler</p></li>
+<li class="listitem"><p role="presentation">Ekler</p></li>
 <li class="listitem"><p role="presentation">tanım</p></li>
 <li class="listitem">
 <p role="presentation">organizatör, ek alıcılar, kaynaklar</p>
@@ -97,10 +97,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Kişileri hale görünümünde görüntüleme</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Randevu Katılımcılarını Arama</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Randevu durumunu deÄŸiÅŸtirme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Randevu anımsatıcılarını değiştirme</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.detailview">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">Takvim</span> Bileşenleri</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.foldertree.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.foldertree.html
index 5b0017e74..382f46985 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.foldertree.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.foldertree.html
@@ -60,7 +60,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Randevuları Görüntüleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">KiÅŸisel takvimler ekleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Takvim renklerini kullanma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">Kaynak takvimleri ve kaynak takvim grupları oluşturma</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.edit.html">Kaynak takvimlerini düzenleme</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Kaynak takvimini kullanarak randevu oluÅŸturma</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.list.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.list.html
index d6496df2c..65f8a2741 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.list.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.list.html
@@ -49,11 +49,11 @@
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">Takvim</span> ayrıntı görünümü</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Randevuları farklı görünümlerde görüntüleme</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.view.html">Kaynak takvimlerini görüntüleme</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.list">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">Takvim</span> Bileşenleri</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.new.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.new.html
index d35ea8d6c..021ff0c71 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.new.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.new.html
@@ -47,10 +47,7 @@
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Yeni randevu oluÅŸturma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluÅŸturma</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">Google takvimlerine abone olma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Ortak ve paylaşılan takvimlere abone olma</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.popup.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.popup.html
index f6d62807d..7afb2d69d 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.popup.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.popup.html
@@ -65,7 +65,7 @@
 <li class="listitem">
 <p role="presentation">Diğer randevu bilgileri (ayarlanmışsa):</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">ekler</p></li>
+<li class="listitem"><p role="presentation">Ekler</p></li>
 <li class="listitem"><p role="presentation">tanım</p></li>
 <li class="listitem">
 <p role="presentation">organizatör, ek alıcılar, kaynaklar</p>
@@ -111,15 +111,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Randevuları Düzenleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Takip randevusu oluÅŸturma</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Randevu durumunu deÄŸiÅŸtirme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Randevu anımsatıcılarını değiştirme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Organizatörü değiştirme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Randevuları başka bir takvime taşıma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Randevuları dışa aktarma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Randevuları yazdırma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Randevuları silme</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Randevu katılımcılarına e-posta gönderme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.popup">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">Takvim</span> Bileşenleri</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.scheduling.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.scheduling.html
index a81fb71da..cb8a79bc3 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.scheduling.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.scheduling.html
@@ -66,7 +66,7 @@
 <p id="ox.appsuite.user.related.calendar.gui.scheduling"></p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">Tarih seçici</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.create.html">Randevu düzenleme penceresi</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.toolbar.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.toolbar.html
index c1a989c5c..c11d866a4 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.toolbar.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.gui.toolbar.html
@@ -71,14 +71,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Randevuları Düzenleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Randevu anımsatıcılarını değiştirme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Organizatörü değiştirme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Randevuları başka bir takvime taşıma</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Randevuları dışa aktarma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Randevuları yazdırma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">Randevuları silme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.toolbar">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">Takvim</span> Bileşenleri</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.invitation.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.invitation.html
index d5de6ee9c..83fe3c768 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.invitation.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.invitation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Takvim">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="çakışmaları çözme">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Çakışmaları çözme">
 <link rel="next" href="ox.appsuite.user.sect.calendar.edit.html" title="Randevuları Düzenleme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.categories.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.categories.html
new file mode 100644
index 000000000..eed1c9292
--- /dev/null
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.categories.html
@@ -0,0 +1,88 @@
+<html lang="tr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Randevular için kategorileri kullanma</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Kullanım Kılavuzu">
+<link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Randevuları yönetme">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Favori saat dilimlerini yönetme">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Takvim renklerini kullanma">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Geri</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Sonraki</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Takvim</span></h1>
+<h2 class="sr-only">Randevuları yönetme</h2>
+<div class="sect2" id="ox.appsuite.user.sect.calendar.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Randevular için kategorileri kullanma</h3></div></div></div>
+<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><a class="indexterm" name="id-1.8.15.11.4"></a><p id="ox.appsuite.user.concept.calendar.manage.categories">Ranedvularınızı takvimlerden bağımsız olarak düzenlemek için kategorileri kullanabilirsiniz.</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Randevulara kategori atayabilirsiniz.</p></li>
+<li class="listitem"><p role="presentation">Bir kategoriye atanmış tüm randevuları görüntüleyebilirsiniz.</p></li>
+</ul>
+<p>Kendi kategorilerinizi oluşturabilir, düzenleyebilir ve silebilirsiniz. Bkz. <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a>.</p>
+<div class="task" id="ox.appsuite.user.task.calendar.manage.categories">
+<p class="title">Randevulara kategori atamak için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Görünüme bağlı olarak aşağıdaki olanaklara sahipsiniz:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Takvim görünümünde bir randevuya tıklayın. Açılır penceredeki <span class="guibutton"><strong>Randevuyu yüzenle</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> tıklayın.</p></li>
+<li class="listitem"><p role="presentation">Liste görünümünde bir randevu seçin. Araç çubuğundaki <span class="guibutton"><strong>Randevuyu düzenle</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> tıklayın.</p></li>
+</ul></p>
+<p role="presentation">Randevu düzenleme penceresi açılır.</p>
+</li>
+<li class="step">
+<p role="presentation">Bunu yapmak için <span class="guibutton"><strong>Kategoriler</strong></span>'in yanındaki <span class="guibutton"><strong>Kategori ekle</strong></span>'ye tıklayın. Bir kategori seçin.</p>
+<p role="presentation">Randevuya atanmış bir kategoriyi kaldırmak isterseniz kategorinin yanındaki <span class="guibutton"><strong>Kategoriyi kaldır</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> tıklayın.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.calendar.categories.view">
+<p class="title">Belirli bir kategoriye atanmış randevuları görüntülemek için:</p>
+<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Görünüme bağlı olarak aşağıdaki olanaklara sahipsiniz:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Takvim görünümünde, kategori atanmış bir randevuya tıklayın. Açılan pencereden kategoriye tıklayın.</p></li>
+<li class="listitem"><p role="presentation">Liste görünümünde, kategori atanmış bir randevuya tıklayın. Ayrıntı görünümde kategoriye tıklayın.</p></li>
+</ul></p></li></ul></div>
+<div class="taskrelated">
+          <p>Sonuç:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Liste görünümünde, bu kategoriye atanmış tüm randevular gösterilir.</p></li>
+<li class="listitem"><p role="presentation">Önceki görünümü görmek isterseniz arama alanındaki <span class="guibutton"><strong>Aramayı iptal et</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> tıklayın.</p></li>
+</ul>
+          <p>İpucu: Arama seçeneklerini kullanarak da kategorileri arayabilirsiniz.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.calendar.manage.categories"></p>
+<p class="title">İlgili konular:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Randevu Arama</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Yeni e-postalarda varsayılan olarak PGP inline kullan</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Kişiler için kategorileri kullanma</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Görevler için kategorileri kullanma</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.calendar.manage.categories">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.changeorganizer.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
index c39022f45..36c114f8a 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
@@ -59,8 +59,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changeorganizer"></p>
 <p class="title">Kullanıcı arayüzü:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">Takvim</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">Takvim</span> liste görünümü</a></p>
 </li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.changereminder.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.changereminder.html
index 93d4c787f..577329743 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.changereminder.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.changereminder.html
@@ -55,9 +55,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changereminder"></p>
 <p class="title">Kullanıcı arayüzü:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">Takvim</span> araç çubuğu</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">Takvim</span> ayrıntı görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">Takvim</span> liste görünümü</a></p>
 </li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.changestatus.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.changestatus.html
index 88f27a4c8..93ab029e1 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.changestatus.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.changestatus.html
@@ -59,6 +59,7 @@
 <p class="title">Kullanıcı arayüzü:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">Takvim</span> liste görünümü</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">Takvim</span> ayrıntı görünümü</a></p>
 </li></ul>
 <p> </p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.colors.html
index 41ca31d79..8358aaeda 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.colors.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.colors.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Randevuları yönetme">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Favori saat dilimlerini yönetme">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Randevular için kategorileri kullanma">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.move.html" title="Randevuları başka bir takvime taşıma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.move.html">Sonraki</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Randevuları yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.colors">
 <div class="titlepage"><div><div><h3 class="title">Takvim renklerini kullanma</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">Takvim rengini tanımlayabilirsiniz. Varsayılan olarak, bu takvimdeki tüm randevular takvim renginde görüntülenir. Bir randevuyu oluştururken veya düzenlerken ona özel bir renk atarsanız o randevu, takvimin renginde değil, atanan renkte görüntülenir.</p>
+<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">Takvim rengini tanımlayabilirsiniz. Varsayılan olarak, bu takvimdeki tüm randevular takvim renginde görüntülenir. Bir randevuyu oluştururken veya düzenlerken ona özel bir renk atarsanız o randevu, takvimin renginde değil, atanan renkte görüntülenir.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.colors">
 <p class="title">Takvim rengini seçme:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -42,10 +42,13 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.calendar.manage.colors"></p>
+<p class="title">Kullanıcı arayüzü:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">Takvim</span> klasör görünümü</a></p></li></ul>
+<p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Randevular takvim görünümünde nasıl görüntülenir?</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">Takvim</span> klasör görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Randevular takvim görünümünde nasıl görüntülenir?</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.colors">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.delete.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.delete.html
index a122ff313..4c3d6e38a 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.delete.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Randevuları yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Randevuları silme</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Uyarı:</strong></span> Silinen randevular <span class="phrase"><strong>geri getirilemez</strong></span>. Yapılandırmaya bağlı olarak, yalnızca randevunun organizatörü olmanız halinde özel takvimlerinizdeki randevuları silebilirsiniz.</p>
+<a class="indexterm" name="id-1.8.15.17.2"></a><a class="indexterm" name="id-1.8.15.17.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Uyarı:</strong></span> Silinen randevular <span class="phrase"><strong>geri getirilemez</strong></span>. Yapılandırmaya bağlı olarak, yalnızca randevunun organizatörü olmanız halinde özel takvimlerinizdeki randevuları silebilirsiniz.</p>
 <p id="ox.appsuite.user.concept.calendar.manage.delete">Nesneleri silme izniniz varsa randevuları takvimden silebilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.delete">
 <p class="title">Randevuları silme:</p>
@@ -67,8 +67,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.delete"></p>
 <p class="title">Kullanıcı arayüzü:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">Takvim</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">Takvim</span> liste görünümü</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.delete">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.export.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.export.html
index b5f8d95b9..50aaa2715 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.export.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Randevuları yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Randevuları dışa aktarma</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">Randevuları iCal biçiminde dışa aktarabilirsiniz. Bu biçimi, örneğin randevularınızı başka takvim uygulamalarına kaydetmek için kullanabilirsiniz. Bir takvimdeki randevuları tek tek veya hepsini birden dışa aktarabilirsiniz.</p>
+<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">Randevuları iCal biçiminde dışa aktarabilirsiniz. Bu biçimi, örneğin randevularınızı başka takvim uygulamalarına kaydetmek için kullanabilirsiniz. Bir takvimdeki randevuları tek tek veya hepsini birden dışa aktarabilirsiniz.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.manage.export.selected">
 <p class="title">Randevuları tek tek dışa aktarma:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -60,14 +60,16 @@
 <p id="ox.appsuite.user.related.calendar.manage.export"></p>
 <p class="title">Kullanıcı arayüzü:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">Takvim</span> klasör görünümü</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">Takvim</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">Takvim</span> liste görünümü</a></p>
 </li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Randevuları içe aktarma</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.8.15.14.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Kişisel Verileri İndirme</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.8.15.15.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Kişisel Verileri İndirme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.manage.export">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.html
index adb8bcade..25f019023 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.html
@@ -38,6 +38,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Randevu anımsatıcılarını değiştirme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Organizatörü değiştirme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Favori saat dilimlerini yönetme</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Randevular için kategorileri kullanma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Takvim renklerini kullanma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Randevuları başka bir takvime taşıma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Randevuları içe aktarma</a></p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.import.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.import.html
index 6e794ab4f..d659d1c68 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.import.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Randevuları yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Randevuları içe aktarma</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><a class="indexterm" name="id-1.8.15.13.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">iCal biçimindeki dosyalardaki randevuları içe aktarabilirsiniz.</p>
+<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">iCal biçimindeki dosyalardaki randevuları içe aktarabilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.import">
 <p class="title">iCal dosyalarındaki randevuları içe aktarma:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,10 +51,13 @@
         </div>
 </div>
 <p id="ox.appsuite.user.related.calendar.manage.import"></p>
+<p class="title">Kullanıcı arayüzü:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">Takvim</span> klasör görünümü</a></p></li></ul>
+<p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Randevuları dışa aktarma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluÅŸturma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluÅŸturma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Dosyalardan takvimleri içe aktarma</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.import">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.move.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.move.html
index cca6db140..b9205b766 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.move.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.move.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Randevuları yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Randevuları başka bir takvime taşıma</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">Tekli randevuları başka bir takvime taşıyabilirsiniz ama randevu dizilerini taşıyamazsınız.</p>
+<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">Tekli randevuları başka bir takvime taşıyabilirsiniz ama randevu dizilerini taşıyamazsınız.</p>
 <p>Ön koşul: Hedef takvimde nesne oluşturma iznine sahip olmanız gerekir.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.move">
 <p class="title">Randevuları başka bir takvime taşıma:</p>
@@ -52,8 +52,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.move"></p>
 <p class="title">Kullanıcı arayüzü:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">Takvim</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">Takvim</span> liste görünümü</a></p>
 </li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.print.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.print.html
index 7e05b1f29..7533ff55d 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.print.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Randevuları yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Randevuları yazdırma</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><a class="indexterm" name="id-1.8.15.15.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">Takvimleri ve randevuları yazdırırken şunları yapabilirsiniz:</p>
+<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><a class="indexterm" name="id-1.8.15.16.4"></a><a class="indexterm" name="id-1.8.15.16.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">Takvimleri ve randevuları yazdırırken şunları yapabilirsiniz:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">randevuları içeren bir takvim sayfası yazdırma</p></li>
 <li class="listitem"><p role="presentation">randevu bilgilerini yazdırma</p></li>
@@ -82,9 +82,11 @@
 <p id="ox.appsuite.user.related.calendar.manage.print"></p>
 <p class="title">Kullanıcı arayüzü:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html"><span class="phrase">Takvim</span> ayarlar menüsü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">Takvim</span> klasör görünümü</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">Takvim</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">Takvim</span> liste görünümü</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.print">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Randevuları yönetme</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.timezones.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.timezones.html
index 8d32fbd89..20ed7c765 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.timezones.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.manage.timezones.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Randevuları yönetme">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Organizatörü değiştirme">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Takvim renklerini kullanma">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Randevular için kategorileri kullanma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Sonraki</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Sonraki</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.search.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.search.html
index 67e6e97d0..2c52749d9 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.search.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.search.html
@@ -80,7 +80,7 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Randevuları farklı görünümlerde görüntüleme</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Randevular için kategorileri kullanma</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.search">Ana başlık:<a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">Takvim</span></i></a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.settings.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.settings.html
index aeedb6d9a..8929cec20 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.settings.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.settings.html
@@ -91,7 +91,7 @@
 <p id="ox.appsuite.user.reference.calendar.settings.jitsi"></p>
 <h3 class="title">Jitsi toplantıları</h3>
 <p><a class="indexterm" name="id-1.8.22.9.2"></a>Bu seçeneklerle, randevu oluştururken <span class="guibutton"><strong>Konferans</strong></span> açılır menüsünden <span class="guibutton"><strong>Jitsi toplantısı</strong></span>'nı seçtiğinizde ne olacağını tanımlayabilirsiniz.</p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>Otomatik olarak bağlantıyı konuma kopyala. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Jitsi toplantısına katılma bağlantısının <span class="guibutton"><strong>Konum</strong></span> alanına kopyalanıp kopyalanmayacağını tanımlar.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>otomatik olarak bağlantıyı konuma kopyala. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Jitsi toplantısına katılma bağlantısının <span class="guibutton"><strong>Konum</strong></span> alanına kopyalanıp kopyalanmayacağını tanımlar.</p></li></ul>
 <p>Bkz. <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Sesli/görüntülü görüşme planlama</a></p>
 </div>
 <div id="ox.appsuite.user.reference.calendar.settings.zoom" class="feat-zoom">
@@ -103,8 +103,8 @@
 <p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments"><b>Randevular. </b></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.password"><b>Her zaman rastgele bir toplantı parolası ekle. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.1.1.2"></a>Konferansın otomatik oluşturulan bir parolayla korunup korunmayacağını tanımlar.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>Otomatik olarak bağlantıyı konuma kopyala. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Zoom toplantısına katılma bağlantısının <span class="guibutton"><strong>Konum</strong></span> alanına kopyalanıp kopyalanmayacağını tanımlar.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>Otomatik olarak telefon bilgisini açıklamaya kopyala. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Zoom toplantısına katılma bağlantısının <span class="guibutton"><strong>Konum</strong></span> alanına kopyalanıp kopyalanmayacağını tanımlar.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>otomatik olarak bağlantıyı konuma kopyala. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Zoom toplantısına katılma bağlantısının <span class="guibutton"><strong>Konum</strong></span> alanına kopyalanıp kopyalanmayacağını tanımlar.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>otomatik olarak telefon bilgisini açıklamaya kopyala. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Zoom toplantısına katılma bağlantısının <span class="guibutton"><strong>Konum</strong></span> alanına kopyalanıp kopyalanmayacağını tanımlar.</p></li>
 </ul>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.dialinnumber"><b>Telefon numaraları. </b>Zoom Pro hesabınız varsa Zoom bazı ülkeler için telefon numaraları sunar. Randevu davetlerinde görüntülenecek ülkeleri tanımlamak için <span class="guibutton"><strong>Zoom profilini aç</strong></span>'a tıklayın.</p></li>
@@ -115,8 +115,8 @@
 <h3 class="title">GeliÅŸmiÅŸ ayarlar</h3>
 <p><a class="indexterm" name="id-1.8.22.11.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>doğum günü takvimini göster. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Klasör görünümünde doğum günü takviminin görünüp görünmeyeceğini tanımlar.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>geçmiş randevuların anımsatıcılarını göster. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Tarihi geçmiş randevu anımsatıcılarının görünüp görünmeyeceğini tanımlar.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>Doğum günü takvimini göster. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Klasör görünümünde doğum günü takviminin görünüp görünmeyeceğini tanımlar.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>Geçmiş randevuların anımsatıcılarını göster. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Tarihi geçmiş randevu anımsatıcılarının görünüp görünmeyeceğini tanımlar.</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.calendar.settings.advanced.emailchanges"><b>E-posta ile gelen randevu değişikliklerini otomatik olarak takvimime uygula. </b><a class="indexterm" name="id-1.8.22.11.3.1.3.1.2"></a>Dış kişilerden gelen randevu davetlerinin hangi durumlarda takviminize otomatik olarak ekleneceğini tanımlar.</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -125,12 +125,12 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Her zaman</strong></span>. Randevu deÄŸiÅŸikliÄŸi her zaman otomatik olarak takviminize eklenecektir.</p></li>
 </ul>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy"><b>Serbest/meşgul bilgisini diğer kullanıcılara göster. </b><a class="indexterm" name="id-1.8.22.11.3.1.4.1.2"></a>Planlama görünümünde hangi kullanıcıların randevularınızı görebileceğinizi tanımlar. Ayrıca bkz.<a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy"><b>Serbest/meşgul bilgisini diğer kullanıcılara göster. </b><a class="indexterm" name="id-1.8.22.11.3.1.4.1.2"></a>Planlama görünümünde hangi kullanıcıların randevularınızı görebileceğinizi tanımlar. Ayrıca bkz.<a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a></p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.usedforsync"><b>Paylaşılan takvimlere abone olma. </b><a class="indexterm" name="id-1.8.22.11.3.1.5.1.2"></a>Bkz. <a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Ortak ve paylaşılan takvimlere abone olma</a></p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.declined"><b>Reddedilen randevuları göster. </b><a class="indexterm" name="id-1.8.22.11.3.1.6.1.2"></a>Reddettiğiniz randevuların görünüp görünmeyeceğini tanımlar. Bkz. <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Randevu Davetlerini Yanıtlama</a></p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.participantsedit"><b>Randevu oluştururken ve düzenlerken her zaman "Katılımcılar randevuları düzenleyebilir" seçeneğini işaretle. </b><a class="indexterm" name="id-1.8.22.11.3.1.7.1.2"></a>Katılımcılara varsayılan olarak randevuyu düzenleme izni verilip verilmeyeceğini tanımlar.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.wholeday"><b>Randevu oluştururken ve düzenlerken tam günlük randevuları otomatik olarak "serbest" olarak işaretle. </b><a class="indexterm" name="id-1.8.22.11.3.1.8.1.2"></a>Tam günlük randevuların varsayılan olarak serbest görünüp görünmeyeceğini tanımlar.</p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>randevular için birinci kategori rengini kullan. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Kategori atadığınız randevuların o kategorinin renginde görünüp görünmeyeceğini tanımlar. Bir randevuya birden çok kategori atarsanız ilk atanan kategorinin rengi kullanılır. Bkz. <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>Randevular için birinci kategori rengini kullan. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Kategori atadığınız randevuların o kategorinin renginde görünüp görünmeyeceğini tanımlar. Bir randevuya birden çok kategori atarsanız ilk atanan kategorinin rengi kullanılır. Bkz. <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.settings"></p>
 <p class="title">İlgili konular:</p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.appointments.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.appointments.html
index 5f95c4ec2..b5bd1286a 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.appointments.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.appointments.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Randevuları Görüntüleme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.appointments">
 <div class="titlepage"><div><div><h3 class="title">Randevular takvim görünümünde nasıl görüntülenir?</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.9.2"></a><a class="indexterm" name="id-1.8.8.9.3"></a><a class="indexterm" name="id-1.8.8.9.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">Aşağıdaki randevu özellikleri, takvim görünümündeki randevuların görünümünü belirler:</p>
+<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><a class="indexterm" name="id-1.8.8.8.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">Aşağıdaki randevu özellikleri, takvim görünümündeki randevuların görünümünü belirler:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">Randevu rengi</p>
@@ -62,7 +62,7 @@
 <p role="presentation">Reddettiğiniz randevular gri renkte görüntülenecektir. Konunun önüne <span class="guibutton"><strong>Reddedildi</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.declined"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span> simgesi eklenecektir. Konunun üstü çizilir.</p>
 <p role="presentation">Reddedilen randevuların görünüp görünmeyeceğini takvim ayarlarından ayarlayabilirsiniz.</p>
 </li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.6.2.1.6"><p role="presentation">Diğer tüm katılımcıların reddettiği randevular <span class="guibutton"><strong>Herkes reddetti</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span> simgesiyle işaretlenecektir.</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.6.2.1.6"><p role="presentation">Diğer tüm katılımcıların reddettiği randevular <span class="guibutton"><strong>Herkes reddetti</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span> simgesiyle işaretlenecektir.</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.view.appointments.private"></p>
 <h4 class="title">Özel randevu görünümü</h4>
@@ -89,7 +89,7 @@
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.secret"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span>gizli randevu</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.unconfirmed"><object type="image/svg+xml" data="../../images/question-circle.svg" height="15"></object></span>onaylanmamış randevu</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.rejected"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>reddedilmiÅŸ randevu</p></li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>diğer tüm katılımcılar tarafından reddedilmiş randevu</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>diğer tüm katılımcılar tarafından reddedilmiş randevu</p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.view.appointments"></p>
 <p class="title">İlgili konular:</p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.html
index eb4f836f8..a0d40e0b4 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.html
@@ -38,9 +38,6 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.timezones.html">Birden çok saat dilimini görüntüleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">Randevular takvim görünümünde nasıl görüntülenir?</a></p></li>
 </ul>
-<p id="ox.appsuite.user.related.calendar.view"></p>
-<p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">Takvim</span> klasör görünümü</a></p></li></ul>
 <p id="ox.appsuite.user.parent.calendar.view">Ana başlık:<a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">Takvim</span></i></a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.timezones.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.timezones.html
index 1b0b83e0c..953be748a 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.timezones.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.timezones.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Randevuları Görüntüleme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.timezones">
 <div class="titlepage"><div><div><h3 class="title">Birden çok saat dilimini görüntüleme</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">Varsayılan saat dilimine ek olarak, sık kullanılanlara eklediğiniz saat dilimlerini de görebilirsiniz. Varsayılan saat dilimi temel ayarlardan değiştirilebilir.</p>
+<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">Varsayılan saat dilimine ek olarak, sık kullanılanlara eklediğiniz saat dilimlerini de görebilirsiniz. Varsayılan saat dilimi temel ayarlardan değiştirilebilir.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.timezones">
 <p class="title">Takvim görünümünde birden çok saat dilimini görüntüleme:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.views.html b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.views.html
index 1285531cc..7639600f8 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.views.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.calendar.view.views.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Randevuları Görüntüleme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.views">
 <div class="titlepage"><div><div><h3 class="title">Randevuları farklı görünümlerde görüntüleme</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><a class="indexterm" name="id-1.8.8.7.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Takvim randevularını farklı görünümlerde görüntülemeyi öğrenin:</p>
+<a class="indexterm" name="id-1.8.8.6.2"></a><a class="indexterm" name="id-1.8.8.6.3"></a><a class="indexterm" name="id-1.8.8.6.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">Takvim randevularını farklı görünümlerde görüntülemeyi öğrenin:</p>
 <div class="task" id="ox.appsuite.user.task.calendar.view.views">
 <p class="title">Randevuyu görüntülemek için:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.create.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.create.html
index 6e1f9e816..f7e97fb93 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.create.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.create.html
@@ -44,8 +44,8 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">Kişinin resmi (yüklendiyse). İlgili kişinin resmine tıklayarak resmi düzenleyebilir veya yeni bir resim yükleyebilirsiniz.</p>
-<p role="presentation">Soyad, ad</p>
-<p role="presentation">Unvan, iÅŸ bilgileri, adres (girilmiÅŸse)</p>
+<p role="presentation">soyad, ad</p>
+<p role="presentation">unvan, iÅŸ bilgileri, adres (girilmiÅŸse)</p>
 </li>
 <li class="listitem">
 <p role="presentation">KiÅŸisel bilgiler</p>
@@ -80,13 +80,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">Düzenleme penceresi</a></p></li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">Adres Defteri</span> ayrıntı görünümü</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Yeni bir kiÅŸi oluÅŸturma</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">KiÅŸi Ekleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Kişileri ve Dağıtım Listelerini Düzenleme</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.create">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">Adres Defteri</span> Bileşenleri</a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.detailview.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.detailview.html
index e8b888f63..7ea0db369 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.detailview.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.detailview.html
@@ -40,17 +40,17 @@
 <p class="title">İçerik</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Kişinin resmi (yüklendiyse)</p>
-<p role="presentation">Soyad, ad</p>
-<p role="presentation">Unvan, iÅŸ bilgileri, adres (girilmiÅŸse)</p>
+<p role="presentation">kişinin resmi (yüklendiyse)</p>
+<p role="presentation">soyad, ad</p>
+<p role="presentation">unvan, iÅŸ bilgileri, adres (girilmiÅŸse)</p>
 </li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.7.11.4.1.3">
-<p role="presentation">Atanan kategoriler</p>
+<p role="presentation">atanan kategoriler</p>
 <p role="presentation">Bir kategoriye tıkladığında o kategoriye atanan kişiler aranır.</p>
 </li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.4"><p role="presentation">Yapılandırmaya bağlı olarak: kişinin aranabilirlik durumu</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.5">
-<p role="presentation">Konfigürasyona bağlı olarak: Kişiyle iletişim kurma simgeleri:</p>
+<p role="presentation">Yapılandırmaya bağlı olarak: kişiyle iletişim kurma simgeleri:</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>E-posta</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.detailview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>. E-posta yazma penceresini açar.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Ara</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.detailview.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>. Arama işlevlerini içeren menüyü açar.</p></li>
@@ -78,7 +78,7 @@
 </li>
 <li class="listitem"><p role="presentation">Not</p></li>
 <li class="listitem"><p role="presentation">Maksimum 18 isteğe bağlı kullanıcı alanı</p></li>
-<li class="listitem"><p role="presentation">ekler</p></li>
+<li class="listitem"><p role="presentation">Ekler</p></li>
 </ul>
 </li>
 </ul>
@@ -89,15 +89,11 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">Adres Defteri</span> liste görünümü</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.create.html">Kişi düzenleme penceresi</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Bir adres defterindeki kişileri görüntüleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.attachments.html">Kişi Eklerini Görüntüleme ve Kaydetme</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">KiÅŸileri arama</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.detailview">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">Adres Defteri</span> Bileşenleri</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.foldertree.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.foldertree.html
index 7efaabba8..22226ebbc 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.foldertree.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.foldertree.html
@@ -56,6 +56,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Bir adres defterindeki kişileri görüntüleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adres Defteri Ekleme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Klasörleri Kullanarak Verileri Yönetme</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.list.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.list.html
index 7658f3d85..199e13254 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.list.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.list.html
@@ -48,8 +48,8 @@
 <p role="presentation">Her kişi için aşağıdaki bilgiler görüntülenir:</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">resim (yüklendiyse)</p></li>
-<li class="listitem"><p role="presentation">Soyad, ad</p></li>
-<li class="listitem"><p role="presentation">İş bilgileri (kaydedildiyse)</p></li>
+<li class="listitem"><p role="presentation">soyad, ad</p></li>
+<li class="listitem"><p role="presentation">iÅŸ bilgileri (kaydedildiyse)</p></li>
 </ul>
 <p role="presentation">Rakam veya özel bir karakterle başlayan adlar liste görünümünün başındaki <span class="guibutton"><strong>#</strong></span> kısmında görünür. Özel bir işaretle başlayan adlar liste görünümünün en altındaki <span class="guibutton"><strong>Ω</strong></span> kısmında görüntülenir.</p>
 </li>
@@ -61,11 +61,8 @@
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.settingsmenu.html"><span class="phrase">Adres Defteri</span> ayarlar menüsü</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">Adres Defteri</span> ayrıntı görünümü</a></p>
-</li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Bir adres defterindeki kişileri görüntüleme</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.list">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">Adres Defteri</span> Bileşenleri</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.new.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.new.html
index f5bf6c698..f4691baf9 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.new.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.new.html
@@ -37,7 +37,7 @@
 <a class="indexterm" name="id-1.9.7.6.2"></a><p id="ox.appsuite.user.concept.contacts.gui.new">Yeni bir kişi oluşturur. <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> tıklarsanız daha fazla işlev içeren bir menü açılır:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">yeni dağıtım listesi</p></li>
-<li class="listitem"><p role="presentation">Paylaşılan ve diğer adres defterlerine abone olma</p></li>
+<li class="listitem"><p role="presentation">paylaşılan ve diğer adres defterlerine abone olma</p></li>
 <li class="listitem"><p role="presentation">yeni e-posta, yeni randevu, yeni kiÅŸi</p></li>
 </ul>
 <p id="ox.appsuite.user.hint.contacts.gui.new">Not: Klasör kapatılırsa düğme, simge olarak görüntülenecektir. Bu durumda <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesi kullanılamaz. Klasör görünümünü görmek için sol alt kenardaki <span class="guibutton"><strong>Klasör görünümünü aç</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.new.open"><object type="image/svg+xml" data="../../images/layout-split.svg" height="15"></object></span> tıklayın.</p>
@@ -47,7 +47,7 @@
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Yeni bir kiÅŸi oluÅŸturma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">KiÅŸi Ekleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">Yeni dağıtım listeleri oluşturma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Dış adres defterlerine abone olma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Ortak ve paylaşılan adres defterlerine abone olma</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.settingsmenu.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
index 62c9cf5e0..124b0156a 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
@@ -40,7 +40,7 @@
 <li class="listitem"><p role="presentation">Tüm ayarları düzenleme</p></li>
 <li class="listitem"><p role="presentation">Kullanıcı arayüzü için bir tema seçin</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Liste seçenekleri</strong></span>. Kişi resimlerinin ve onay kutularının liste görünümünde görünüp görünmeyeceğini tanımlar.</p></li>
-<li class="listitem"><p role="presentation">Paylaşılan ve diğer adres defterlerine abone olma</p></li>
+<li class="listitem"><p role="presentation">paylaşılan ve diğer adres defterlerine abone olma</p></li>
 <li class="listitem"><p role="presentation">Yapılandırmaya bağlı olarak: <span class="guibutton"><strong>Cihazınızı bağlayın</strong></span>. Groupware verilerinize ulaşabileceğiniz yerel uygulamaları ayarlamaya yarayan sihirbazı başlatır.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.contacts.gui.settingsmenu"></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.toolbar.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.toolbar.html
index caf1f233d..8dfdc5349 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.toolbar.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.gui.toolbar.html
@@ -56,13 +56,7 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Kişileri ve Dağıtım Listelerini Düzenleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Adres defteri içinden e-posta gönderme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">KiÅŸileri bir randevuya davet etme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Kişileri taşıma ve kopyalama</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Kişileri vCard olarak gönderme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Kişileri dışa aktarma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.print.html">Kişileri yazdırma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.delete.html">KiÅŸileri silme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.toolbar">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">Adres Defteri</span> Bileşenleri</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.categories.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.categories.html
new file mode 100644
index 000000000..6a29bda96
--- /dev/null
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.categories.html
@@ -0,0 +1,85 @@
+<html lang="tr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Kişiler için kategorileri kullanma</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Kullanım Kılavuzu">
+<link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Kişileri Yönetme">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="KiÅŸileri bir randevuya davet etme">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Kişileri taşıma ve kopyalama">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Geri</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Sonraki</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Adres Defteri</span></h1>
+<h2 class="sr-only">Kişileri Yönetme</h2>
+<div class="sect2" id="ox.appsuite.user.sect.contacts.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Kişiler için kategorileri kullanma</h3></div></div></div>
+<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><p id="ox.appsuite.user.concept.contacts.manage.categories">Kişilerinizi klasörlerden bağımsız olarak düzenlemek için kategorileri kullanabilirsiniz.</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">KiÅŸilere kategori atayabilirsiniz.</p></li>
+<li class="listitem"><p role="presentation">Bir kategoriye atanmış tüm kişileri görüntüleyebilirsiniz.</p></li>
+</ul>
+<p>Kendi kategorilerinizi oluşturabilir, düzenleyebilir ve silebilirsiniz. Bkz. <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a>.</p>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories">
+<p class="title">Kişilere kategori atamak için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Bir kişi seçin. Araç çubuğundaki <span class="guibutton"><strong>Kişiyi düzenle</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> tıklayın.</p>
+<p role="presentation">Kişi düzenleme penceresi açılır.</p>
+</li>
+<li class="step">
+<p role="presentation">Bunu yapmak için <span class="guibutton"><strong>Kategoriler</strong></span>'in yanındaki <span class="guibutton"><strong>Kategori ekle</strong></span>'ye tıklayın. Bir kategori seçin.</p>
+<p role="presentation">Kişiye atanmış bir kategoriyi kaldırmak isterseniz kategorinin yanındaki <span class="guibutton"><strong>Kategoriyi kaldır</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> tıklayın.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories.view">
+<p class="title">Belirli bir kategoriye atanmış kişileri görüntülemek için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Kategori atanmış bir kişi seçin.</p></li>
+<li class="step"><p role="presentation">Ayrıntı görünümde kategoriye tıklayın.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Sonuç:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Liste görünümünde, bu kategoriye atanmış tüm kişiler gösterilir.</p></li>
+<li class="listitem"><p role="presentation">Önceki listeyi görmek isterseniz arama alanındaki <span class="guibutton"><strong>Aramayı iptal et</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> tıklayın.</p></li>
+</ul>
+          <p>İpucu: Arama seçeneklerini kullanarak da kategorileri arayabilirsiniz.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.contacts.manage.categories"></p>
+<p class="title">İlgili konular:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">KiÅŸi Arama</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Yeni e-postalarda varsayılan olarak PGP inline kullan</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Randevular için kategorileri kullanma</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Görevler için kategorileri kullanma</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.contacts.manage.categories">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.delete.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.delete.html
index 212245896..5689cb1f0 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.delete.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Kişileri Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">KiÅŸileri silme</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Uyarı:</strong></span> Silinen kişiler ve dağıtım listeleri geri <span class="phrase"><strong>getirilemez</strong></span>.</p>
+<a class="indexterm" name="id-1.9.17.15.2"></a><a class="indexterm" name="id-1.9.17.15.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Uyarı:</strong></span> Silinen kişiler ve dağıtım listeleri geri <span class="phrase"><strong>getirilemez</strong></span>.</p>
 <p id="ox.appsuite.user.concept.contacts.manage.delete">Bir adres defterindeki öğeleri silme izniniz varsa o defterdeki kişileri veya dağıtım listelerini silebilirsiniz.</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Tüm kullanıcılar</strong></span> adres defterindeki kişileri silemezsiniz.</p></li>
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.delete"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">Adres Defteri</span> liste görünümü</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.delete">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.export.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.export.html
index fee6a4b1f..1fd986802 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.export.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Kişileri Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Kişileri dışa aktarma</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">Kişileri ve dağıtım listelerini şu biçimlerde dışa aktarabilirsiniz:</p>
+<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><a class="indexterm" name="id-1.9.17.13.4"></a><a class="indexterm" name="id-1.9.17.13.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">Kişileri ve dağıtım listelerini şu biçimlerde dışa aktarabilirsiniz:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">vCard. Örneğin, diğer e-posta uygulamalarıyla kişi alışverişi yapmak için bu biçimi kullanabilirsiniz.</p></li>
 <li class="listitem"><p role="presentation">CSV Kişileri elektronik biçimlerinde dışa aktarmak için bu biçimi kullanabilirsiniz.</p></li>
@@ -71,7 +71,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.export"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">The <span class="phrase">Adres Defteri</span> klasör gürünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">Adres Defteri</span> liste görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -79,7 +83,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Kişileri vCard olarak gönderme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Kişileri içe aktarma</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.9.17.12.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Kişisel Verileri İndirme</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.9.17.13.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Kişisel Verileri İndirme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.export">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.html
index 043c9105a..3f614e1b0 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.html
@@ -36,6 +36,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem cap-webmail" id="id-1.9.17.4.1.1"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Adres defteri içinden e-posta gönderme</a></p></li>
 <li class="listitem cap-calendar" id="id-1.9.17.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">KiÅŸileri bir randevuya davet etme</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Kişiler için kategorileri kullanma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Kişileri taşıma ve kopyalama</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Kişileri vCard olarak gönderme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Kişileri içe aktarma</a></p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.import.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.import.html
index 43e238806..e6d2b177b 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.import.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Kişileri Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Kişileri içe aktarma</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><a class="indexterm" name="id-1.9.17.11.5"></a><a class="indexterm" name="id-1.9.17.11.6"></a><a class="indexterm" name="id-1.9.17.11.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">Aşağıdaki biçimlere sahip dosyalardaki kişileri içe aktarabilirsiniz:</p>
+<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><a class="indexterm" name="id-1.9.17.12.6"></a><a class="indexterm" name="id-1.9.17.12.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">Aşağıdaki biçimlere sahip dosyalardaki kişileri içe aktarabilirsiniz:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">vCard. Notlar:</p>
@@ -67,6 +67,9 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.import"></p>
+<p class="title">Kullanıcı arayüzü:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">The <span class="phrase">Adres Defteri</span> klasör gürünümü</a></p></li></ul>
+<p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Kişileri dışa aktarma</a></p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.inviteappointment.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
index f6e188c1c..84f1ab412 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Kişileri Yönetme">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.manage.sendmail.html" title="Adres defteri içinden e-posta gönderme">
-<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Kişileri taşıma ve kopyalama">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Kişiler için kategorileri kullanma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Sonraki</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Sonraki</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -48,7 +48,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.inviteappointment"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">Adres Defteri</span> liste görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">Adres Defteri</span> ayrıntı görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Yeni randevu oluÅŸturma</a></p></li></ul>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.movecopy.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.movecopy.html
index f59139e1c..2de50fb1b 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.movecopy.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.movecopy.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Kişileri Yönetme">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="KiÅŸileri bir randevuya davet etme">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Kişiler için kategorileri kullanma">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html" title="Kişileri vCard olarak gönderme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sonraki</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Kişileri Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.movecopy">
 <div class="titlepage"><div><div><h3 class="title">Kişileri taşıma ve kopyalama</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><a class="indexterm" name="id-1.9.17.9.4"></a><a class="indexterm" name="id-1.9.17.9.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">Kişileri ve dağıtım listelerini başka bir adres defterine taşıyabilir veya kopyalayabilirsiniz.</p>
+<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><a class="indexterm" name="id-1.9.17.10.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">Kişileri ve dağıtım listelerini başka bir adres defterine taşıyabilir veya kopyalayabilirsiniz.</p>
 <p id="ox.appsuite.user.hints.contacts.manage.movecopy">Notlar:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Kişileri ve dağıtım listelerini <span class="guibutton"><strong>Tüm kullanıcılar</strong></span> adres defterine taşıyamaz ve kopyalayamazsınız.</p></li>
@@ -56,7 +56,10 @@
 <p id="ox.appsuite.user.tip.contacts.manage.movecopy">İpucu: Seçili nesneleri klasör görünümünden bir adres defterine sürükleyerek de taşıyabilirsiniz.</p>
 <p id="ox.appsuite.user.related.contacts.manage.movecopy"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">Adres Defteri</span> liste görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.personal.html">KiÅŸisel adres defterleri ekleme</a></p></li></ul>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.print.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.print.html
index 9db2820a5..702bfc948 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.print.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Kişileri Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Kişileri yazdırma</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">Tek veya çok sayıda kişinin bilgilerini yazdırabilirsiniz. Farklı yazdırma düzenleri arasından seçim yapabilirsiniz.</p>
+<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">Tek veya çok sayıda kişinin bilgilerini yazdırabilirsiniz. Farklı yazdırma düzenleri arasından seçim yapabilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.print.list">
 <p class="title">Bir kişinin bilgilerini yazdırma:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -48,7 +48,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.print"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html">The <span class="phrase">Adres Defteri</span> klasör gürünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">Adres Defteri</span> liste görünümü</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.print">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.sendmail.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.sendmail.html
index 3bab97692..df79ecc07 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.sendmail.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.sendmail.html
@@ -48,10 +48,14 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendmail"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">Adres Defteri</span> liste görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">Adres Defteri</span> ayrıntı görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p></li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendmail">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.sendvcard.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.sendvcard.html
index 0abcfbd21..1822e1eb2 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.sendvcard.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.manage.sendvcard.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Kişileri Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.sendvcard">
 <div class="titlepage"><div><div><h3 class="title">Kişileri vCard olarak gönderme</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">Kişileri ve dağıtım listelerini e-postalara vCard dosyası olarak ekleyebilirsiniz.</p>
+<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">Kişileri ve dağıtım listelerini e-postalara vCard dosyası olarak ekleyebilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.sendvcard">
 <p class="title">Bir kişiyi vCard eki olarak gönderme:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,12 +44,15 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendvcard"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">Adres Defteri</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">Adres Defteri</span> liste görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">Kişileri dışa aktarma</a></p></li>
-<li class="listitem cap-webmail" id="id-1.9.17.10.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p></li>
+<li class="listitem cap-webmail" id="id-1.9.17.11.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendvcard">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Kişileri Yönetme</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.search.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.search.html
index 71edb779b..786894e51 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.search.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.search.html
@@ -81,7 +81,7 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Bir adres defterindeki kişileri görüntüleme</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Kişiler için kategorileri kullanma</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.search">Ana başlık:<a class="xref" href="ox.appsuite.user.chap.contacts.html"><i><span class="phrase">Adres Defteri</span></i></a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.settings.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.settings.html
index f5cc4d5bf..eeb2a5f15 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.settings.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.settings.html
@@ -53,7 +53,7 @@
 <h3 class="title">İsimler ve Adresler</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>isimler. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a></p>
+<p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>İsimler. </b><a class="indexterm" name="id-1.9.19.7.2.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Adres defterindeki kişilerin ad ve soyadlarının görüntüleneceği sırayı belirtir.</p></li></ul>
 </li>
 <li class="listitem">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.useaddressbook.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.useaddressbook.html
index f270136e2..184e7558f 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.useaddressbook.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.useaddressbook.html
@@ -65,9 +65,9 @@
 <p> </p>
 <p class="title">Üst eylemler:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Katılımcı veya kaynak ekleme</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Yönetilen kaynak oluşturma</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">Yeni dağıtım listeleri oluşturma</a></p>
 <p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.add.participants.html">Göreve katılımcı ekleme</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.useaddressdirectory.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.useaddressdirectory.html
index 47ba99558..c05d9510a 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.useaddressdirectory.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.useaddressdirectory.html
@@ -72,9 +72,9 @@
 <p id="ox.appsuite.user.related.contacts.useaddressdirectory"></p>
 <p class="title">Üst eylemler:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Katılımcı veya kaynak ekleme</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">planlama görünümünü kullanma</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Planlama görünümünü kullanma</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Yönetilen kaynak oluşturma</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">Yeni dağıtım listeleri oluşturma</a></p>
 <p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.add.participants.html">Göreve katılımcı ekleme</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.view.haloview.html b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.view.haloview.html
index 09ee7d29b..173316b83 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.view.haloview.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.contacts.view.haloview.html
@@ -44,10 +44,10 @@
 </ul></p>
 <p role="presentation">Kişinin adres defterindeki kayıtlarına bağlı olarak açılır pencerede şu veriler görüntülenecektir:<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">resim (yüklendiyse)</p></li>
-<li class="listitem"><p role="presentation">Soyad, ad</p></li>
-<li class="listitem"><p role="presentation">İş bilgileri (kaydedildiyse)</p></li>
+<li class="listitem"><p role="presentation">soyad, ad</p></li>
+<li class="listitem"><p role="presentation">iÅŸ bilgileri (kaydedildiyse)</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.4"><p role="presentation">Yapılandırmaya bağlı olarak: kişinin aranabilirlik durumu</p></li>
-<li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">Konfigürasyona bağlı olarak: Kişiyle iletişim kurma simgeleri:<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">Yapılandırmaya bağlı olarak: kişiyle iletişim kurma simgeleri:<ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>E-posta</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>. E-posta yazma penceresini açar.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Ara</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>. Arama işlevlerini içeren menüyü açar.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Davet et</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.invite"><object type="image/svg+xml" data="../../images/calendar-plus.svg" height="15"></object></span>. Randevu oluşturma penceresini açar.</p></li>
@@ -57,7 +57,7 @@
 <li class="listitem"><p role="presentation">E-posta adresleri. Bir e-posta adresine tıkladığınızda yeni bir e-posta gönderme sayfası görüntülenir.</p></li>
 <li class="listitem"><p role="presentation">İş ve özel telefon numaraları. Bir numaraya tıkladığınızda arama yapmak işlevi açılır.</p></li>
 <li class="listitem"><p role="presentation">İş adresleri ve özel adresler. Adres defteri ayarlarında, bir adrese tıkladığınızda bir harita hizmetinin kullanılıp kullanılmayacağını ayarlayabilirsiniz.</p></li>
-<li class="listitem"><p role="presentation">ekler</p></li>
+<li class="listitem"><p role="presentation">Ekler</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">KiÅŸinin kaydedildiÄŸi adres defteri</p></li>
 <li class="listitem"><p role="presentation">Bir e-postaya tıkladığınızda o kişiyle yaptığınız son yazışmalar bir açılır pencerede görüntülenecektir.</p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.accounts.edit.html b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
index bb36ccd14..7414865aa 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
@@ -82,7 +82,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.addsocial.html">Sosyal ağlar için Portal widget'ı ekleme</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">E-posta Hesapları Ekleme</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Birleşik e-postayı kullanma</a></p>
-<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Gönderen adresi seçme</a></p>
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">gönderen adresi seçme</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Depolama Hesabı Ekleme</a></p>
 </li>
 </ul>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
index f80b9d856..d97b13c70 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
@@ -64,7 +64,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Birleşik e-postayı kullanma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Gönderen adresi seçme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">gönderen adresi seçme</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.accounts.functionalmail">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Hesapları Yönetme</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.categories.html b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.categories.html
index dde5a5cbe..9996153ab 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.categories.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.categories.html
@@ -32,15 +32,15 @@
   <h1 class="sr-only">Veri Organizasyonu ve Paylaşımlar</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.categories">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Kategorileri Yönetme</h2></div></div></div>
-<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Randevuları, kişileri ve görevleri sınıflandırmanıza olanak tanıyan <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">kategorileri</a> yönetmeyi öğrenin. Kategoriler aşağıdaki özelliklere sahiptir:</p>
+<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Uygulamalardaki e-postaları, randevuları, kişileri ve görevleri klasörlerden bağımsız olarak sınıflandırmanıza olanak tanıyan <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">kategorileri</a> yönetmeyi öğrenin. Örneğin, belirli bir proje veya müşteri için ayrı bir kategori oluşturabilirsiniz. Kategoriler aşağıdaki özelliklere sahiptir:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Kategori, bir isim ve bir renkten oluÅŸur.</p></li>
 <li class="listitem"><p role="presentation">Nesne araması yaparken kategorileri arama terimi olarak kullanabilirsiniz.</p></li>
 <li class="listitem"><p role="presentation">Yapılandırmaya bağlı olarak belli kategoriler hazır halde gelir. Bu tür kategoriler düzenlenemez ve silinemez.</p></li>
 <li class="listitem"><p role="presentation">Kendi kategorilerinizi oluşturabilir, düzenleyebilir ve silebilirsiniz.</p></li>
-<li class="listitem"><p role="presentation">Randevulara, kişilere ve görevlere istediğiniz kadar kategori atayabilir ve bunları daha sonra silebilirsiniz.</p></li>
+<li class="listitem"><p role="presentation">E-postalara, randevulara, kişilere ve görevlere istediğiniz kadar kategori atayabilir ve bunları daha sonra silebilirsiniz.</p></li>
 </ul>
-<p>Not: Bu kategoriler e-postalar için kullanılamaz. E-postalar için gelen kutusu kategorilerini kullanmalısınız. Bkz. <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Gelen kutusu kategorileriyle çalışma</a>.</p>
+<p>Not: E-postalar için gelen kutusu sekmelerini de kullanabilirsiniz. Bir e-postaya belirli bir gelen kutusu kategorisi atayabilirsiniz. Kategori, göndericiye bağlıdır. Bkz. <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Gelen kutusu kategorileriyle çalışma</a>.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.categories">Aşağıdaki seçenekler mevcuttur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">kendi kategorinizi oluÅŸturma</p></li>
@@ -51,9 +51,15 @@
 <p class="title">Kategorilerinizi yönetmek için:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step help-hide-inline">
+<p role="presentation">Menü çubuğunun sağ tarafındaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın. <span class="guilabel"><strong>Ayarlar</strong></span> penceresi açılır.</p>
+<p role="presentation">Sol bölmeden <span class="guibutton"><strong>Temel</strong></span>'e tıklayın. <span class="guibutton"><strong>Gelişmiş ayarlar</strong></span> altındaki <span class="guibutton"><strong>Kategorileri yönet</strong></span>'e tıklayın.</p>
+<p role="presentation">Aşağıdaki yöntemlerden birini de kullanabilirsiniz:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Bir e-posta seçin. Araç çubuğundaki <span class="guibutton"><strong>Kategori ekle</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Kategorileri yönet</strong></span>'i seçin.</p></li>
+<li class="listitem">
 <p role="presentation">Randevu, kişi veya görev oluşturma veya düzenleme penceresini açın.</p>
 <p role="presentation">Bunu yapmak için <span class="guibutton"><strong>Kategoriler</strong></span>'in yanındaki <span class="guibutton"><strong>Kategori ekle</strong></span>'ye tıklayın. <span class="guibutton"><strong>Kategorileri yönet</strong></span>'i seçin.</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><span class="guibutton"><strong>Gelişmiş ayarlar</strong></span> altındaki genel ayarlarda bulunan <span class="guibutton"><strong>Kategorileri yönet</strong></span> düğmesini de kullanabilirsiniz.</p></li></ul>
+</li>
+</ul></p>
 <p role="presentation"><span class="guilabel"><strong>Kategorileri yönet</strong></span> penceresi açılır.</p>
 </li>
 <li class="step">
@@ -68,21 +74,12 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Yeni randevu oluÅŸturma</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Yeni bir kiÅŸi oluÅŸturma</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Yeni görev oluşturma</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Randevuları Düzenleme</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Kişileri ve Dağıtım Listelerini Düzenleme</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Görevleri Düzenleme</a></p>
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Yeni e-postalarda varsayılan olarak PGP inline kullan</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Randevular için kategorileri kullanma</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Kişiler için kategorileri kullanma</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Görevler için kategorileri kullanma</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Genel Ayarları Düzenleme</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Randevu Arama</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">KiÅŸi Arama</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Görevlerde Arama Yapma</a></p>
-</li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.categories">Ana başlık:<a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>Veri Organizasyonu ve Paylaşımlar</i></a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.deputy.add.html b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.deputy.add.html
index d76349c04..373df0ce1 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.deputy.add.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.deputy.add.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Vekilleri Yönetme">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Vekilleri Yönetme">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="vekilleri yönet">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="vekilleri yönet">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html" title="Vekilleri görüntüleme, düzenleme, silme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Veri Organizasyonu ve Paylaşımlar</h1>
-<h2 class="sr-only">Vekilleri Yönetme</h2>
+<h2 class="sr-only">vekilleri yönet</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.add">
 <div class="titlepage"><div><div><h3 class="title">Vekil ekleme</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.8.2"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.add">Aşağıdaki seçenekler mevcuttur:</p>
@@ -81,7 +81,7 @@
 <p id="ox.appsuite.user.related.dataorganisation.deputy.add"></p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">Vekilleri görüntüleme, düzenleme, silme</a></p></li></ul>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vekilleri Yönetme</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">vekilleri yönet</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.deputy.edit.html b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
index 7ddd95de4..b1b934fbe 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Vekilleri Yönetme">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="vekilleri yönet">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.add.html" title="Vekil ekleme">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.accounts.html" title="Hesapları Yönetme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Veri Organizasyonu ve Paylaşımlar</h1>
-<h2 class="sr-only">Vekilleri Yönetme</h2>
+<h2 class="sr-only">vekilleri yönet</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.edit">
 <div class="titlepage"><div><div><h3 class="title">Vekilleri görüntüleme, düzenleme, silme</h3></div></div></div>
 <a class="indexterm" name="id-1.12.6.9.2"></a><a class="indexterm" name="id-1.12.6.9.3"></a><a class="indexterm" name="id-1.12.6.9.4"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.edit">Aşağıdaki seçenekler mevcuttur:</p>
@@ -76,7 +76,7 @@
 <p id="ox.appsuite.user.related.dataorganisation.deputy.edit"></p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.add.html">Vekil ekleme</a></p></li></ul>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vekilleri Yönetme</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">vekilleri yönet</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.deputy.html b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.deputy.html
index dd5430f59..eb737183a 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.deputy.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.deputy.html
@@ -1,7 +1,7 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Vekilleri Yönetme</title>
+<title>vekilleri yönet</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Veri Organizasyonu ve Paylaşımlar</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.deputy">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Vekilleri Yönetme</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">vekilleri yönet</h2></div></div></div>
 <a class="indexterm" name="id-1.12.6.2"></a><a class="indexterm" name="id-1.12.6.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.deputy">Farklı kullanıcıları <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">vekiliniz</a> olarak atayabilirsiniz. Adınıza e-posta alıp gönderebilmesi ve randevu planlayabilmesi için bir veya daha fazla vekile farklı seviyelerde izin verebilirsiniz.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.deputy">Aşağıdaki seçenekler mevcuttur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.sharing.examples.html b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
index 258922813..4d6afcb8d 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.dataorganisation.sharing.html" title="Veri PaylaÅŸma">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html" title="Hangi izinleri kullanabilirim?">
-<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Vekilleri Yönetme">
+<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="vekilleri yönet">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.sharing.share.html b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.sharing.share.html
index d35c13fd4..df15a8de3 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.sharing.share.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.dataorganisation.sharing.share.html
@@ -37,7 +37,7 @@
 <p class="title">Aşağıdaki seçenekler mevcuttur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">E-posta klasörleri</p>
+<p role="presentation">e-posta klasörleri</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation"><span class="guibutton"><strong>Gelen kutusu</strong></span> klasörü ile tüm <span class="guibutton"><strong>Klasörlerim</strong></span> alt klasörleri iç kullanıcılarla okuma izniyle paylaşılabilir.</p>
@@ -48,7 +48,7 @@
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">takvim</p>
+<p role="presentation">Takvim</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Takvimlerim</strong></span> içindeki klasörler iç kullanıcılarla okuma ve düzenleme izniyle paylaşılabilir.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Takvimlerim</strong></span> klasörü paylaşılamaz.</p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.content.html b/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.content.html
index db0ea9440..78d3bce3c 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.content.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.content.html
@@ -71,6 +71,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html"><span class="phrase">Drive</span> klasör içeriklerini görüntüleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Bir dosyanın içeriğini görüntüleme</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Dosyaları ve <span class="phrase">Drive</span> Klasörlerini Yönetme</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Klasörleri Kullanarak Verileri Yönetme</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Veri PaylaÅŸma</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.foldertree.html b/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.foldertree.html
index abc21b1bb..47995db80 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.foldertree.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.foldertree.html
@@ -68,6 +68,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">Drive</span>: klasör oluşturma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">Ortak ve paylaşılan <span class="phrase">Drive</span> klasörlerine abone olma</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Dosyaları ve <span class="phrase">Drive</span> Klasörlerini Yönetme</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Klasörleri Kullanarak Verileri Yönetme</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Veri PaylaÅŸma</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.toolbar.html b/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.toolbar.html
index b03e9ce9d..27f9244e5 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.toolbar.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.toolbar.html
@@ -68,20 +68,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html"><span class="phrase">Drive</span> klasör içeriklerini görüntüleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Bir dosyanın içeriğini görüntüleme</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.send.html">Dosyaları e-posta eki olarak gönderme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Dosya adlarını düzenleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Açıklama oluşturma ve düzenleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.move.html">Dosyaları ve <span class="phrase">Drive</span> klasörlerini taşıma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.copy.html">Dosyaları kopyalama</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Dosyaları PDF olarak kaydetme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Dosyaları PDF olarak yazdırma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.addportal.html">Portale dosya ekleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.favorite.html">Dosyaları ve <span class="phrase">Drive</span> klasörlerini Favoriler'e ekleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.delete.html">Dosyaları ve <span class="phrase">Drive</span> klasörlerini silme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.lock.html">Dosyaları kilitleme ve kilitlerini açma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Sürümlerle çalışma</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Dosyaları ve <span class="phrase">Drive</span> Klasörlerini Yönetme</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Dosyaları Şifreleme ve Şifrelerini Çözme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.toolbar">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.drive.gui.html"><span class="phrase">Drive</span> Bileşenleri</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.viewer.html b/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.viewer.html
index d6a2c5c06..e38debd8d 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.viewer.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.drive.gui.viewer.html
@@ -87,13 +87,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Bir dosyanın içeriğini görüntüleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">Sunum yapma</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">Dosya adlarını düzenleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Açıklama oluşturma ve düzenleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Dosyaları PDF olarak kaydetme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Dosyaları PDF olarak yazdırma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Sürümlerle çalışma</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Dosyaları ve <span class="phrase">Drive</span> Klasörlerini Yönetme</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Veri PaylaÅŸma</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.viewer">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.drive.gui.html"><span class="phrase">Drive</span> Bileşenleri</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.drive.settings.html b/help/l10n/tr_TR/ox.appsuite.user.sect.drive.settings.html
index 66cdecc12..03f873415 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.drive.settings.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.drive.settings.html
@@ -46,13 +46,13 @@
 </div>
 <p id="ox.appsuite.user.reference.drive.settings">Yapılandırmaya bağlı olarak aşağıdaki ayarlar kullanılabilir:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">dosya ekleme</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">Dosya ekleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.versionhistory">Sürüm geçmişi</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.advanced">GeliÅŸmiÅŸ ayarlar</a></p></li>
 </ul>
 <p>Ayrıca bkz.:<a class="xref" href="ox.appsuite.user.sect.settings.search.html">Ayar Arama</a></p>
 <p id="ox.appsuite.user.reference.drive.settings.adddrive"></p>
-<h3 class="title">dosya ekleme</h3>
+<h3 class="title">Dosya ekleme</h3>
 <p><a class="indexterm" name="id-1.11.17.6.2"></a>Aynı adı taşıyan dosyalar olduğunda yeni bir dosya mı oluşturulacağını yoksa mevcut dosyanın yeni bir sürümünün mü oluşturulacağını tanımlar.</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><b>Yeni sürüm ekle. </b>Dosyanın yeni bir sürümü oluşturulur.</p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.accounts.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.accounts.html
index e4aac4316..16942cf60 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.accounts.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.accounts.html
@@ -71,7 +71,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Birleşik e-postayı kullanma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Gönderen adresi seçme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">gönderen adresi seçme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Yanıt ayarlama</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.attachments.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.attachments.html
index 336c4c601..8d2003282 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.attachments.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="E-posta">
 <link rel="prev" href="ox.appsuite.user.sect.email.view.html" title="E-postaları Görüntüleme">
-<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
+<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.deputy.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.deputy.html
index fff121c82..356c0bc1c 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.deputy.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.deputy.html
@@ -86,12 +86,12 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Vekil Olarak Randevu Oluşturma, Düzenleme ve Yönetme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vekilleri Yönetme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">vekilleri yönet</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.email.deputy">Ana başlık:<a class="xref" href="ox.appsuite.user.chap.email.html"><i><span class="phrase">E-posta</span></i></a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.create.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.create.html
index 4f9dcb259..8f950b79d 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.create.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.create.html
@@ -56,7 +56,7 @@
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>CC</strong></span>, <span class="guibutton"><strong>BCC</strong></span> düğmesi. <span class="guibutton"><strong>CC</strong></span> veya <span class="guibutton"><strong>BCC</strong></span> alanını açar.</p></li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>RE</strong></span> düğmesi. <span class="guibutton"><strong>Yanıtla</strong></span> alanını açar.</p>
+<p role="presentation"><span class="guibutton"><strong>AW</strong></span> düğmesi. <span class="guibutton"><strong>Yanıtla</strong></span> alanını açar.</p>
 <p role="presentation">E-posta yanıtınız bu alana girilen e-posta adreslerine gönderilecektir.</p>
 </li>
 <li class="listitem">
@@ -77,6 +77,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Gönder</strong></span>. E-postayı belirtilen kişilere gönderir.</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.13.5.1.5"><p role="presentation"><span class="guibutton"><strong>Daha sonra gönder</strong></span>. E-postayı ne zaman göndermek istediğinizi seçebileceğiniz menüyü açar.</p></li>
 <li class="listitem">
 <p role="presentation">Düğme çubuğu</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -108,17 +109,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">Düzenleme penceresi</a></p></li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">E-postaları yanıtlama</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">E-postaları iletme</a></p>
-<p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">E-posta oluştururken yapay zekâ işlevlerini kullanma</a></p>
-<p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Vekil Olarak E-posta Gönderme ve Alma</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 <p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Şifrelenmiş e-posta gönderme</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.email.gui.create">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">E-posta</span> Bileşenleri</a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.detailview.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.detailview.html
index 00668c627..5de17bc26 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.detailview.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.detailview.html
@@ -57,6 +57,7 @@
 <li class="listitem">
 <p role="presentation">Yapılandırmaya bağlı olarak aşağıdaki işlevlerden biri kullanılabilir:</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Kategoriyi ayarla</strong></span> simgesi <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>.. Kategori atama ve kategorileri yönetme işlevlerini içeren menüyü açar.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Rengi ayarla</strong></span> simgesi <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. E-postaya renkli bir etiket atamanızı sağlayan menüyü açar.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>İşaretle</strong></span> simgesi <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. E-postayı işaretler.</p></li>
 </ul>
@@ -74,6 +75,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"> <span class="guibutton"><strong>Gönderilmiş </strong></span> klasöründe eki bağlantı olan bir e-posta seçilirse, ek hakkındaki bilgiler e-posta metninin üstünde görüntülenecektir.</p></li>
+<li class="listitem"><p role="presentation">Yapılandırmaya bağlı olarak: Varsa atanan kategoriler görüntülenecektir.</p></li>
 <li class="listitem">
 <p role="presentation">E-posta metni</p>
 <p role="presentation">Önceki e-postalardan alıntılanan metinlerin satır başları işaretlenir.</p>
@@ -87,15 +89,11 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html"><span class="phrase">E-posta</span> açılır pencere</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">E-posta düzenleme penceresi</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-postaları Görüntüleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">E-postaları yanıtlama</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">E-posta Eklerini Görüntüleme ve Kaydetme</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.detailview">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">E-posta</span> Bileşenleri</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.foldertree.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.foldertree.html
index 42e46c9bb..52e5a47bf 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.foldertree.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.foldertree.html
@@ -49,7 +49,9 @@
 </ul>
 <p>Yapılandırmaya ve e-posta ayarlarına bağlı olarak başka klasörler de mevcut olabilir.</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Okunmamış e-postalar klasörleri, işaretli iletiler klasörleri</p></li>
+<li class="listitem"><p role="presentation">İşaretli iletiler klasörü</p></li>
+<li class="listitem"><p role="presentation">Okunmamış iletiler klasörü</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.7.5.2.3"><p role="presentation">Daha sonra gönderilecek iletiler klasörü</p></li>
 <li class="listitem"><p role="presentation">Abone olduğunuz paylaşılan ve ortak e-posta klasörleri.</p></li>
 <li class="listitem"><p role="presentation">Yönetici tarafından size atanan işlevsel e-posta hesaplarının klasörleri.</p></li>
 </ul>
@@ -62,10 +64,10 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-postaları Görüntüleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">E-posta Klasörleri Ekleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">İşlevsel e-posta hesaplarını devre dışı bırakma ve etkinleştirme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">İşlevsel e-posta hesaplarını devre dışı bırakma ve etkinleştirme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Klasörleri Kullanarak Verileri Yönetme</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Veri PaylaÅŸma</a></p>
 </li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.html
index 3dd16a396..cf73bae8e 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.html
@@ -39,7 +39,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">Yeni e-posta düğmesi</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">E-posta</span> klasör görünümü</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html"><span class="phrase">E-posta</span> sekme çubuğu</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">Gelen kutusu kategorileri çubuğu</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html"><span class="phrase">E-posta</span> açılır pencere</a></p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.list.html
index c8167f4e7..166c967f0 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.list.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.list.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="E-posta BileÅŸenleri">
-<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="E-posta sekme çubuğu">
+<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="Gelen kutusu kategorileri çubuğu">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.detailview.html" title="E-posta ayrıntı görünümü">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -47,6 +47,7 @@
 <li class="listitem"><p role="presentation">Her e-postaya ait şu ayrıntılar görüntülenir: gönderen, konu, alınma tarihi. Okunmamış e-postalar <span class="guibutton"><strong>Okunmamış</strong></span> simgesiyle <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span> işaretlenir.</p></li>
 <li class="listitem"><p role="presentation">Gönderenin adındaki ipucu metni, gönderenin e-posta adresini gösterir.</p></li>
 <li class="listitem"><p role="presentation">Varsa şu ek bilgiler de gösterilir: ek simgeleri, ek simgeleri, renkli etiket veya işaret, <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">yazışmadaki</a> e-posta sayısı, öncelik.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.10.5.1.7"><p role="presentation">Varsa atanan kategoriler görüntülenir. E-posta ayarlarında, atanan kategorilerin liste görünümünde görünüp görünmeyeceğini belirleyebilirsiniz.</p></li>
 <li class="listitem"><p role="presentation">ÅžifrelenmiÅŸ e-postalar ÅžifrelenmiÅŸ simgesiyle iÅŸaretlenir <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.encrypted"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span>.</p></li>
 <li class="listitem">
 <p role="presentation">Tatil bildirimi etkinse liste görünümünün üzerinde bir bildirim görüntülenir.</p>
@@ -64,12 +65,9 @@
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html"><span class="phrase">E-posta</span> ayarlar menüsü</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-postaları Görüntüleme</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.list">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">E-posta</span> Bileşenleri</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.new.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.new.html
index 080d754e6..c54d16844 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.new.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.new.html
@@ -47,7 +47,7 @@
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">E-posta Hesapları Ekleme</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">E-posta Eklerini Görüntüleme ve Kaydetme</a></p>
 </li></ul>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.popup.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.popup.html
index c38b1abac..0bd130267 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.popup.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.popup.html
@@ -63,8 +63,7 @@
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Göndereni veya başka Bir alıcıyı arama</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Göndereni veya başka Bir alıcıyı arama</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Kişileri hale görünümünde görüntüleme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.popup">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">E-posta</span> Bileşenleri</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.settingsmenu.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.settingsmenu.html
index a8b7ee7c5..4faee9d89 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.settingsmenu.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.settingsmenu.html
@@ -54,7 +54,6 @@
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">E-posta Hesapları Ekleme</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">E-posta Eklerini Görüntüleme ve Kaydetme</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.tabs.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.tabs.html
index 28f86b031..b94e61ad5 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.tabs.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.tabs.html
@@ -1,7 +1,7 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>E-posta sekme çubuğu</title>
+<title>Gelen kutusu kategorileri çubuğu</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
@@ -33,22 +33,18 @@
 <h2 class="sr-only">
 <span class="phrase">E-posta</span> BileÅŸenleri</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.tabs">
-<div class="titlepage"><div><div><h3 class="title">
-<span class="phrase">E-posta</span> sekme çubuğu</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Gelen kutusu kategorileri çubuğu</h3></div></div></div>
 <a class="indexterm" name="id-1.7.8.9.2"></a><p id="ox.appsuite.user.concept.email.gui.tabs"><span class="guibutton"><strong>Gelen kutusu</strong></span> klasöründeki e-postalar için önceden tanımlanmış gelen kutusu sekmelerini gösterir. Bu, gelen e-postaları gönderenlere göre sıralanmış belirli sekmelere atamanızı sağlar.</p>
 <p id="ox.appsuite.user.reference.email.gui.tabs"></p>
 <p class="title">Notlar:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Yapılandırmaya bağlı olarak gelen kutusu sekmelerini kullanamayabilirsiniz.</p></li>
-<li class="listitem"><p role="presentation">Gelen kutusu sekmeleri mevcutsa sekme çubuğunu gösterebilir veya gizleyebilirsiniz. Bunun için menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Gelen kutusu kategorileri</strong></span>'ne tıklayın.</p></li>
+<li class="listitem"><p role="presentation">Gelen kutusu kategorileri mevcutsa gelen kutusu kategorileri çubuğunu gösterebilir veya gizleyebilirsiniz. Bunun için menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Gelen kutusu kategorileri</strong></span>'ne tıklayın.</p></li>
 <li class="listitem"><p role="presentation">Gelen kutusu sekmelerinin sayısı, adları ve sırası önceden tanımlanmıştır. Yapılandırmaya bağlı olarak bazı gelen kutusu sekmeler yeniden adlandırılabilir veya devre dışı bırakılabilir.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.email.gui.tabs"></p>
 <p class="title">İlgili konular:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Gelen kutusu kategorileriyle çalışma</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Gelen kutusu kategorileriyle çalışma</a></p></li></ul>
 <p id="ox.appsuite.user.reference.email.gui.tabs.parent">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">E-posta</span> Bileşenleri</a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.toolbar.html
index c3ee1b7af..7ed3c92b1 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.toolbar.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.gui.toolbar.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="E-posta BileÅŸenleri">
 <link rel="prev" href="ox.appsuite.user.sect.email.gui.foldertree.html" title="E-posta klasör görünümü">
-<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="E-posta sekme çubuğu">
+<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="Gelen kutusu kategorileri çubuğu">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -42,8 +42,9 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Sil</strong></span> simgesi <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.delete"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>. Seçtiğiniz e-postaları siler.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Arşivle</strong></span> simgesi <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.archive"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span>. Seçtiğiniz e-postaları arşivler.</p></li>
 <li class="listitem"><p role="presentation">Seçilen e-postaları <span class="guibutton"><strong>yanıtlama</strong></span> ve <span class="guibutton"><strong>iletme</strong></span> simgeleri:<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">Yapılandırmaya bağlı olarak: <span class="guibutton"><strong>Yapay zekâ entegrasyonu</strong></span> simgesi <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>. E -posta içeriğini yapay zekâ işlevleriyle düzenleyebileceğiniz bir menü açar.</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Kategoriyi ayarla</strong></span> simgesi <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. E-postayı bir kategoriye taşımanızı sağlayan menüyü açar. Bu simge yalnızca gelen kutusu sekmeleri çubuğu görüntüleniyorsa kullanılabilir.</p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">Yapılandırmaya bağlı olarak: <span class="guibutton"><strong>Yapay zekâ entegrasyonu</strong></span> simgesi <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>. E-posta içeriğini yapay zekâ işlevleriyle düzenleyebileceğiniz bir menü açar.</p></li>
+<li class="listitem"><p role="presentation">Yapılandırmaya bağlı olarak: <span class="guibutton"><strong>Gelen kutusu kategorisini ayarla</strong></span> simgesi <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.inboxcategories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. E-postaları bir gelen kutusu kategorisine taşımanızı sağlayan menüyü açar. Bu simge yalnızca gelen kutusu sekmeleri çubuğu görüntüleniyorsa kullanılabilir.</p></li>
+<li class="listitem"><p role="presentation">Yapılandırmaya bağlı olarak: <span class="guibutton"><strong>Kategoriyi ayarla</strong></span> simgesi <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>.. Kategori atama ve kategorileri yönetme işlevlerini içeren menüyü açar.</p></li>
 <li class="listitem"><p role="presentation">Yapılandırmaya bağlı olarak: <span class="guibutton"><strong>Renk belirle</strong></span> simgesi <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Seçilen e-postalara renkli bir etiket atamanızı sağlayan menüyü açar.</p></li>
 <li class="listitem"><p role="presentation">Yapılandırmaya bağlı olarak: <span class="guibutton"><strong>Bayrak</strong></span> simgesi <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. E-postayı işaretler.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Taşı</strong></span> simgesi <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.moveto"><object type="image/svg+xml" data="../../images/folder-symlink.svg" height="15"></object></span>. Seçili e-postayı başka bir klasöre taşır.</p></li>
@@ -55,25 +56,12 @@
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html"><span class="phrase">E-posta</span> sekme çubuğu</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">E-postaları yanıtlama</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">E-postaları iletme</a></p>
 </li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">E-postaları yanıtlarken yapay zekâ işlevlerini kullanma</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">E-postaları taşıma ve kopyalama</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">E-postaları okundu veya okunmadı olarak işaretleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">E-postaları kategorize etme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">E-posta kaynağını gösterme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">E-posta taslaklarını kullanma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">E-posta anımsatıcıları oluşturma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Portale e-posta ekleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">E-postaları kaydetme</a></p>
-<p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">E-postaları PDF olarak dışa aktarma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">E-postaları yazdırma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-postaları silme</a></p>
-</li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">E-postaları yanıtlarken yapay zekâ işlevlerini kullanma</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.toolbar">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">E-posta</span> Bileşenleri</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.addportal.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.addportal.html
index a34f15c2c..246555634 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.addportal.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.addportal.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">E-postaları Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.addportal">
 <div class="titlepage"><div><div><h3 class="title">Portale e-posta ekleme</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.15.2"></a><a class="indexterm" name="id-1.7.15.15.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">Bir e-postayı Portal'e widget olarak ekleyebilirsiniz.</p>
+<a class="indexterm" name="id-1.7.15.16.2"></a><a class="indexterm" name="id-1.7.15.16.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">Bir e-postayı Portal'e widget olarak ekleyebilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.addportal">
 <p class="title">Portale e-posta ekleme:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,7 +46,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.addportal"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.add.html">Portal widget'ları ekleme</a></p></li></ul>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.archive.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.archive.html
index 00e451477..f7da637cd 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.archive.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.archive.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">E-postaları Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.archive">
 <div class="titlepage"><div><div><h3 class="title">E-postaları arşivleme</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.20.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">Arşivlediğiniz e-postalar <span class="guibutton"><strong>Arşiv</strong></span> klasörüne taşınır. <span class="guibutton"><strong>Arşiv</strong></span> klasörü her takvim yılı için ayrı bir alt klasörden oluşur. Arşivlenmiş e-postalar, geliş yılına göre sıralanan bu alt klasörlere kaydedilir. <span class="guibutton"><strong>Arşiv</strong></span> klasörü, bu işlevi ilk kullandığınız anda oluşturulur. Aşağıdaki seçenekler mevcuttur:</p>
+<a class="indexterm" name="id-1.7.15.21.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">Arşivlediğiniz e-postalar <span class="guibutton"><strong>Arşiv</strong></span> klasörüne taşınır. <span class="guibutton"><strong>Arşiv</strong></span> klasörü her takvim yılı için ayrı bir alt klasörden oluşur. Arşivlenmiş e-postalar, geliş yılına göre sıralanan bu alt klasörlere kaydedilir. <span class="guibutton"><strong>Arşiv</strong></span> klasörü, bu işlevi ilk kullandığınız anda oluşturulur. Aşağıdaki seçenekler mevcuttur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">bir klasördeki 90 günden eski e-postaları arşivleme</p></li>
 <li class="listitem"><p role="presentation">e-postaları tek tek arşivleme</p></li>
@@ -57,6 +57,13 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.archive"></p>
+<p class="title">Kullanıcı arayüzü:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">E-posta</span> klasör görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
+</li></ul>
+<p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">E-postaları yazdırma</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.archive">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.categories.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.categories.html
new file mode 100644
index 000000000..1a81a2b9b
--- /dev/null
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.categories.html
@@ -0,0 +1,90 @@
+<html lang="tr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Yeni e-postalarda varsayılan olarak PGP inline kullan</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Kullanım Kılavuzu">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-postaları Yönetme">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Adresleri toplama">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="E-postaları kategorize etme">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Geri</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Sonraki</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
+<h2 class="sr-only">E-postaları Yönetme</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Yeni e-postalarda varsayılan olarak PGP inline kullan</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.categories">E-postalarınızı klasörlerden bağımsız olarak düzenlemek için kategorileri kullanabilirsiniz.</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">E-postalara kategori atayabilirsiniz.</p></li>
+<li class="listitem"><p role="presentation">Bir kategoriye atanmış tüm e-postaları görüntüleyebilirsiniz.</p></li>
+</ul>
+<p>Kendi kategorilerinizi oluşturabilir, düzenleyebilir ve silebilirsiniz. Bkz. <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a>.</p>
+<p id="ox.appsuite.user.tip.email.manage.categories">Gelen kutusu kategorilerini diğer kategorilerden bağımsız olarak kullanabilirsiniz. Gelen kutusu kategorileriyle e-postaları göndericilere göre düzenleyebilirsiniz. Bkz. <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Gelen kutusu kategorileriyle çalışma</a>.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.mark">
+<p class="title">E-postalara kategori atamak için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Bir veya birkaç e-posta seçin.</p></li>
+<li class="step">
+<p role="presentation">Araç çubuğundaki <span class="guibutton"><strong>Kategori ayarla</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.mark.add"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> tıklayın. Bir kategori seçin.</p>
+<p role="presentation">Bir kategoriyi e-postadan kaldırmak isterseniz kategoriye tıklayın.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.view">
+<p class="title">Belirli bir kategoriye atanmış e-postaları görüntülemek için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Kategori atanmış bir e-posta seçin.</p></li>
+<li class="step"><p role="presentation">Ayrıntı görünümde kategoriye tıklayın.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Sonuç:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Liste görünümünde, bu kategoriye atanmış tüm e-postalar gösterilir.</p></li>
+<li class="listitem"><p role="presentation">Her e-posta için e-postayı içeren klasör görüntülenecektir.</p></li>
+<li class="listitem"><p role="presentation">Önceki listeyi görmek isterseniz arama alanındaki <span class="guibutton"><strong>Aramayı iptal et</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> tıklayın.</p></li>
+</ul>
+          <p>İpucu: Arama seçeneklerini kullanarak da kategorileri arayabilirsiniz.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.categories"></p>
+<p class="title">Kullanıcı arayüzü:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
+</li></ul>
+<p> </p>
+<p class="title">İlgili konular:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">E-postalarda Arama</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Randevular için kategorileri kullanma</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Kişiler için kategorileri kullanma</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Görevler için kategorileri kullanma</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.categories">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.collectaddress.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.collectaddress.html
index 8c9f79549..5bec15f1d 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.collectaddress.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.collectaddress.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-postaları Yönetme">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.mark.html" title="E-postaları okundu veya okunmadı olarak işaretleme">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="E-postaları kategorize etme">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="Yeni e-postalarda varsayılan olarak PGP inline kullan">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.mark.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Sonraki</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.categories.html">Sonraki</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -35,7 +35,7 @@
 <div class="titlepage"><div><div><h3 class="title">Adresleri toplama</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.10.2"></a><a class="indexterm" name="id-1.7.15.10.3"></a><p id="ox.appsuite.user.concept.email.manage.collectaddress">Aşağıdaki seçenekler mevcuttur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">E-posta gönderirken veya okurken yeni e-posta adreslerini otomatik olarak toplanması için e-posta ayarlarından bu işlevi etkinleştirebilirsiniz.</p></li>
+<li class="listitem"><p role="presentation">E-posta gönderirken veya okurken yeni e-posta adreslerini otomatik olarak toplanması için gelişmiş e-posta ayarlarından bu özelliği etkinleştirebilirsiniz.</p></li>
 <li class="listitem"><p role="presentation">Adres defterine elle e-posta adresi ekleme</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.collectaddress">
@@ -51,7 +51,7 @@
           <p>Not: Bu işlev yalnızca yeni kişiler için kullanılabilir.</p>
         </div>
 </div>
-<p role="presentation" class="cap-contacts"><p class="title">İlgili konular:</p><ul class="itemizedlist" style="list-style-type: none; ">
+<p role="presentation" class="cap-contacts"><p class="title">Kullanıcı arayüzü:</p><ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p></li></ul> <p class="title">İlgili konular:</p><ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Yeni bir kiÅŸi oluÅŸturma</a></p></li>
 </ul></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.delete.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.delete.html
index a75d0a36b..78d979df0 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.delete.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.delete.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-postaları Yönetme">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.archive.html" title="E-postaları arşivleme">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="E-posta klasörlerini temizleme">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.recover.html" title="E-postaları kurtarma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.archive.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Sonraki</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.recover.html">Sonraki</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,20 +33,20 @@
 <h2 class="sr-only">E-postaları Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">E-postaları silme</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.21.2"></a><a class="indexterm" name="id-1.7.15.21.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">Aşağıdaki seçenekler mevcuttur:</p>
+<a class="indexterm" name="id-1.7.15.22.2"></a><a class="indexterm" name="id-1.7.15.22.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">Aşağıdaki seçenekler mevcuttur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">E-postaların Çöp Kutusu'na mı taşınacağını yoksa kalıcı olarak mı silineceğini tanımlayın.</p>
-<p role="presentation">Çöp kutusuna taşınan e-postalar kurtarılabilir.</p>
+<p role="presentation">E-postaların Çöp Kutusu'na mı taşınacağını yoksa kalıcı olarak mı silineceğini seçebilirsiniz.</p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Çöp kutusuna taşınan e-postalar kurtarılabilir.</p></li>
+<li class="listitem"><p role="presentation"><span class="cap-dumpster">Kalıcı olarak silinen e-postalar 14 gün içinde kurtarılabilir. Bu süre bittikten sonra</span> kalıcı olarak silinen e-postalar <span class="phrase"><strong>kurtarılamaz</strong></span>.</p></li>
+</ul>
 </li>
-<li class="listitem"><p role="presentation">E-postaları tek tek veya tüm e-posta yazışmalarını silme.</p></li>
-<li class="listitem"><p role="presentation">Bir e-posta klasöründeki tüm e-postaları silme.</p></li>
-<li class="listitem"><p role="presentation">E-postaları Çöp kutusu'ndan geri alma.</p></li>
-<li class="listitem"><p role="presentation">Çöp kutusu'ndaki e-postaları kalıcı olarak silme.</p></li>
-<li class="listitem"><p role="presentation">Çöp kutusu'nu boşaltarak tüm e-postaları Çöp kutusu'ndan kalıcı olarak silme.</p></li>
+<li class="listitem"><p role="presentation">Tek bir e-postayı veya bir yazışmanın tamamını silebilirsiniz.</p></li>
+<li class="listitem"><p role="presentation">Bir e-posta klasöründeki tüm e-postaları silebilirsiniz.</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.delete.setting">
-<p class="title">E-postaların Çöp Kutusu'na mı taşınacağını yoksa kalıcı olarak mı silineceğini tanımlayın.</p>
+<p class="title">E-postaların Çöp Kutusu'na mı taşınacağını yoksa kalıcı olarak mı silineceğini belirlemek için:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.setting"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
@@ -60,21 +60,21 @@
 <li class="listitem"><p role="presentation">E-postaların çöp kutusuna taşınmasını istiyorsanız <span class="guibutton"><strong>Silinen e-postaları kalıcı olarak kaldır</strong></span> işaretini kaldırın.</p></li>
 <li class="listitem">
 <p role="presentation">E-postaların kalıcı olarak silinmesini istiyorsanız <span class="guibutton"><strong>Silinen e-postaları kalıcı olarak kaldır</strong></span>'ı işaretleyin.</p>
-<p role="presentation"><span class="phrase"><strong>Uyarı:</strong></span> Kalıcı olarak silinen e-postalar <span class="phrase"><strong>geri alınamaz</strong></span>.</p>
+<p role="presentation"><span class="phrase"><strong>Uyarı:</strong></span> Yapılandırmaya bağlı olarak, kalıcı olarak silinen e-postalar <span class="phrase"><strong>kurtarılamayabilir</strong></span>.</p>
 </li>
 </ul></p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.delete">
-<p class="title">Bir e-postayı silme:</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.single">
+<p class="title">E-postaları ayrı ayrı silmek için:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Bir veya birkaç e-posta seçin.</p></li>
 <li class="step">
-<p role="presentation">Araç çubuğundaki <span class="guibutton"><strong>Sil</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> tıklayın.</p>
+<p role="presentation">Araç çubuğundaki <span class="guibutton"><strong>Sil</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> tıklayın.</p>
 <p role="presentation">Veya:<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Klavyedeki [Del] veya [Backspace] tuşuna basın.</p></li>
 <li class="listitem"><p role="presentation">Bir e-postanın sağ tıklama menüsünden <span class="guibutton"><strong>Sil</strong></span>'e tıklayın.</p></li>
-<li class="listitem"><p role="presentation">Tek bir e-posta seçtiyseniz ayrıntı görünümündeki <span class="guibutton"><strong>Sil</strong></span> simgesini <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> kullanın.</p></li>
+<li class="listitem"><p role="presentation">Tek bir e-posta seçtiyseniz ayrıntı görünümündeki <span class="guibutton"><strong>Sil</strong></span> simgesini <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> kullanın.</p></li>
 </ul></p>
 </li>
 </ol></div>
@@ -82,7 +82,7 @@
           <p>Sonuç:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Silinen e-postaları kalıcı olarak kaldır</strong></span></a> ayarı kapalıysa:</p>
+<p role="presentation"><span class="guibutton"><strong>Silinen e-postaları kalıcı olarak kaldır</strong></span> ayarı kapalıysa:</p>
 <p role="presentation">E-postalar Çöp Kutusu klasörüne taşınır.</p>
 </li>
 <li class="listitem">
@@ -92,17 +92,17 @@
 </ul>  
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptyfolder">
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.emptyfolder">
 <p class="title">Bir klasördeki tüm e-postaları silme:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Klasör görünümünde, silmek istediğiniz e-postaların klasörü seçin.</p></li>
 <li class="step">
 <p role="presentation">Aşağıdaki yöntemlerden birini kullanın:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Klasör adının yanındaki <span class="guibutton"><strong>Eylemler</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayın.</p></li>
-<li class="listitem"><p role="presentation">Listenin üzerindeki <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayın.</p></li>
+<li class="listitem"><p role="presentation">Klasör adının yanındaki <span class="guibutton"><strong>Eylemler</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayın.</p></li>
+<li class="listitem"><p role="presentation">Listenin üzerindeki <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayın.</p></li>
 </ul></p>
 <p role="presentation"><span class="guibutton"><strong>Tüm iletileri sil</strong></span> düğmesine tıklayın.</p>
-<p role="presentation"><span class="phrase"><strong>Uyarı:</strong></span> <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Silinen e-postaları kalıcı olarak kaldır</strong></span></a> ayarı açıksa silinen e-postalar kurtarılamaz.</p>
+<p role="presentation"><span class="phrase"><strong>Uyarı:</strong></span> <span class="guibutton"><strong>Silinen e-postaları kalıcı olarak kaldır</strong></span> ayarı açıksa, yapılandırmaya bağlı olarak, silinen e-postalar <span class="phrase"><strong>kurtarılamayabilir</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">Bu klasörün içeriğini silmek istediğinizi onaylayın.</p></li>
 </ol></div>
@@ -110,7 +110,7 @@
           <p>Sonuç:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Silinen e-postaları kalıcı olarak kaldır</strong></span></a> ayarı kapalıysa:</p>
+<p role="presentation"><span class="guibutton"><strong>Silinen e-postaları kalıcı olarak kaldır</strong></span> ayarı kapalıysa:</p>
 <p role="presentation">E-postalar Çöp Kutusu klasörüne taşınır.</p>
 </li>
 <li class="listitem">
@@ -120,60 +120,22 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
-<p class="title">Silinen e-postaları geri alma:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Klasör görünümünde <span class="guibutton"><strong>Çöp kutusu</strong></span> klasörünü açın.</p></li>
-<li class="step"><p role="presentation">Bir veya birkaç e-posta seçin.</p></li>
-<li class="step"><p role="presentation">Bir e-postanın sağ tıklama menüsünden <span class="guibutton"><strong>Taşı</strong></span>'ya tıklayın.</p></li>
-<li class="step"><p role="presentation"><span class="guilabel"><strong>Taşı</strong></span> penceresinden bir klasör seçin. <span class="guibutton"><strong>Taşı</strong></span> düğmesine tıklayın.</p></li>
-</ol></div>
-<div class="taskrelated">
-          <p>Veya:</p>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Çöp Kutusu'ndaki tüm e-postaları kurtarmak isterseniz listedenin üstündeki <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm iletileri taşı</strong></span> düğmesine tıklayın.</p></li>
-<li class="listitem"><p role="presentation">Tek bir e-posta seçtiyseniz ayrıntı görünümündeki <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesini <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> kullanın. <span class="guibutton"><strong>Taşı</strong></span>'ya tıklayın.</p></li>
-</ul>
-        </div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever">
-<p class="title">Bir e-postayı kalıcı olarak silme:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Uyarı:</strong></span> Kalıcı olarak silinen e-postalar <span class="phrase"><strong>geri alınamaz</strong></span>.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Klasör görünümünde <span class="guibutton"><strong>Çöp kutusu</strong></span> klasörünü açın.</p></li>
-<li class="step"><p role="presentation">Bir veya birkaç e-posta seçin.</p></li>
-<li class="step">
-<p role="presentation">Araç çubuğundaki <span class="guibutton"><strong>Sil</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> tıklayın.</p>
-<p role="presentation">Tek bir e-posta seçtiyseniz ayrıntı görünümündeki <span class="guibutton"><strong>Sil</strong></span> simgesini <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de kullanabilirsiniz.</p>
-</li>
-<li class="step"><p role="presentation">Seçilen e-postaları kalıcı olarak silmek istediğinizi onaylayın.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptytrash">
-<p class="title">Çöp Kutusu klasörünün içeriğini kalıcı olarak silme:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Uyarı:</strong></span> Kalıcı olarak silinen e-postalar <span class="phrase"><strong>geri alınamaz</strong></span>.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Klasör görünümünde <span class="guibutton"><strong>Çöp kutusu</strong></span> klasörünü seçin.</p></li>
-<li class="step">
-<p role="presentation">Aşağıdaki yöntemlerden birini kullanın:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Çöp Kutusu</strong></span>'nun yanındaki <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayın.</p></li>
-<li class="listitem"><p role="presentation">Listenin üzerindeki <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayın.</p></li>
-</ul></p>
-<p role="presentation"><span class="guibutton"><strong>Klasörü boşalt</strong></span>'a tıklayın.</p>
-</li>
-<li class="step"><p role="presentation">Klasörün içeriğini silmek istediğinizi onaylayın.</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.email.manage.delete"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">E-posta</span> klasör görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-posta klasörlerini temizleme</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">E-postaları kurtarma</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-postaları silme</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.22.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Kalıcı olarak silinmiş e-postaları kurtarma</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-posta klasörlerini temizleme</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.email.manage.delete">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.deleteforever.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.deleteforever.html
new file mode 100644
index 000000000..44584c6c0
--- /dev/null
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.deleteforever.html
@@ -0,0 +1,87 @@
+<html lang="tr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>E-postaları silme</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Kullanım Kılavuzu">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-postaları Yönetme">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.recover.html" title="E-postaları kurtarma">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Kalıcı olarak silinmiş e-postaları kurtarma">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.recover.html">Geri</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Sonraki</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
+<h2 class="sr-only">E-postaları Yönetme</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.deleteforever">
+<div class="titlepage"><div><div><h3 class="title">E-postaları silme</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.24.2"></a><a class="indexterm" name="id-1.7.15.24.3"></a><p id="ox.appsuite.user.concept.email.manage.deleteforever">Aşağıdaki seçenekler mevcuttur:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Çöp kutusu'ndaki e-postaları ayrı ayrı kalıcı olarak silme.</p></li>
+<li class="listitem"><p role="presentation">Çöp kutusu'nu boşaltarak tüm e-postaları Çöp kutusu'ndan kalıcı olarak silme.</p></li>
+</ul>
+<p id="ox.appsuite.user.hint.email.manage.deleteforever.html"><span class="cap-dumpster">Kalıcı olarak silinen e-postalar 14 gün içinde kurtarılabilir. Bu süre bittikten sonra</span> kalıcı olarak silinen e-postalar <span class="phrase"><strong>kurtarılamaz</strong></span>.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.single">
+<p class="title">E-postaları ayrı ayrı kalıcı olarak silmek için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Klasör görünümünde <span class="guibutton"><strong>Çöp kutusu</strong></span> klasörünü açın.</p></li>
+<li class="step"><p role="presentation">Bir veya birkaç e-posta seçin.</p></li>
+<li class="step">
+<p role="presentation">Araç çubuğundaki <span class="guibutton"><strong>Sil</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> tıklayın.</p>
+<p role="presentation">Tek bir e-posta seçtiyseniz ayrıntı görünümündeki <span class="guibutton"><strong>Sil</strong></span> simgesini <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> de kullanabilirsiniz.</p>
+</li>
+<li class="step"><p role="presentation">Seçilen e-postaları kalıcı olarak silmek istediğinizi onaylayın.</p></li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.emptytrash">
+<p class="title">Çöp kutusundaki tüm e-postaları kalıcı olarak silmek için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Klasör görünümünde <span class="guibutton"><strong>Çöp kutusu</strong></span> klasörünü seçin.</p></li>
+<li class="step">
+<p role="presentation">Aşağıdaki yöntemlerden birini kullanın:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Çöp Kutusu</strong></span>'nun yanındaki <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayın.</p></li>
+<li class="listitem"><p role="presentation">Listenin üzerindeki <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayın.</p></li>
+</ul></p>
+<p role="presentation"><span class="guibutton"><strong>Klasörü boşalt</strong></span>'a tıklayın.</p>
+</li>
+<li class="step"><p role="presentation">Klasörün içeriğini silmek istediğinizi onaylayın.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.deleteforever"></p>
+<p class="title">Kullanıcı arayüzü:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">E-posta</span> klasör görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
+</li></ul>
+<p> </p>
+<p class="title">İlgili konular:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-postaları silme</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">E-postaları kurtarma</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.24.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Kalıcı olarak silinmiş e-postaları kurtarma</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-posta klasörlerini temizleme</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.deleteforever">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.draft.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.draft.html
index b9f8f4ab7..b67088475 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.draft.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.draft.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">E-postaları Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.draft">
 <div class="titlepage"><div><div><h3 class="title">E-posta taslaklarını kullanma</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">E-posta yazarken iletiniz düzenli aralıklarla e-posta taslağı olarak kaydedilir. Aşağıdaki seçenekler mevcuttur:</p>
+<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">E-posta yazarken iletiniz düzenli aralıklarla e-posta taslağı olarak kaydedilir. Aşağıdaki seçenekler mevcuttur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">E-posta taslağını düzenleme veya gönderme.</p></li>
 <li class="listitem"><p role="presentation">E-Posta taslağının kopyasını gönderme veya düzenleme.</p></li>
@@ -64,11 +64,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.draft"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">E-posta</span> klasör görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Şablonları kullanma</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.manage.draft">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.expungefolder.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.expungefolder.html
index b2e894a20..e2b328ffc 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.expungefolder.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.expungefolder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-postaları Yönetme">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="E-postaları silme">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Kalıcı olarak silinmiş e-postaları kurtarma">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.unifiedmail.html" title="Birleşik e-postayı kullanma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Sonraki</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">E-postaları Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.expungefolder">
 <div class="titlepage"><div><div><h3 class="title">E-posta klasörlerini temizleme</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.22.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">E-posta istemcisinin ayarlarına bağlı olarak; Apple Mail, Microsoft Outlook veya Mozilla Thunderbird gibi bir e-posta istemcisi içinden sildiğiniz e-postalar o istemciden çıkış yapana kadar silinmeyebilir. Bu süre boyunca bu e-postalar groupware'de üzerleri çizili olarak gösterilecektir. Bu postaları silmek için e-posta klasörünü temizleyin.</p>
+<a class="indexterm" name="id-1.7.15.26.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">E-posta istemcisinin ayarlarına bağlı olarak; Apple Mail, Microsoft Outlook veya Mozilla Thunderbird gibi bir e-posta istemcisi içinden sildiğiniz e-postalar o istemciden çıkış yapana kadar silinmeyebilir. Bu süre boyunca bu e-postalar groupware'de üzerleri çizili olarak gösterilecektir. Bu postaları silmek için e-posta klasörünü temizleyin.</p>
 <p id="ox.appsuite.user.hint.email.manage.expungefolder">Not: Yapılandırmaya bağlı olarak, bu tür e-postalar görüntülenmiyorsa bu işlev kulanılamaz.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.expunge">
 <p class="title">Bir e-posta klasörünü temizleme:</p>
@@ -43,6 +43,9 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.expungefolder"></p>
+<p class="title">Kullanıcı arayüzü:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">E-posta</span> klasör görünümü</a></p></li></ul>
+<p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-postaları silme</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.expungefolder">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.html
index 9bd7c295c..bdd22990a 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.html
@@ -38,17 +38,21 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">E-postaları taşıma ve kopyalama</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">E-postaları okundu veya okunmadı olarak işaretleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Adresleri toplama</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Yeni e-postalarda varsayılan olarak PGP inline kullan</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">E-postaları kategorize etme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">E-posta kaynağını gösterme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">E-posta taslaklarını kullanma</a></p></li>
-<li class="listitem cap-tasks" id="id-1.7.15.4.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">E-posta anımsatıcıları oluşturma</a></p></li>
+<li class="listitem cap-tasks" id="id-1.7.15.4.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">E-posta anımsatıcıları oluşturma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Portale e-posta ekleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">E-postaları kaydetme</a></p></li>
-<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">E-postaları PDF olarak dışa aktarma</a></p></li>
+<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">E-postaları PDF olarak dışa aktarma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">E-postaları içe aktarma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">E-postaları yazdırma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">E-postaları arşivleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-postaları silme</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">E-postaları kurtarma</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-postaları silme</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.4.1.19"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Kalıcı olarak silinmiş e-postaları kurtarma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-posta klasörlerini temizleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Birleşik e-postayı kullanma</a></p></li>
 </ul>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.import.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.import.html
index 82c4c27a0..b24f7f5c0 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.import.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">E-postaları Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.import">
 <div class="titlepage"><div><div><h3 class="title">E-postaları içe aktarma</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><p id="ox.appsuite.user.concept.email.manage.import">EML biçimindeki e-postaları içe aktarabilirsiniz.</p>
+<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.import">EML biçimindeki e-postaları içe aktarabilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.import">
 <p class="title">E-postaları içe aktarma:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -42,6 +42,12 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.import"></p>
+<p class="title">Kullanıcı arayüzü:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">E-posta</span> klasör görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
+</li></ul>
+<p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">E-postaları kaydetme</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.import">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.inboxcategories.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.inboxcategories.html
index da770acd7..6d25febdc 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.inboxcategories.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.inboxcategories.html
@@ -39,7 +39,7 @@
 <li class="listitem"><p role="presentation">gelen e-postaları gelen kutusu kategorilerine atama</p></li>
 <li class="listitem"><p role="presentation">gelen kutusu kategorilerinin görünümünü düzenleme</p></li>
 </ul>
-<p role="presentation" class="feat-io-ox-core-categories">Not: Gelen kutusu kategorilerini yalnızca e-postalar için kullanabilirsiniz. Yapılandırmaya bağlı olarak, randevular, kişiler ve görevler için ayrı kategoriler kullanabilirsiniz. Bkz. <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a>.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Not: Gelen kutusu kategorilerini yalnızca e-postalar için kullanabilirsiniz. Yapılandırmaya bağlı olarak, e-postalar, randevular, kişiler ve görevler için ayrı kategoriler kullanabilirsiniz. Bkz. <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Yeni e-postalarda varsayılan olarak PGP inline kullan</a>.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.inboxcategories.activate">
 <p class="title">Gelen kutusu sekmelerini etkinleştirme ve devre dışı bırakma:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -47,7 +47,7 @@
 <p role="presentation">Gelen kutusu sekmelerini etkinleştirmek için menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.activate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Gelen kutusu kategorileri</strong></span>'ne tıklayın.</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Ayrıca e-posta ayarlarında <span class="guibutton"><strong>Okuma</strong></span> altındaki <span class="guibutton"><strong>Gelen kutusu kategorilerini yapılandır</strong></span> düğmesini de kullanabilirsiniz.</p></li></ul>
 <p role="presentation"><span class="guilabel"><strong>Kategorileri yapılandır</strong></span> penceresi açılır. Mevcut gelen kutusu kategorileri görünür. <span class="guibutton"><strong>Kategorileri etkinleştir</strong></span>'e tıklayın.</p>
-<p role="presentation">Menü çubuğunun sağ tarafında sekme çubuğu görüntülenecektir.</p>
+<p role="presentation">Menü çubuğunun altında gelen kutusu kategorileri çubuğu görüntülenecektir.</p>
 </li>
 <li class="step">
 <p role="presentation">Gelen kutusu sekmelerini devre dışı bırakmak isterseniz menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.deactivate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Gelen kutusu kategorileri</strong></span>'ne tıklayın.</p>
@@ -63,7 +63,7 @@
 <p role="presentation">Henüz bir gelen kutusu kategorisine atanmamış e-postalar <span class="guibutton"><strong>Genel</strong></span> sekmesinde görüntülenir.</p>
 </li>
 <li class="step">
-<p role="presentation">Liste görünümünden bir e-posta sürükleyip sekme çubuğundaki bir sekmeye bırakın.</p>
+<p role="presentation">Liste görünümünden bir e-postayı sürükleyip gelen kutusu kategori çubuğundaki bir kategoriye bırakın.</p>
 <p role="presentation">Ayrıca, bir e-posta seçebilirsiniz. Araç çubuğundaki <span class="guibutton"><strong>Kategori ayarla</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span> tıklayın. Menüden bir sekme seçin.</p>
 </li>
 <li class="step"><p role="presentation">İşlemi tamamlamak için aşağıdakilerden birini yapın:<ul class="itemizedlist" style="list-style-type: disc; ">
@@ -77,14 +77,14 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Gelen kutusu kategorileri</strong></span>'ne tıklayın.</p>
-<p role="presentation">Ayrıca kategori çubuğundaki <span class="guibutton"><strong>Kategorileri yapılandır</strong></span> simgesine de <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayabilirsiniz.</p>
+<p role="presentation">Ayrıca gelen kutusu kategori çubuğundaki <span class="guibutton"><strong>Kategorileri yapılandır</strong></span> simgesine de <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayabilirsiniz.</p>
 <p role="presentation"><span class="guilabel"><strong>Kategorileri yapılandır</strong></span> penceresi açılır.</p>
 </li>
 <li class="step">
 <p role="presentation">Bir gelen kutusu kategorisini etkinleştirmek veya devre dışı bırakmak için ilgili onay kutusunu işaretleyin.</p>
 <p role="presentation">Bir gelen kutusu kategorisini yeniden adlandırmak için ilgili metni düzenleyin.</p>
 <p role="presentation">Not: Bazı kategoriler düzenlenemez.</p>
-<p role="presentation">Kategori çubuğunu gizlemek isterseniz <span class="guibutton"><strong>Kategorileri devre dışı bırak</strong></span>'a tıklayın.</p>
+<p role="presentation">Gelen kutusu kategori çubuğunu gizlemek isterseniz <span class="guibutton"><strong>Kategorileri devre dışı bırak</strong></span>'a tıklayın.</p>
 </li>
 <li class="step"><p role="presentation"><span class="guibutton"><strong>Kaydet</strong></span>'e tıklayın.</p></li>
 </ol></div>
@@ -93,14 +93,11 @@
 <p class="title">Kullanıcı arayüzü:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html"><span class="phrase">E-posta</span> ayarlar menüsü</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html"><span class="phrase">E-posta</span> sekme çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">Gelen kutusu kategorileri çubuğu</a></p>
 </li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-postaları Görüntüleme</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.inboxcategories">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.label.html
index 234adfcc4..b716b1419 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.label.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.label.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-postaları Yönetme">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Adresleri toplama">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="Yeni e-postalarda varsayılan olarak PGP inline kullan">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.source.html" title="E-posta kaynağını gösterme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.categories.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.source.html">Sonraki</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">E-postaları Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.label">
 <div class="titlepage"><div><div><h3 class="title">E-postaları kategorize etme</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Yapılandırmaya bağlı olarak, e-postaları kategorilere ayırmak için aşağıdaki seçeneklerden birini kullanabilirsiniz:</p>
+<a class="indexterm" name="id-1.7.15.12.2"></a><a class="indexterm" name="id-1.7.15.12.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Yapılandırmaya bağlı olarak, e-postaları kategorilere ayırmak için aşağıdaki seçeneklerden birini kullanabilirsiniz:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">renkli etiket</p></li>
 <li class="listitem"><p role="presentation">bayrak (iÅŸaret)</p></li>
@@ -64,7 +64,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.label"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.mark.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.mark.html
index 6567b50ff..cba045c81 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.mark.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.mark.html
@@ -57,7 +57,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.mark"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-postaları Görüntüleme</a></p></li></ul>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.movecopy.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.movecopy.html
index 1a064a7fd..f24fc7a5b 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.movecopy.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.movecopy.html
@@ -62,7 +62,11 @@
 </ul>
 <p id="ox.appsuite.user.related.email.manage.movecopy"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.pdfexport.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.pdfexport.html
index 705b5906b..5dab1f788 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.pdfexport.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.pdfexport.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">E-postaları Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.pdfexport">
 <div class="titlepage"><div><div><h3 class="title">E-postaları PDF olarak dışa aktarma</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.17.2"></a><a class="indexterm" name="id-1.7.15.17.3"></a><a class="indexterm" name="id-1.7.15.17.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Not: Yapılandırmaya bağlı olarak bu işlev kullanılamayabilir.</p>
+<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><a class="indexterm" name="id-1.7.15.18.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Not: Yapılandırmaya bağlı olarak bu işlev kullanılamayabilir.</p>
 <p id="ox.appsuite.user.concept.email.manage.pdfexport">E-postaları ve docx biçimindeki eklerini PDF olarak dışa aktarabilirsiniz. PDF dosyası oluşturulduktan sonra sizin belirleyeceğiniz <span class="phrase">Drive</span> klasörüne kaydedilecektir. Verilerin büyüklüğüne bağlı olarak indirme işlemi uzun sürebilir. İşlem tamamlanınca bildirim alacaksınız.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.pdfexport">
 <p class="title">E-postaları PDF olarak dışa aktarma:</p>
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.pdfexport"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">E-postaları kaydetme</a></p></li></ul>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.print.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.print.html
index 461c30a4c..c56a39e14 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.print.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">E-postaları Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.print">
 <div class="titlepage"><div><div><h3 class="title">E-postaları yazdırma</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.print">Bir veya birden fazla e-postanın içeriğini yazdırabilirsiniz.</p>
+<a class="indexterm" name="id-1.7.15.20.2"></a><a class="indexterm" name="id-1.7.15.20.3"></a><p id="ox.appsuite.user.concept.email.manage.print">Bir veya birden fazla e-postanın içeriğini yazdırabilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.print">
 <p class="title">E-posta içeriğini yazdırma:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.print"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">E-postaları arşivleme</a></p></li></ul>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.recover.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.recover.html
new file mode 100644
index 000000000..01273b764
--- /dev/null
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.recover.html
@@ -0,0 +1,92 @@
+<html lang="tr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>E-postaları kurtarma</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Kullanım Kılavuzu">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-postaları Yönetme">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="E-postaları silme">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="E-postaları silme">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Geri</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Sonraki</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
+<h2 class="sr-only">E-postaları Yönetme</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.recover">
+<div class="titlepage"><div><div><h3 class="title">E-postaları kurtarma</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.recover">Aşağıdaki seçenekler mevcuttur:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Çöp kutusundaki e-postaları ayrı ayrı kurtarma.</p></li>
+<li class="listitem"><p role="presentation">Çöp kutusundaki tüm e-postaları kurtarma.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.single">
+<p class="title">Çöp kutusundaki e-postaları ayrı ayrı kurtarmak için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Klasör görünümünde <span class="guibutton"><strong>Çöp kutusu</strong></span> klasörünü açın.</p></li>
+<li class="step">
+<p role="presentation">Bir veya birkaç e-posta seçin.</p>
+<p role="presentation">Bir e-postanın sağ tıklama menüsünden <span class="guibutton"><strong>Taşı</strong></span>'ya tıklayın.</p>
+</li>
+<li class="step"><p role="presentation"><span class="guilabel"><strong>Taşı</strong></span> penceresinden bir klasör seçin. <span class="guibutton"><strong>Taşı</strong></span>'ya tıklayın.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Veya:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">E-postaları çöp kutusundan sürükleyip klasör görünümündeki bir klasöre bırakın.</p></li>
+<li class="listitem"><p role="presentation">Tek bir e-posta seçtiyseniz ayrıntı görünümündeki <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesini <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.single.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> kullanın. <span class="guibutton"><strong>Taşı</strong></span>'ya tıklayın.</p></li>
+</ul>
+        </div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.all">
+<p class="title">Çöp kutusundaki tüm e-postaları kurtarmak için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Klasör görünümünde <span class="guibutton"><strong>Çöp kutusu</strong></span> klasörünü seçin.</p></li>
+<li class="step">
+<p role="presentation">Aşağıdaki yöntemlerden birini kullanın:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Çöp Kutusu</strong></span>'nun yanındaki <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayın.</p></li>
+<li class="listitem"><p role="presentation">Listenin üzerindeki <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayın.</p></li>
+</ul></p>
+<p role="presentation"><span class="guibutton"><strong>Tüm iletileri taşı</strong></span> düğmesine tıklayın.</p>
+</li>
+<li class="step"><p role="presentation"><span class="guilabel"><strong>Taşı</strong></span> penceresinden bir klasör seçin. <span class="guibutton"><strong>Tümün taşı</strong></span>'ya tıklayın.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.recover"></p>
+<p class="title">Kullanıcı arayüzü:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">E-posta</span> klasör görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
+</li></ul>
+<p> </p>
+<p class="title">İlgili konular:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-postaları silme</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-postaları silme</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.23.7.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Kalıcı olarak silinmiş e-postaları kurtarma</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-posta klasörlerini temizleme</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.recover">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.reminder.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.reminder.html
index 6422626b6..632f3d611 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.reminder.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.reminder.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">E-postaları Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.reminder">
 <div class="titlepage"><div><div><h3 class="title">E-posta anımsatıcıları oluşturma</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">E-posta için bir anımsatıcı oluşturabilirsiniz. Bunu yaptığınızda, bitiş tarihini anımsatan bir görev oluşturulmuş olur.</p>
+<a class="indexterm" name="id-1.7.15.15.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">E-posta için bir anımsatıcı oluşturabilirsiniz. Bunu yaptığınızda, bitiş tarihini anımsatan bir görev oluşturulmuş olur.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.email.manage.reminder">
 <p class="title">E-posta anımsatıcısı oluşturma:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -47,7 +47,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.reminder"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Yeni görev oluşturma</a></p></li></ul>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.save.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.save.html
index 4000c92ac..be7e8d1dd 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.save.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.save.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">E-postaları Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.save">
 <div class="titlepage"><div><div><h3 class="title">E-postaları kaydetme</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.16.2"></a><p id="ox.appsuite.user.concept.email.manage.save">E-postaları metin dosyası olarak kaydedebilirsiniz. Metin dosyası EML dosya uzantısına sahip olur. Birden çok e-posta seçerseniz her e-posta için ayrı bir EML dosyası oluşturulacaktır. Ardından EML dosyaları zip arşivi olarak kaydedilecektir.</p>
+<a class="indexterm" name="id-1.7.15.17.2"></a><p id="ox.appsuite.user.concept.email.manage.save">E-postaları metin dosyası olarak kaydedebilirsiniz. Metin dosyası EML dosya uzantısına sahip olur. Birden çok e-posta seçerseniz her e-posta için ayrı bir EML dosyası oluşturulacaktır. Ardından EML dosyaları zip arşivi olarak kaydedilecektir.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.save">
 <p class="title">E-posta kaydetme:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,7 +44,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.save"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -52,7 +55,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">E-postaları içe aktarma</a></p>
 <p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">E-postaları PDF olarak dışa aktarma</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.7.15.16.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Kişisel Verileri İndirme</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.7.15.17.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Kişisel Verileri İndirme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.save">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.source.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.source.html
index 7a076ceee..cbb8cf702 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.source.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.source.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">E-postaları Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.source">
 <div class="titlepage"><div><div><h3 class="title">E-posta kaynağını gösterme</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.12.2"></a><p id="ox.appsuite.user.concept.email.manage.source">E-posta kaynağı, e-postanın tam içeriğini ve e-posta üstbilgi (header) verilerinin tamamını içerir.</p>
+<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.source">E-posta kaynağı, e-postanın tam içeriğini ve e-posta üstbilgi (header) verilerinin tamamını içerir.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.source">
 <p class="title">E-posta kaynağını görüntüleme:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,7 +46,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.source"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">E-posta</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.undelete.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.undelete.html
new file mode 100644
index 000000000..e2ce403b5
--- /dev/null
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.undelete.html
@@ -0,0 +1,70 @@
+<html lang="tr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Kalıcı olarak silinmiş e-postaları kurtarma</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Kullanım Kılavuzu">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="E-postaları Yönetme">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="E-postaları silme">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="E-posta klasörlerini temizleme">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Geri</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Sonraki</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
+<h2 class="sr-only">E-postaları Yönetme</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.undelete">
+<div class="titlepage"><div><div><h3 class="title">Kalıcı olarak silinmiş e-postaları kurtarma</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.25.2"></a><a class="indexterm" name="id-1.7.15.25.3"></a><p id="ox.appsuite.user.concept.email.manage.undelete.html">Kalıcı olarak silinmiş e-postaları 14 gün içinde kurtarabilirsiniz. Bu sürenin ardından, kalıcı olarak silinen e-postalar geri getirilemeyecek şekilde silinir.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
+<p class="title">Kalıcı olarak silinmiş e-postaları kurtarmak için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Klasör görünümünde <span class="guibutton"><strong>Çöp kutusu</strong></span> klasörünü seçin.</p></li>
+<li class="step">
+<p role="presentation"><span class="guibutton"><strong>Çöp Kutusu</strong></span>'nun yanındaki <span class="guibutton"><strong>Diğer eylemler</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> tıklayın.</p>
+<p role="presentation"><span class="guibutton"><strong>Silinen öğeleri kurtar</strong></span>'a tıklayın.</p>
+</li>
+<li class="step">
+<p role="presentation"><span class="guilabel"><strong>Silinen öğeleri kurtar</strong></span> penceresinden kurtarılacak e-postaları seçin.</p>
+<p role="presentation"><span class="guibutton"><strong>Seçilen öğeleri taşı</strong></span>'ya tıklayın.</p>
+</li>
+<li class="step">
+<p role="presentation"><span class="guilabel"><strong>Taşı</strong></span> penceresinde, kurtarılan e-postaların taşınacağı klasörü seçin.</p>
+<p role="presentation"><span class="guibutton"><strong>Taşı</strong></span>'ya tıklayın.</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.undelete"></p>
+<p class="title">Kullanıcı arayüzü:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">E-posta</span> klasör görünümü</a></p></li></ul>
+<p> </p>
+<p class="title">İlgili konular:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-postaları silme</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">E-postaları kurtarma</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">E-postaları silme</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">E-posta klasörlerini temizleme</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.undelete">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">E-postaları Yönetme</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.unifiedmail.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.unifiedmail.html
index 275b30f43..b195167d8 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.unifiedmail.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.manage.unifiedmail.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">E-postaları Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.unifiedmail">
 <div class="titlepage"><div><div><h3 class="title">Birleşik e-postayı kullanma</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">Birleşik e-posta sayesinde birden çok e-posta hesabına gelen iletileri tek bir merkezi klasörde görebilirsiniz. Bu sayede birden çok e-posta hesabının gelen kutularına hızlıca bakma şansınız olur. Birleşik e-postayı şu şekilde tanımlayabiliriz:</p>
+<a class="indexterm" name="id-1.7.15.27.2"></a><a class="indexterm" name="id-1.7.15.27.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">Birleşik e-posta sayesinde birden çok e-posta hesabına gelen iletileri tek bir merkezi klasörde görebilirsiniz. Bu sayede birden çok e-posta hesabının gelen kutularına hızlıca bakma şansınız olur. Birleşik e-postayı şu şekilde tanımlayabiliriz:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">E-posta hesabındaki e-postalar, gelen kutusuna ek olarak <span class="guibutton"><strong>Birleşik e-posta</strong></span> klasöründe de görünür. Ancak e-postaların aslında yalnızca birer kopyası vardır.</p></li>
 <li class="listitem"><p role="presentation">Gelen kutusunun alt klasörlerindeki e-postalar <span class="guibutton"><strong>Birleşik e-posta</strong></span> klasöründe görüntülenmez.</p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.openai.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.openai.html
index 32f8732d5..cebf7466b 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.openai.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.openai.html
@@ -37,7 +37,7 @@
 <li class="listitem"><p role="presentation">mevcut e-postaların içeriğini düzenleme veya e-postaları yanıtlamak için metin önerileri oluşturma</p></li>
 <li class="listitem"><p role="presentation">yeni e-posta göndermek için metin önerileri oluşturma</p></li>
 </ul>
-<p>Not: Yapay zekâ entegrasyonunu kullandığınızda ilgili e-postanın içeriği Microsoft Azure OpenAI hizmetine gönderilecektir.</p>
+<p>Not: Yapay zekâ entegrasyonunu kullandığınızda ilgili e-postanın içeriği OpenAI servislerine gönderilecektir.</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Bir yapay zekâ işlevini ilk kez kullandığınızda bu verileri göndermeyi kabul etmeniz gereken bir iletişim kutusu açılır. Yapay zekâ işlevlerini kullanabilmeniz için verileri göndermeyi kabul etmeniz zorunludur.</p></li>
 <li class="listitem"><p role="presentation">Verilerin gönderilmesine ilişkin onayınızı istediğiniz zaman değiştirebilirsiniz. Bunun için e-posta ayarlarında <span class="guibutton"><strong>Yapay zekâ entegrasyonu</strong></span>nun altındaki <span class="guibutton"><strong>Onayı değiştir</strong></span>'e tıklayabilirsiniz.</p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.openai.send.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.openai.send.html
index ea80e0c96..3ed1cdabc 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.openai.send.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.openai.send.html
@@ -59,7 +59,7 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">E-postaları yanıtlarken yapay zekâ işlevlerini kullanma</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.email.openai.send">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.openai.html">Yapay zekâ entegrasyonunu kullanma</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.search.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.search.html
index 13dbd6130..d04f00129 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.search.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.search.html
@@ -93,7 +93,10 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-postaları Görüntüleme</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">E-postaları kategorize etme</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">E-postaları kategorize etme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Yeni e-postalarda varsayılan olarak PGP inline kullan</a></p>
+</li>
 </ul>
 <p id="ox.appsuite.user.parent.email.search">Ana başlık:<a class="xref" href="ox.appsuite.user.chap.email.html"><i><span class="phrase">E-posta</span></i></a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attachmentexisting.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attachmentexisting.html
index a17313d55..c02ba465b 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attachmentexisting.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attachmentexisting.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="Dosya ekleme">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Ekleri bağlantı olarak gönderme">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="dosya ekleme">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="ekleri bağlantı olarak gönderme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
-<h2 class="sr-only">E-posta Gönderme</h2>
+<h2 class="sr-only">e-posta gönderme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentexisting">
 <div class="titlepage"><div><div><h3 class="title">Mevcut e-postalardan dosya ekleme</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.9.2"></a><a class="indexterm" name="id-1.7.11.9.3"></a><p id="ox.appsuite.user.concept.email.send.attachmentexisting">Yapılandırmaya bağlı olarak, mevcut e-postalardan yeni bir e-postaya dosya (ek) ekleyebilirsiniz.</p>
@@ -54,14 +54,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachmentexisting"></p>
 <p class="title">Üst eylem:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p></li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Dosya ekleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Ekleri bağlantı olarak gönderme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">dosya ekleme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">ekleri bağlantı olarak gönderme</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attachmentlink.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attachmentlink.html
index 8a99ab236..74b3dcab5 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attachmentlink.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attachmentlink.html
@@ -1,11 +1,11 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Ekleri bağlantı olarak gönderme</title>
+<title>ekleri bağlantı olarak gönderme</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Mevcut e-postalardan dosya ekleme">
 <link rel="next" href="ox.appsuite.user.sect.email.send.templates.html" title="Şablonları kullanma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
-<h2 class="sr-only">E-posta Gönderme</h2>
+<h2 class="sr-only">e-posta gönderme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentlink">
-<div class="titlepage"><div><div><h3 class="title">Ekleri bağlantı olarak gönderme</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">ekleri bağlantı olarak gönderme</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.10.2"></a><p id="ox.appsuite.user.concept.email.send.attachmentlink">Bu işlev, büyük dosyaları e-postayla göndermenize olanak sağlar. Şu şekilde çalışır:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Ekler <span class="phrase">Drive</span> uygulamasındaki <span class="guibutton"><strong>Drive Mail</strong></span> klasörü içinde yeni bir klasöre yüklenir. Bu klasörün adı e-posta konusuyla aynıdır. Klasör herkese açık bir bağlantıyla paylaşılır.</p></li>
@@ -84,14 +84,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.attachmentlink"></p>
 <p class="title">Üst eylem:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p></li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Dosya ekleme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">dosya ekleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Mevcut e-postalardan dosya ekleme</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachmentlink">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachmentlink">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attachments.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attachments.html
index 3b0c074e4..4be545263 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attachments.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attachments.html
@@ -1,11 +1,11 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Dosya ekleme</title>
+<title>dosya ekleme</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.replyto.html" title="Yanıt ayarlama">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Mevcut e-postalardan dosya ekleme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
-<h2 class="sr-only">E-posta Gönderme</h2>
+<h2 class="sr-only">e-posta gönderme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachments">
-<div class="titlepage"><div><div><h3 class="title">Dosya ekleme</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">dosya ekleme</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.8.2"></a><a class="indexterm" name="id-1.7.11.8.3"></a><p id="ox.appsuite.user.concept.emal.add.attachments">Yapılandırmaya bağlı olarak, bilgisayaranızda veya <span class="phrase">Drive</span> uygulamasında kayıtlı olan dosyaları ekleyebilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.attachments">
 <p class="title">E-posta düzenleme penceresinde e-postaya dosya ekleme:</p>
@@ -57,14 +57,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachments"></p>
 <p class="title">Üst eylem:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p></li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Mevcut e-postalardan dosya ekleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Ekleri bağlantı olarak gönderme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">ekleri bağlantı olarak gönderme</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachments">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachments">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attendees.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attendees.html
index 592b4b6e7..6a500d98a 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attendees.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.autoforward.html" title="E-postaları otomatik iletme">
 <link rel="next" href="ox.appsuite.user.sect.email.send.vacationnotice.html" title="Otomatik olarak tatil bildirimi gönderme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
-<h2 class="sr-only">E-posta Gönderme</h2>
+<h2 class="sr-only">e-posta gönderme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attendees">
 <div class="titlepage"><div><div><h3 class="title">Randevu katılımcılarına e-posta gönderme</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.16.2"></a><div class="task" id="ox.appsuite.user.task.email.send.attendees">
@@ -47,15 +47,15 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.send.attendees"></p>
-<p class="title">İlgili konular:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
+<p class="title">Kullanıcı arayüzü:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">Takvim</span> açılır penceresi</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">Takvim</span> araç çubuğu</a></p>
-</li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p></li>
-</ul>
-<p id="ox.appsuite.user.parent.email.send.attendees">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+</li></ul>
+<p> </p>
+<p class="title">İlgili konular:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p></li></ul>
+<p id="ox.appsuite.user.parent.email.send.attendees">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.autoforward.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.autoforward.html
index 9c6babf59..81a45c2bb 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.autoforward.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.autoforward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.forward.html" title="E-postaları iletme">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attendees.html" title="Randevu katılımcılarına e-posta gönderme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
-<h2 class="sr-only">E-posta Gönderme</h2>
+<h2 class="sr-only">e-posta gönderme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.autoforward">
 <div class="titlepage"><div><div><h3 class="title">E-postaları otomatik iletme</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.15.2"></a><p id="ox.appsuite.user.concept.email.send.autoforward">E-postaların otomatik olarak başka bir adrese iletilmesini sağlayabilirsiniz.</p>
@@ -60,7 +60,7 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">E-postaları yanıtlama</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">E-postaları iletme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Otomatik olarak tatil bildirimi gönderme</a></p>
@@ -70,7 +70,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.autoforward">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p id="ox.appsuite.user.parent.email.send.autoforward">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.forward.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.forward.html
index 724034f5e..67f479a81 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.forward.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.forward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.reply.html" title="E-postaları yanıtlama">
 <link rel="next" href="ox.appsuite.user.sect.email.send.autoforward.html" title="E-postaları otomatik iletme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
-<h2 class="sr-only">E-posta Gönderme</h2>
+<h2 class="sr-only">e-posta gönderme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.forward">
 <div class="titlepage"><div><div><h3 class="title">E-postaları iletme</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.14.2"></a><p id="ox.appsuite.user.concept.email.send.forward">Bir e-postayı iletirken e-postanın bazı alanları önceden doldurulur:</p>
@@ -69,11 +69,11 @@
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">E-postaları yanıtlama</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">E-postaları otomatik iletme</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.forward">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p id="ox.appsuite.user.parent.email.send.forward">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.html
index bb2c197e8..8a415c1e9 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.html
@@ -1,13 +1,13 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>E-posta Gönderme</title>
+<title>e-posta gönderme</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="E-posta">
 <link rel="prev" href="ox.appsuite.user.sect.email.attachments.html" title="E-posta Eklerini Görüntüleme ve Kaydetme">
-<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Yeni bir e-posta gönderme">
+<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Yeni e-posta gönderme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -31,15 +31,15 @@
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.send">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">E-posta Gönderme</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">e-posta gönderme</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.email.send">E-posta göndermeyi ve e-posta içeriğini özelleştirmeyi öğrenin:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Gönderen adresi seçme</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">gönderen adresi seçme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Yanıt ayarlama</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Dosya ekleme</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">dosya ekleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Mevcut e-postalardan dosya ekleme</a></p></li>
-<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Ekleri bağlantı olarak gönderme</a></p></li>
+<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">ekleri bağlantı olarak gönderme</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.11.2.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Şablonları kullanma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">İmzaları kullanma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">E-postaları yanıtlama</a></p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.new.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.new.html
index beb1e6453..da2720152 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.new.html
@@ -1,13 +1,13 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Yeni bir e-posta gönderme</title>
+<title>Yeni e-posta gönderme</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
-<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="Gönderen adresi seçme">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
+<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="gönderen adresi seçme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
-<h2 class="sr-only">E-posta Gönderme</h2>
+<h2 class="sr-only">e-posta gönderme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.new">
-<div class="titlepage"><div><div><h3 class="title">Yeni bir e-posta gönderme</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Yeni e-posta gönderme</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.5.2"></a><a class="indexterm" name="id-1.7.11.5.3"></a><a class="indexterm" name="id-1.7.11.5.4"></a><div class="task" id="ox.appsuite.user.task.email.send.new">
 <p class="title">Yeni bir e-posta göndermek için:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -88,37 +88,26 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">Yeni e-posta düğmesi</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">E-posta düzenleme penceresi</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Bağlı eylemler:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Kişileri veya Kaynakları Bir Adres Defterinden Otomatik Olarak Ekleme</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Kişileri veya Kaynakları Bir Adres Dizininden Otomatik Olarak Ekleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Gönderen adresi seçme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">gönderen adresi seçme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Yanıt ayarlama</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Dosya ekleme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">dosya ekleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Mevcut e-postalardan dosya ekleme</a></p>
-<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Ekleri bağlantı olarak gönderme</a></p>
+<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">ekleri bağlantı olarak gönderme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Şablonları kullanma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">İmzaları kullanma</a></p>
 </li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">E-postaları yanıtlama</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">E-postaları iletme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">E-postaları otomatik iletme</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Randevu katılımcılarına e-posta gönderme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Otomatik olarak tatil bildirimi gönderme</a></p>
-<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Şifrelenmiş e-posta gönderme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Kişileri vCard olarak gönderme</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Adres defteri içinden e-posta gönderme</a></p>
-</li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">E-posta oluştururken yapay zekâ işlevlerini kullanma</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">E-posta oluştururken yapay zekâ işlevlerini kullanma</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.new">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p id="ox.appsuite.user.parent.email.send.new">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.reply.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.reply.html
index 24f76df80..390a88c30 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.reply.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.reply.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.signatures.html" title="İmzaları kullanma">
 <link rel="next" href="ox.appsuite.user.sect.email.send.forward.html" title="E-postaları iletme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
-<h2 class="sr-only">E-posta Gönderme</h2>
+<h2 class="sr-only">e-posta gönderme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.reply">
 <div class="titlepage"><div><div><h3 class="title">E-postaları yanıtlama</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.13.2"></a><p id="ox.appsuite.user.concept.email.send.reply">Bir e-postayı yanıtlarken e-postanın bazı alanları önceden doldurulur:</p>
@@ -65,13 +65,13 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">E-postaları iletme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Otomatik olarak tatil bildirimi gönderme</a></p>
 </li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.11.13.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">E-postaları yanıtlarken yapay zekâ işlevlerini kullanma</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.reply">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p id="ox.appsuite.user.parent.email.send.reply">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.replyto.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.replyto.html
index b4c2380c3..8023aa09c 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.replyto.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.replyto.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="Gönderen adresi seçme">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="Dosya ekleme">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="gönderen adresi seçme">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="dosya ekleme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
-<h2 class="sr-only">E-posta Gönderme</h2>
+<h2 class="sr-only">e-posta gönderme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.replyto">
 <div class="titlepage"><div><div><h3 class="title">Yanıt ayarlama</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.7.2"></a><p id="ox.appsuite.user.concept.email.send.replyto">Varsayılan olarak, gönderdiğiniz e-postaya yazılan yanıtlar e-postayı gönderdiğiniz adrese gönderilir. Alternatif olarak, verilen yanıtların gönderileceği e-posta adreslerini belirtmek için e-posta düzenleme penceresini kullanabilirsiniz.</p>
@@ -38,11 +38,11 @@
 <p class="title">E-posta düzenleme penceresinde yanıt adresi seçmek için:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">E-posta düzenleme penceresinde, gönderen adresinin yanındaki <span class="guibutton"><strong>RE</strong></span>'ye tıklayın. <span class="guibutton"><strong>Yanıtla</strong></span> alanı görüntülenecektir.</p>
-<p role="presentation">Birincil e-posta hesabınızı düzenlerken varsayılan yanıt adreslerini belirttiyseniz <span class="guibutton"><strong>Yanıtla</strong></span> alanı otomatik olarak görüntülenir. Önceden ayarlanmış yanıt adresleri bu alanda görüntülenir.</p>
+<p role="presentation">E-posta düzenleme penceresinde, gönderen adresinin yanındaki <span class="guibutton"><strong>Re</strong></span>'ye tıklayın. <span class="guibutton"><strong>Yanıtla</strong></span> alanı görüntülenecektir.</p>
+<p role="presentation">Birincil e-posta hesabınızı düzenlerken ön tanımlı yanıt adreslerini belirttiyseniz <span class="guibutton"><strong>Yanıtla</strong></span> alanı otomatik olarak görüntülenir. Önceden ayarlanmış yanıt adresleri bu alanda görüntülenir.</p>
 </li>
 <li class="step">
-<p role="presentation"><span class="guibutton"><strong>Yanıtla</strong></span>alanına, e-postanıza verilecek yanıtın gönderilmesini istediğiniz e-posta adreslerini girin.<ul class="itemizedlist" style="list-style-type: disc; ">
+<p role="presentation"><span class="guibutton"><strong>Yanıtla</strong></span>alanına, e-postanıza verilecek yanıtın gönderileceği e-posta adreslerini girin.<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Alıcıları girerken eşleşen öneriler görüntülenecektir. Bir öneriyi kabul etmek isterseniz üzerine tıklayın.</p></li>
 <li class="listitem"><p role="presentation">Bir adres defterinden kişi seçmek için giriş alanının sağ tarafındaki <span class="guibutton"><strong>Kişi seç</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.replyto.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span> tıklayın.</p></li>
 </ul></p>
@@ -52,11 +52,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.replyto"></p>
 <p class="title">Üst eylem:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p></li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">Birinci e-posta hesabını düzenleme</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.replyto">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p id="ox.appsuite.user.parent.email.send.replyto">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.sender.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.sender.html
index 65a90d2c2..cc2113d2d 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.sender.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.sender.html
@@ -1,12 +1,12 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Gönderen adresi seçme</title>
+<title>gönderen adresi seçme</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Yeni bir e-posta gönderme">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Yeni e-posta gönderme">
 <link rel="next" href="ox.appsuite.user.sect.email.send.replyto.html" title="Yanıt ayarlama">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
-<h2 class="sr-only">E-posta Gönderme</h2>
+<h2 class="sr-only">e-posta gönderme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.sender">
-<div class="titlepage"><div><div><h3 class="title">Gönderen adresi seçme</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">gönderen adresi seçme</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.6.2"></a><p id="ox.appsuite.user.concept.email.send.sender">E-posta gönderirken, alıcıya gösterilecek gönderen adresini e-posta düzenleme penceresinde ayarlayabilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.sender">
 <p class="title">E-posta düzenleme penceresinde gönderen adresinizi seçme:</p>
@@ -54,11 +54,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.sender"></p>
 <p class="title">Üst eylem:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p></li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">E-posta Hesapları Ekleme</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.sender">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p id="ox.appsuite.user.parent.email.send.sender">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.signatures.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.signatures.html
index 14c8ddce9..4ec332d8e 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.signatures.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.signatures.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.templates.html" title="Şablonları kullanma">
 <link rel="next" href="ox.appsuite.user.sect.email.send.reply.html" title="E-postaları yanıtlama">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
-<h2 class="sr-only">E-posta Gönderme</h2>
+<h2 class="sr-only">e-posta gönderme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.signatures">
 <div class="titlepage"><div><div><h3 class="title">İmzaları kullanma</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.12.2"></a><a class="indexterm" name="id-1.7.11.12.3"></a><p id="ox.appsuite.user.concept.email.send.signatures">E-posta imzası, oluşturulan, yanıtlanan ve iletilen e-postalara otomatik olarak eklenen bir metindir. Genellikle e-posta metninin sonuna ad, şirket ve adres gibi bilgileri eklemek için kullanılır. Düz metin veya HTML biçiminde imzalar oluşturabilirsiniz. Aşağıdaki işlevler mevcuttur:</p>
@@ -86,7 +86,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.signatures"></p>
 <p class="title">Üst eylem:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p></li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -94,7 +94,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">E-posta Hesapları Ekleme</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Şablonları kullanma</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.signatures">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p id="ox.appsuite.user.parent.email.send.signatures">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.templates.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.templates.html
index f13b30ce1..c7e1063fc 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.templates.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.templates.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Ekleri bağlantı olarak gönderme">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="ekleri bağlantı olarak gönderme">
 <link rel="next" href="ox.appsuite.user.sect.email.send.signatures.html" title="İmzaları kullanma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
-<h2 class="sr-only">E-posta Gönderme</h2>
+<h2 class="sr-only">e-posta gönderme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.templates">
 <div class="titlepage"><div><div><h3 class="title">Şablonları kullanma</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.11.2"></a><a class="indexterm" name="id-1.7.11.11.3"></a><p id="ox.appsuite.user.concept.email.send.templates">Şablonlar, bir kere yazdıktan sonra istediğiniz zaman e-postalarınıza ekleyebileceğiniz metin modülleridir. Yani sık kullandığınız cümleleri yalnızca bir kez tekrar tekrar kullanabilirsiniz. Şablonlar, imzalar ve e-posta taslakları aşağıdaki şekillerde farklılık gösterir:</p>
@@ -83,7 +83,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.templates"></p>
 <p class="title">Üst eylem:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p></li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -91,7 +91,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">İmzaları kullanma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">E-posta taslaklarını kullanma</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.templates">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p id="ox.appsuite.user.parent.email.send.templates">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.vacationnotice.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.vacationnotice.html
index 6220cdeac..0b71006d8 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.vacationnotice.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.send.vacationnotice.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="E-posta Gönderme">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="e-posta gönderme">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attendees.html" title="Randevu katılımcılarına e-posta gönderme">
 <link rel="next" href="ox.appsuite.user.sect.email.openai.html" title="Yapay zekâ entegrasyonunu kullanma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">E-posta</span></h1>
-<h2 class="sr-only">E-posta Gönderme</h2>
+<h2 class="sr-only">e-posta gönderme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.vacationnotice">
 <div class="titlepage"><div><div><h3 class="title">Otomatik olarak tatil bildirimi gönderme</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.17.2"></a><a class="indexterm" name="id-1.7.11.17.3"></a><p id="ox.appsuite.user.concept.email.send.vacationnotice">Tatil bildirimi, göndereni, belirli bir süre boyunca e-postalarınızı okuyamayacağınız konusunda bilgilendirir. Aşağıdakileri ayarlayabilirsiniz:</p>
@@ -76,14 +76,14 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">E-postaları yanıtlama</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">E-postaları iletme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">E-postaları otomatik iletme</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">E-posta Filtrelerini Kullanma</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.vacationnotice">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">E-posta Gönderme</a></p>
+<p id="ox.appsuite.user.parent.email.send.vacationnotice">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.email.send.html">e-posta gönderme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.settings.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.settings.html
index 6c93672cb..5ffd434a4 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.settings.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.settings.html
@@ -50,32 +50,33 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.composereply">Yazma ve yanıtlama</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.20.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">Åžablonlar</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.rules">Kurallar</a></p></li>
-<li class="listitem feat-zoom" id="id-1.7.20.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">Yapay zekâ entegrasyonu</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.7.20.5.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">GeliÅŸmiÅŸ ayarlar</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">Yapay zekâ entegrasyonu</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">GeliÅŸmiÅŸ ayarlar</a></p></li>
 </ul>
 <p>Ayrıca bkz.:<a class="xref" href="ox.appsuite.user.sect.settings.search.html">Ayar Arama</a></p>
 <p id="ox.appsuite.user.reference.email.settings.reading"></p>
 <h3 class="title">Okuma</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>düzen. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Liste ve ayrıntı görünümlerinin düzenini tanımlar.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>Düzen. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Liste ve ayrıntı görünümlerinin düzenini tanımlar.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>ileti listesi. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a></p>
+<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>İleti listesi. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.list"><b>Kişi resimleri, onay kutuları, basit. </b>Kişi resimlerinin ve onay kutularının liste görünümünde görünüp görünmeyeceğini tanımlar.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.preview"><b>Metin ön izlemesini göster. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.2.1.2"></a>E-posta listesi görünümünde e-posta içeriğinin ilk sözcüklerinin görünüp görünmeyeceğini tanımlar.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Her zaman tam tarih ve saati göster. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>E-posta listesi görünümünde alınma tarihinin yanı sıra alınma ​saatinin de görünüp görünmeyeceğini tanımlar.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>İleti boyutunu göster. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>E-posta listesi görünümünde e-posta boyutunun görünüp görünmeyeceğini tanımlar.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.20.6.2.1.2.1.3.1.3"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>Kategorileri göster. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>E -postaya atanan kategorilerin e-posta listesi görünümünde görünüp görünmeyeceğini tanımlar.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Her zaman tam tarih ve saati göster. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>E-posta listesi görünümünde alınma tarihinin yanı sıra alınma ​saatinin de görünüp görünmeyeceğini tanımlar.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>İleti boyutunu göster. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.5.1.2"></a>E-posta listesi görünümünde e-posta boyutunun görünüp görünmeyeceğini tanımlar.</p></li>
 </ul>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>okuma bölmesi. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a></p>
+<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>Okuma bölmesi. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>alıntılanan metni farklı renkte göster. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Orijinal iletilerin vurgulanacağını ve dikey bir çizgiyle işaretleneceğini belirtir. Bu seçenek, orijinal e-posta metninin ekli olmadığını ve e-postanın içinde yazılı olduğunu varsayar.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>Alıntılanan metni farklı renkte göster. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.1.2"></a>Orijinal iletilerin vurgulanacağını ve dikey bir çizgiyle işaretleneceğini belirtir. Bu seçenek, orijinal e-posta metninin ekli olmadığını ve e-postanın içinde yazılı olduğunu varsayar.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.fixedfont"><b>Düz metin e-postalarında sabit genişlikli yazı tipi kullan. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.2.1.2"></a>Düz metin e-postaları görüntülerken sabit genişlikli bir yazı tipinin kullanılıp kullanılmayacağını belirtir.</p></li>
 </ul>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>okundu olarak işaretle. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>E-posta seçildikten ne kadar süre sonra "okundu" olarak işaretleneceğini tanımlar.</p>
+<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>Okundu olarak işaretle. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>E-posta seçildikten ne kadar süre sonra "okundu" olarak işaretleneceğini tanımlar.</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.immediately"><b>Hemen. </b>E-posta hemen okundu olarak işaretlenecektir.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.seconds"><b>5 saniye sonra, 20 saniye sonra. </b>E-posta, belirlediğiniz sürenin ardından okundu olarak işaretlenecektir.</p></li>
@@ -105,7 +106,7 @@
 <p role="presentation">Not: Gönderen adresinin önünde gönderenin adı görünür. Hesap ayarlarında <span class="guibutton"><strong>Adınız</strong></span> giriş alanına bir ad yazarsanız bu ad, ön tanımlı gönderen adının yerini alır.</p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>ileti biçimi. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>E-postaların gönderilme biçimini tanımlar:</p>
+<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>İleti biçimi. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>E-postaların gönderilme biçimini tanımlar:</p>
 <ul class="itemizedlist" style="list-style-type: square; ">
 <li class="listitem"><p><b>HTML. </b>E-posta HTML biçimlendirmesi ile gönderilecektir. E-posta metnini biçimlendirebilirsiniz.</p></li>
 <li class="listitem"><p><b>Düz metin. </b>E-posta metni biçimlendirme olmadan, düz metin olarak gönderilecektir.</p></li>
@@ -142,10 +143,10 @@
 <h3 class="title">GeliÅŸmiÅŸ ayarlar</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.html"><b>HTML biçimli e-postaların görüntülenmesine izin ver. </b><a class="indexterm" name="id-1.7.20.12.2.1.1.1.2"></a>HTML iletilerinin görüntülenmesine izin verilip verilmeyeceğini belirtir.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>okundu bilgisi isteklerini göster. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Alınan e-postada alındı onayı isteği varsa alındı onayının görüntülenip görüntülenmeyeceğini tanımlar.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>Okundu bilgisi isteklerini göster. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>Alınan e-postada alındı onayı isteği varsa alındı onayının görüntülenip görüntülenmeyeceğini tanımlar.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>silinen e-postaları kalıcı olarak kaldır. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Silinen e-postaların kalıcı olarak silineceğini mi yoksa çöp kutusu klasörüne mi taşınacağını tanımlar.</p>
-<p role="presentation"><span class="phrase"><strong>Uyarı:</strong></span> Kalıcı olarak silinen e-postalar geri alınamaz.</p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>Silinen e-postaları kalıcı olarak kaldır. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>Silinen e-postaların kalıcı olarak silineceğini mi yoksa çöp kutusu klasörüne mi taşınacağını tanımlar.</p>
+<p role="presentation"><span class="phrase"><strong>Uyarı:</strong></span> Yapılandırmaya bağlı olarak, kalıcı olarak silinen e-postalar <span class="bold">kurtarılamayabilir</span>.</p>
 <p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">E-postaları silme</a></p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.selectrecent"><b>Başlangıçta otomatik olarak en yeni okunmuş iletiyi seç. </b><a class="indexterm" name="id-1.7.20.12.2.1.4.1.2"></a>Uygulama açıldığında en son okuduğunuz iletinin otomatik olarak seçilip seçilmeyeceğini belirler.</p></li>
@@ -156,7 +157,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.mailinglist"><b>Posta listesini yanıtlamadan önce sor. </b><a class="indexterm" name="id-1.7.20.12.2.1.9.1.2"></a>Posta listesini yanıtlarken alıcıları onaylamanızın gerekip gerekmeyeceğini belirtir.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.appendvcard"><b>Ayrıntılı iletişim bilgilerimi her zaman vCard olarak ekle. </b><a class="indexterm" name="id-1.7.20.12.2.1.10.1.2"></a>Kişi verilerinizin yeni e-postaya vCard biçiminde iliştirilip iliştirilmeyeceğini belirtir.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>e-postaları iletme biçimi. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>E-postaları iletirken e-posta metninin nasıl gönderileceğini belirtir.</p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>E-postaları iletme biçimi. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>E-postaları iletirken e-posta metninin nasıl gönderileceğini belirtir.</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p><b>Satır içi. </b>Metin, yeni e-posta metninin içinde gönderilir.</p></li>
 <li class="listitem"><p><b>Ek. </b>Metin, yeni e-postanın eki olarak gönderilir.</p></li>
@@ -169,7 +170,7 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">Birinci e-posta hesabını düzenleme</a></p>
 </li>
@@ -177,7 +178,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">E-posta</span> klasör görünümü</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">E-postaları Görüntüleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Adresleri toplama</a></p>
 </li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.email.view.html b/help/l10n/tr_TR/ox.appsuite.user.sect.email.view.html
index 1cccf7294..956eb545f 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.email.view.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.email.view.html
@@ -77,11 +77,10 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">E-posta</span> liste görünümü</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">E-posta</span> ayrıntı görünümü</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Gelen kutusu kategorileriyle çalışma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">E-posta Eklerini Görüntüleme ve Kaydetme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">E-posta kaynağını gösterme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">E-postaları okundu veya okunmadı olarak işaretleme</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.firststeps.gui.notificationarea.html b/help/l10n/tr_TR/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
index f8f0ebe8b..086753970 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
@@ -75,7 +75,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Genel Ayarları Düzenleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Bildirim alanını kullanma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">bildirim alanını kullanma</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Randevu Davetlerini Yanıtlama</a></p>
 <p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.invitation.html">Görev Davetlerini Yanıtlama</a></p>
 </li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.autocrypt.manage.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.autocrypt.manage.html
index 525534dc7..e37039539 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.autocrypt.manage.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.autocrypt.manage.html
@@ -78,7 +78,7 @@
 <p id="ox.appsuite.user.related.guard.autocrypt.manage"></p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Ayarları</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Ayarları</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Autocrypt anahtarlarını içe aktarma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Autocrypt anahtarlarını başka istemcilere aktarma</a></p>
 </li></ul>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.createencrypted.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.createencrypted.html
index 9df6bf4c3..fb10d6217 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.createencrypted.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.createencrypted.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office belgelerini ÅŸifreleme">
-<link rel="prev" href="ox.appsuite.user.sect.guard.documents.html" title="Office belgelerini ÅŸifreleme">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office Belgelerini Åžifreleme">
+<link rel="prev" href="ox.appsuite.user.sect.guard.documents.html" title="Office Belgelerini Åžifreleme">
 <link rel="next" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html" title="Seçili belgeleri şifrelenmiş biçimde kaydetme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">
 <span class="phrase">Guard</span> ile Veri Åžifreleme</h1>
-<h2 class="sr-only">Office belgelerini ÅŸifreleme</h2>
+<h2 class="sr-only">Office Belgelerini Åžifreleme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.createencrypted">
 <div class="titlepage"><div><div><h3 class="title">ÅžifrelenmiÅŸ yeni belge oluÅŸturma</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.8.2"></a><a class="indexterm" name="id-1.14.10.8.3"></a><a class="indexterm" name="id-1.14.10.8.4"></a><p id="ox.appsuite.user.concept.guard.documents.createencrypted">Yeni bir belge oluştururken belgeyi şifreleyerek kaydetme seçeneğiniz vardır. Aşağıdaki seçenekler mevcuttur:</p>
@@ -75,7 +75,7 @@
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Dosyaları Şifreleme ve Şifrelerini Çözme</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.guard.documents.createencrypted">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office belgelerini şifreleme</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.createencrypted">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office Belgelerini Şifreleme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.html
index 84b909774..784d1f1d9 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.html
@@ -1,7 +1,7 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Office belgelerini ÅŸifreleme</title>
+<title>Office Belgelerini Åžifreleme</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
@@ -32,7 +32,7 @@
   <h1 class="sr-only">
 <span class="phrase">Guard</span> ile Veri Åžifreleme</h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.documents">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Office belgelerini ÅŸifreleme</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Office Belgelerini Åžifreleme</h2></div></div></div>
 <a class="indexterm" name="id-1.14.10.2"></a><a class="indexterm" name="id-1.14.10.3"></a><a class="indexterm" name="id-1.14.10.4"></a><a class="indexterm" name="id-1.14.10.5"></a><p id="ox.appsuite.user.concept.guard.documents">Aşağıdaki seçenekler mevcuttur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.documents.createencrypted.html">ÅžifrelenmiÅŸ yeni belge oluÅŸturma</a></p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.open.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.open.html
index 30e849fd6..a2c96fb42 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.open.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.open.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office belgelerini ÅŸifreleme">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office Belgelerini Åžifreleme">
 <link rel="prev" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html" title="Seçili belgeleri şifrelenmiş biçimde kaydetme">
 <link rel="next" href="ox.appsuite.user.sect.guard.logout.html" title="Guard'dan Çıkış Yapma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">
 <span class="phrase">Guard</span> ile Veri Åžifreleme</h1>
-<h2 class="sr-only">Office belgelerini ÅŸifreleme</h2>
+<h2 class="sr-only">Office Belgelerini Åžifreleme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.open">
 <div class="titlepage"><div><div><h3 class="title">Şifrelenmiş belgeleri açma</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.10.2"></a><a class="indexterm" name="id-1.14.10.10.3"></a><p id="ox.appsuite.user.concept.guard.documents.open">Aşağıdaki işlemleri yapmak için şifrelenmiş belgeleri açabilirsiniz:</p>
@@ -66,7 +66,7 @@
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Dosyaları Şifreleme ve Şifrelerini Çözme</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.guard.documents.open">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office belgelerini şifreleme</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.open">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office Belgelerini Şifreleme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.saveencrypted.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.saveencrypted.html
index 7f8f122a9..fc5832d68 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.saveencrypted.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.documents.saveencrypted.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
-<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office belgelerini ÅŸifreleme">
+<link rel="up" href="ox.appsuite.user.sect.guard.documents.html" title="Office Belgelerini Åžifreleme">
 <link rel="prev" href="ox.appsuite.user.sect.guard.documents.createencrypted.html" title="ÅžifrelenmiÅŸ yeni belge oluÅŸturma">
 <link rel="next" href="ox.appsuite.user.sect.guard.documents.open.html" title="Şifrelenmiş belgeleri açma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">
 <span class="phrase">Guard</span> ile Veri Åžifreleme</h1>
-<h2 class="sr-only">Office belgelerini ÅŸifreleme</h2>
+<h2 class="sr-only">Office Belgelerini Åžifreleme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.documents.saveencrypted">
 <div class="titlepage"><div><div><h3 class="title">Seçili belgeleri şifrelenmiş biçimde kaydetme</h3></div></div></div>
 <a class="indexterm" name="id-1.14.10.9.2"></a><a class="indexterm" name="id-1.14.10.9.3"></a><p id="ox.appsuite.user.concept.guard.documents.saveencrypted">Bir metin belgesini, hesap tablosunu veya sunuyu açtıktan sonra o belgeyi şifrelenmiş biçimde kaydedebilirsiniz.</p>
@@ -59,7 +59,7 @@
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Dosyaları Şifreleme ve Şifrelerini Çözme</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.guard.documents.saveencrypted">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office belgelerini şifreleme</a></p>
+<p id="ox.appsuite.user.parent.guard.documents.saveencrypted">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.documents.html">Office Belgelerini Şifreleme</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.drive.decrypt.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.drive.decrypt.html
index 84106a18e..f833efca5 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.drive.decrypt.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.drive.decrypt.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.guard.drive.html" title="Dosyaları Şifreleme ve Şifrelerini Çözme">
 <link rel="prev" href="ox.appsuite.user.sect.guard.drive.download.html" title="Şifrelenmiş dosyaları indirme">
-<link rel="next" href="ox.appsuite.user.sect.guard.documents.html" title="Office belgelerini ÅŸifreleme">
+<link rel="next" href="ox.appsuite.user.sect.guard.documents.html" title="Office Belgelerini Åžifreleme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.email.send.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.email.send.html
index 09b76f7c9..f9f865ce3 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.email.send.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.email.send.html
@@ -49,7 +49,7 @@
 <p role="presentation">Ayrıca uygulama başlatıcıdaki <span class="guibutton"><strong>Ayarlar</strong></span>'a da tıklayabilirsiniz.</p>
 <p role="presentation"><span class="guilabel"><strong>Ayarlar</strong></span> penceresi açılır.</p>
 </li>
-<li class="step"><p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın.</p></li>
+<li class="step"><p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>S/MIME</strong></span>'a tıklayın.</p></li>
 <li class="step">
 <p role="presentation"><span class="guibutton"><strong>S/MIME'ı etkinleştir</strong></span>'i işaretleyin.</p>
 <p role="presentation">S/MIME şifrelemesini varsayılan olarak ayarlanmak istiyorsanız <span class="guibutton"><strong>Varsayılanlar</strong></span> altındaki <span class="guibutton"><strong>İmzalama ve şifreleme için varsayılan olarak S/MIME kullan</strong></span> seçeneğini işaretleyin.</p>
@@ -75,7 +75,7 @@
 <li class="listitem"><p role="presentation">E-posta alıcısının şifrelenmiş bir yanıt gönderebilmesi için alıcının ortak anahtarınıza sahip olması gerekir. Ortak anahtarınızı e-posta eki olarak gönderebilirsiniz. Bunun için <span class="guibutton"><strong>Ortak anahtarımı ekle</strong></span>'yi etkinleştirin.</p></li>
 <li class="listitem">
 <p role="presentation">PGP kullanırken aşağıdaki seçenek geçerlidir:</p>
-<p role="presentation"><span class="phrase">Guard</span> ayarlarında <span class="guibutton"><strong>Gelişmiş ayarları göster</strong></span> etkinse PGP biçimini ayarlayabilirsiniz.</p>
+<p role="presentation"><span class="phrase">Guard</span> ayarlarında <span class="guibutton"><strong>Gelişmiş</strong></span> altındaki <span class="guibutton"><strong>E-posta yazarken gelişmiş ayarları göster</strong></span> ayarı açıksa PGP biçimini değiştirebilirsiniz.</p>
 <p role="presentation">Varsayılan olarak, şifrelenmiş e-postalar <span class="guibutton"><strong>Mime</strong></span> biçiminde gönderilir. Bazı eski e-posta istemcileri yalnızca PGP/Inline'ı destekler. Alıcı böyle bir istemci kullanıyorsa <span class="guibutton"><strong>Inline</strong></span>'ı etkinleştirin.</p>
 <p role="presentation">Not: <span class="guibutton"><strong>Inline</strong></span>'ı kullanırsanız HTML biçiminde e-posta gönderemezsiniz.</p>
 </li>
@@ -98,8 +98,8 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.read.html">Şifrelenmiş e-postaları okuma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.external.html">Harici alıcılar şifrelenmiş bir e-postayı nasıl okuyabilir?</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni bir e-posta gönderme</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Ayarları</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Yeni e-posta gönderme</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Ayarları</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.email.send">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.email.html">E-posta Yazışmalarını Şifreleme</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.html
index bfc51794e..1b2062a15 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Guard ile Veri Åžifreleme">
-<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Parola Yönetimi">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Parola sıfırlama işlevini kaldırma">
 <link rel="next" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Kendi PGP anahtarlarınızı yönetme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Sonraki</a></li>
@@ -44,9 +44,17 @@
 <p id="ox.appsuite.user.possibilities.guard.keys">Aşağıdaki seçenekler mevcuttur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Kendi PGP anahtarlarınızı yönetme</a></p></li>
-<li class="listitem cap-smime" id="id-1.14.13.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">S/MIME anahtarlarınızı yönetme</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Ortak anahtarları yönetme</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Alıcıların PGP anahtarlarını yönetme</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">S/MIME anahtarlarınızı yönetme</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Alıcıların S/MIME anahtarlarını yönetme</a></p></li>
 </ul>
+<p id="ox.appsuite.user.related.guard.keys"></p>
+<p class="title">İlgili konular:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Ayarları</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.keys">Ana başlık:<a class="xref" href="ox.appsuite.user.chap.guard.html"><i><span class="phrase">Guard</span> ile Veri Şifreleme</i></a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.pgppublickeys.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
index 5de17621c..7f09d2486 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
@@ -1,13 +1,13 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Ortak anahtarları yönetme</title>
+<title>Alıcıların PGP anahtarlarını yönetme</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Anahtar Yönetimi">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="S/MIME anahtarlarınızı yönetme">
-<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Guard Ayarları">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Kendi PGP anahtarlarınızı yönetme">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="S/MIME anahtarlarınızı yönetme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Sonraki</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Sonraki</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,55 +33,36 @@
 <span class="phrase">Guard</span> ile Veri Åžifreleme</h1>
 <h2 class="sr-only">Anahtar Yönetimi</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.pgppublickeys">
-<div class="titlepage"><div><div><h3 class="title">Ortak anahtarları yönetme</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys"><span class="phrase"><span class="guilabel"><strong>Guard güvenlik ayarları</strong></span></span> sayfasında şunları yapabilirsiniz:</p>
+<div class="titlepage"><div><div><h3 class="title">Alıcıların PGP anahtarlarını yönetme</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.8.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">Aşağıdaki seçenekler mevcuttur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">ortak anahtarları görüntüleme</p></li>
+<li class="listitem"><p role="presentation">ortak anahtarları görme ve silme</p></li>
 <li class="listitem"><p role="presentation">ortak anahtar yükleme</p></li>
-<li class="listitem"><p role="presentation">kendi ortak anahtarınızı silme</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.guard.pgppublickeys">
-<p class="title">Anahtar yönetim işlevlerini kullanma:</p>
+<p class="title">Alıcıların PGP anahtarlarını görmek için:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
-<p role="presentation">Ayrıca uygulama başlatıcıdaki <span class="guibutton"><strong>Ayarlar</strong></span>'a da tıklayabilirsiniz.</p>
-<p role="presentation"><span class="guilabel"><strong>Ayarlar</strong></span> penceresi açılır.</p>
+<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
+<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>Alıcı PGP anahtarları</strong></span>'na tıklayın.</p>
+<p role="presentation">Alıcıların ortak PGP anahtarları görüntülenecektir.</p>
 </li>
 <li class="step">
-<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın.</p>
-<p role="presentation"><span class="phrase"><span class="guilabel"><strong>Guard güvenlik ayarları</strong></span></span> sayfası açıklacaktır.</p>
-</li>
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>Gelişmiş ayarları göster</strong></span>'i etkinleştirin.</p>
-<p role="presentation">Anahtar yönetim işlevleri görüntülenecektir.</p>
+<p role="presentation">Bir anahtarın ayrıntılarını görmek isterseniz anahtar kimliğine tıklayın.</p>
+<p role="presentation">Bir anahtarı silmek isterseniz anahtarın yanındaki <span class="guibutton"><strong>Sil</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> tıklayın.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.display">
-<p class="title">Ortak anahtarları görme:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
+<p class="title">Bir alıcının ortak anahtarını yüklemek için:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation"><span class="guibutton"><strong>Alıcıların ortak anahtarları</strong></span>'na tıklayın. <span class="guilabel"><strong>Ortak anahtarlar</strong></span> penceresi açılır.</p>
-<p role="presentation">Paylaşığınız veya diğer kullanıcıların paylaştığı ortak anahtarlar görüntülenir. Bu listede bir kullanıcının ortak anahtarı varsa o kullanıcıya şifrelenmiş e-posta gönderebilir ve o kullanıcının size gönderdiği imzalanmış e-postaları doğrulayabilirsiniz.</p>
-</li>
-<li class="step">
-<p role="presentation">Bir anahtarın ayrıntılarını görmek için anahtarın yanındaki <span class="guibutton"><strong>Ayrıntılar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> tıklayın. <span class="guilabel"><strong>Ortak anahtar ayrıntıları</strong></span> penceresi açılır.</p>
-<p role="presentation"><span class="guibutton"><strong>Anahtarı paylaş</strong></span>'ı işaretleyerek ortak anahtarları paylaşabilirsiniz. Diğer kullanıcılar, paylaşılan anahtarlarınızı görebilir ve indirebilir. Ortak anahtarları yalnızca groupware kullanıcıları kullanabilir.</p>
+<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
+<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>Alıcı PGP anahtarları</strong></span>'na tıklayın.</p>
 </li>
+<li class="step"><p role="presentation"><span class="guibutton"><strong>Alıcı anahtarı yükle</strong></span>'ye tıklayın. Ortak anahtar içeren bir dosya seçin.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
-<p class="title"><span class="guilabel"><strong>Ortak anahtarlar</strong></span> penceresinde bir alıcının ortak anahtarını yükleme:</p>
-<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation"> <span class="guilabel"><strong>PGP Ortak Anahtar Listesi</strong></span>'nin yanındaki <span class="guibutton"><strong>Ekle</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.upload.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> tıklayın. Ortak anahtar içeren bir dosya seçin.</p></li></ul></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.delete">
-<p class="title">Ortak <span class="guilabel"><strong>anahtarlar</strong></span> penceresinde bir ortak anahtarı silme:</p>
-<div class="procedure"><ul class="procedure"><li class="step">
-<p role="presentation">Ortak bir anahtarın yanındaki <span class="guibutton"><strong>Sil</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> tıklayın.</p>
-<p role="presentation">Ortak anahtarı silmek istediğinizi onaylayın.</p>
-</li></ul></div>
-</div>
 <p id="ox.appsuite.user.related.guard.keys.pgppublickeys"></p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.smimepublickeys.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
new file mode 100644
index 000000000..9321cfc51
--- /dev/null
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
@@ -0,0 +1,76 @@
+<html lang="tr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Alıcıların S/MIME anahtarlarını yönetme</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Kullanım Kılavuzu">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Anahtar Yönetimi">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="S/MIME anahtarlarınızı yönetme">
+<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="GuardAyarları">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Geri</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">Sonraki</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+<span class="phrase">Guard</span> ile Veri Åžifreleme</h1>
+<h2 class="sr-only">Anahtar Yönetimi</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.keys.smimepublickeys">
+<div class="titlepage"><div><div><h3 class="title">Alıcıların S/MIME anahtarlarını yönetme</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.10.2"></a><p id="ox.appsuite.user.concept.guard.keys.smimepublickeys">Aşağıdaki seçenekler mevcuttur:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">ortak anahtarları görüntüleme</p></li>
+<li class="listitem"><p role="presentation">ortak anahtar yükleme</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.smimepublickeys">
+<p class="title">Bir alıcının S/MIME anahtarını görmek için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
+<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>S/MIME alıcıları</strong></span>'na tıklayın.</p>
+</li>
+<li class="step">
+<p role="presentation"><span class="guibutton"><strong>Sertifika ara</strong></span>'ya bir e-posta adresi yazın. <span class="guibutton"><strong>Ara</strong></span>'ya tıklayın.</p>
+<p role="presentation">Bir sertifika bulunursa sertifika bilgileri görüntülenecektir.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.guard.keys.smimepublickeys.upload">
+<p class="title">Bir alıcının ortak anahtarını yüklemek için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
+<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>S/MIME alıcıları</strong></span>'na tıklayın.</p>
+</li>
+<li class="step"><p role="presentation"><span class="guibutton"><strong>Alıcı sertifikası yükle</strong></span>'ye tıklayın. Ortak anahtar içeren bir dosya seçin.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.keys.smimepublickeys"></p>
+<p class="title">İlgili konular:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Kendi PGP anahtarlarınızı yönetme</a></p>
+<p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">S/MIME anahtarlarınızı yönetme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a></p>
+</li></ul>
+<p id="ox.appsuite.user.parent.guard.keys.smimepublickeys">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
index 0a5b29f0e..ee0c16c14 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Anahtar Yönetimi">
 <link rel="prev" href="ox.appsuite.user.sect.guard.keys.html" title="Anahtar Yönetimi">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="S/MIME anahtarlarınızı yönetme">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Alıcıların PGP anahtarlarını yönetme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Sonraki</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Sonraki</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,129 +34,103 @@
 <h2 class="sr-only">Anahtar Yönetimi</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yourpgpkeys">
 <div class="titlepage"><div><div><h3 class="title">Kendi PGP anahtarlarınızı yönetme</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.5.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys"><span class="phrase"><span class="guilabel"><strong>Guard güvenlik ayarları</strong></span></span>    sayfasında şunları yapabilirsiniz:</p>
+<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">Aşağıdaki seçenekler mevcuttur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">yeni PGP anahtarları ekleme</p></li>
 <li class="listitem"><p role="presentation">kendi PGP anahtarlarınızı gösterme, ayrıntıları gösterme</p></li>
-<li class="listitem">
-<p role="presentation">yeni PGP anahtarları ekleme</p>
-<p role="presentation">Birden fazla anahtarınız varsa hangisinin geçerli anahtar olacağını belirleyebilirsiniz. Verileriniz şifrelemek için geçerli anahtar kullanılır.</p>
-</li>
-<li class="listitem">
-<p role="presentation">kullanıcı kimliği ekleme</p>
-<p role="presentation">Bir anahtara ek kullanıcı kimlikleri eklediğinizde, o anahtarı birden çok e-posta hesabı için kullanabilirsiniz.</p>
-</li>
-<li class="listitem"><p role="presentation">anahtarları indirme</p></li>
-<li class="listitem"><p role="presentation">anahtarları silme</p></li>
+<li class="listitem"><p role="presentation">kendi PGP anahtarlarınızı yönetme: geçerli yapma, kimlikleri düzenleme, iptal etme, indirme, silme</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys">
-<p class="title">PGP anahtar yönetim işlevlerini kullanma:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.add">
+<p class="title">Yeni bir PGP anahtarı eklemek için:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
-<p role="presentation">Ayrıca uygulama başlatıcıdaki <span class="guibutton"><strong>Ayarlar</strong></span>'a da tıklayabilirsiniz.</p>
-<p role="presentation"><span class="guilabel"><strong>Ayarlar</strong></span> penceresi açılır.</p>
+<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.addkey"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
+<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>PGP anahtarlarınız</strong></span>'a tıklayın.</p>
 </li>
 <li class="step">
-<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın.</p>
-<p role="presentation"><span class="phrase"><span class="guilabel"><strong>Guard güvenlik ayarları</strong></span></span> sayfası açıklacaktır.</p>
+<p role="presentation">Aşağıdaki seçenekleri kullanabilirsiniz:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">Yeni bir anahtar çifti oluşturmak için <span class="guibutton"><strong>Yeni oluştur</strong></span>'a tıklayın. <span class="phrase"><span class="guilabel"><strong>GuardSecurity güvenlik anahtarlarını oluştur</strong></span></span> penceresi açılır.</p>
+<p role="presentation">Yeni anahtar için bir parola girin. Parolayı onaylayın.</p>
+<p role="presentation">Yeni anahtar, bir ana anahtar ve ona karşılık gelen bir alt anahtardan oluşur.</p>
 </li>
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>Gelişmiş ayarları göster</strong></span>'i etkinleştirin.</p>
-<p role="presentation">Anahtar yönetim işlevleri görüntülenecektir.</p>
+<li class="listitem">
+<p role="presentation">Mevcut bir özel anahtar eklemek için <span class="guibutton"><strong>Özel anahtarı yükle</strong></span>'ye tıklayın. Özel anahtar içeren bir dosya seçin. <span class="guilabel"><strong>Özel anahtarları yükle</strong></span> penceresi açılır.</p>
+<p role="presentation">Yeni anahtarı yüklemek için <span class="phrase">Guard</span> güvenlik parolanızı girin. Yeni anahtar için yeni bir parola girin.</p>
+</li>
+<li class="listitem"><p role="presentation">Mevcut bir ortak anahtar eklemek için <span class="guibutton"><strong>Ortak anahtarı yükle</strong></span>'ye tıklayın. Ortak anahtar içeren bir dosya seçin.</p></li>
+</ul></p>
+<p role="presentation">Yeni anahtar, anahtar listenizin en başına eklenir. Yeni anahtar geçerli anahtar olarak ayarlanır.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.display">
-<p class="title">Kendi PGP anahtarlarınızı görüntüleme ve bir PGP anahtarını geçerli anahtar yapma:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.display">
+<p class="title">Mevcut PGP anahtarlarınızı görmek için:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation"><span class="guibutton"><strong>Anahtarlar</strong></span> altındaki <span class="guilabel"><strong>Anahtarlarınız</strong></span>'a tıklayın.</p>
-<p role="presentation" class="cap-smime">Yapılandırmaya bağlı olarak, <span class="guilabel"><strong>Değiştirilecek anahtar türünü seçin</strong></span> penceresi açılır. <span class="guibutton"><strong>PGP</strong></span>'yi seçin.</p>
-<p role="presentation"><span class="guilabel"><strong>Anahtarlarınız</strong></span> penceresi açılır.</p>
-<p role="presentation"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">PGP anahtarlarınız görüntülenecektir. Her PGP anahtarı, bir ana anahtar ve bir alt anahtardan oluşur.<ul class="itemizedlist" style="list-style-type: circle; ">
+<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
+<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>PGP anahtarlarınız</strong></span>'a tıklayın.</p>
+<p role="presentation">PGP anahtarlarınız görüntülenecektir.<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Her PGP anahtarı, bir ana anahtar ve bir alt anahtardan oluşur.<ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Ana anahtar e-postalarınızı imzalamanın yanı sıra başka görevler için de kullanılır.</p></li>
 <li class="listitem"><p role="presentation">Alt anahtar, verileri şifrelemek ve şifrelerini çözmek için kullanılacaktır.</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">Gereksinime bağlı olarak, <span class="phrase">Guard</span> otomatik olarak ana anahtarı veya alt anahtarı kullanır.</p></li>
 </ul></p>
 </li>
-<li class="step"><p role="presentation">Anahtar listenizde birden fazla anahtar varsa geçerli anahtarı tanımlayabilirsiniz. Bunun için ana anahtarın yanındaki <span class="guibutton"><strong>Geçerli</strong></span> kutusunu işaretleyin. Bundan sonra şifreleme için geçerli anahtarınız kullanılacaktır.</p></li>
-<li class="step"><p role="presentation">Bir anahtarın ayrıntılarını görmek için anahtarın yanındaki <span class="guibutton"><strong>Ayrıntılar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> tıklayın. <span class="guilabel"><strong>Anahtar ayrıntıları</strong></span> penceresi açılır. Anahtarın imzaları görmek için <span class="guibutton"><strong>İmzalar</strong></span>'a tıklayın.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addkey">
-<p class="title"><span class="guilabel"><strong>Anahtarlarınız</strong></span> penceresine yeni bir PGP anahtarı ekleme:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to <span class="guibutton"><strong>Anahtar listeniz</strong></span>'in yanındaki <span class="guibutton"><strong>Kullanıcı anahtarı ekle</strong></span> simgesine tıklayın. <span class="guilabel"><strong>Anahtar ekleme</strong></span> penceresi açılır.</p></li>
 <li class="step">
-<p role="presentation">Aşağıdaki seçenekleri kullanabilirsiniz:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-<p role="presentation">Özel bir anahtar eklemek için <span class="guibutton"><strong>Özel anahtarı yükle</strong></span>'ye tıklayın. Özel anahtar içeren bir dosya seçin. <span class="guilabel"><strong>Özel anahtarları yükle</strong></span> penceresi açılır.</p>
-<p role="presentation">Yeni anahtarı yüklemek için <span class="phrase">Guard</span> güvenlik parolanızı girin. Yeni anahtar için yeni bir parola girin.</p>
-</li>
-<li class="listitem"><p role="presentation">Ortak bir anahtar eklemek için <span class="guibutton"><strong>Yalnızca ortak anahtar yükle</strong></span>'ye tıklayın. Ortak anahtar içeren bir dosya seçin.</p></li>
-<li class="listitem">
-<p role="presentation">Yeni bir anahtar çifti oluşturmak için <span class="guibutton"><strong>Yeni anahtarlar oluştur</strong></span>'a tıklayın. <span class="phrase"><span class="guilabel"><strong>GuardSecurity güvenlik anahtarlarını oluştur</strong></span></span> penceresi açılır.</p>
-<p role="presentation">Yeni anahtar için bir parola girin. Parolayı onaylayın.</p>
-<p role="presentation">Yeni anahtar, bir ana anahtar ve ona karşılık gelen bir alt anahtardan oluşur.</p>
-</li>
-</ul></p>
-<p role="presentation">Yeni anahtar, anahtar listenizin en başına eklenir. Yeni anahtar geçerli anahtar olarak ayarlanır.</p>
+<p role="presentation">Bir anahtarın ayrıntılarını görmek için ana anahtarın yanındaki <span class="guibutton"><strong>Anahtarları yönet</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> tıklayın. <span class="guilabel"><strong>Anahtar ayrıntıları</strong></span> penceresi açılır.</p>
+<p role="presentation">Anahtarın imzaları görmek için <span class="guibutton"><strong>İmzalar</strong></span>'a tıklayın.</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addaccount">
-<p class="title"><span class="guilabel"><strong>Anahtarlarınız</strong></span> penceresine yeni bir kullanıcı kimliği ekleme:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.manage">
+<p class="title">Mevcut PGP anahtarlarınızı yönetmek için:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Bir anahtarın yanındaki <span class="guibutton"><strong>Kimlikleri düzenle</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addaccount.edit"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> tıklayın. <span class="guilabel"><strong>Kullanıcı kimliği ekle</strong></span> penceresi açılır.</p></li>
 <li class="step">
+<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
+<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>PGP anahtarlarınız</strong></span>'a tıklayın.</p>
+<p role="presentation">PGP anahtarlarınız görüntülenecektir.</p>
+</li>
+<li class="step"><p role="presentation">Bir ana anahtarın yanındaki <span class="guibutton"><strong>Anahtarları yönet</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> tıklayın. Aşağıdaki işlevleri kullanın.<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Anahtar listenizde birden fazla anahtar varsa geçerli anahtarı tanımlayabilirsiniz. Bunun için <span class="guibutton"><strong>Geçerli olarak işaretle</strong></span>'ye tıklayın. Bundan sonra şifreleme için geçerli anahtarınız kullanılacaktır.</p></li>
+<li class="listitem">
+<p role="presentation">Anahtarı başka bir e-posta hesabında kullanmak istiyorsanız <span class="guibutton"><strong>Kimlikleri düzenle</strong></span>'ye tıklayın. <span class="guilabel"><strong>Kullanıcı kimliği ekle</strong></span> penceresi açılır.</p>
 <p role="presentation">Kullanıcı kimliği için bir ad girin. Bu anahtar için kullanmak istediğiniz e-posta adresini girin.</p>
 <p role="presentation">Bu anahtar için parolanızı girin.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.download">
-<p class="title"><span class="guilabel"><strong>Anahtarlarınız</strong></span> penceresinde bir anahtarı indirme:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Bir anahtarın yanındaki <span class="guibutton"><strong>İndir</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> tıklayın.</p></li>
-<li class="step">
+<li class="listitem">
+<p role="presentation">Bir özel anahtarı indirmek isterseniz <span class="guibutton"><strong>İndir</strong></span>'e tıklayın.</p>
 <p role="presentation">Yalnızca özel anahtarınızı mı, ortak anahtarınızı mı yoksa her iki anahtarı da mı indirmek istediğinizi seçin.</p>
 <p role="presentation"><span class="phrase"><strong>Dikkat:</strong></span> Özel anahtarınız şifrelenmiş biçimde indirilecektir. Ancak özel anahtarınızı başkalarının ulaşabileceği bir sisteme indirmemelisiniz.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.delete">
-<p class="title"><span class="guilabel"><strong>Anahtarlarınız</strong></span> penceresinde bir anahtarı silme:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Uyarı:</strong></span> Bir özel anahtarı silerseniz, artık o anahtarla şifrelenmiş nesnelerin şifresini çözemezsiniz. Emin değilseniz anahtarı silmeden iptal etmelisiniz. İptal edilen anahtarlar artık şifreleme için kullanılamaz. Ama o anahtarla şifrelenmiş nesnelerin şifresini hâlâ çözebilir.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Bir anahtarın yanındaki <span class="guibutton"><strong>Sil</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> tıklayın. <span class="guilabel"><strong>Özel anahtarı sil</strong></span> penceresi açılır.</p></li>
-<li class="step"><p role="presentation">Aşağıdaki seçenekleri kullanabilirsiniz:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Bir özel anahtarı iptal etmek veya silmek isterseniz <span class="guibutton"><strong>Sil</strong></span>'e tıklayın. <span class="guilabel"><strong>Özel anahtarı sil</strong></span> penceresi açılır. Notlar:<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Bir anahtarı iptal ederseniz o anahtar artık kullanılmaz. Ama o anahtarla şifrelenmiş nesnelerin şifresini hâlâ çözebilir. Bu nedenle, anahtarları silmek yerine iptal etmenizi öneririz.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Uyarı:</strong></span> Bir özel anahtarı silerseniz, artık o anahtarla şifrelenmiş nesnelerin şifresini çözemezsiniz.</p></li>
+</ul> <p role="presentation">Aşağıdaki seçenekleri kullanabilirsiniz:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">Bir özel anahtarı iptal etmek için <span class="guibutton"><strong>İptal et</strong></span>'e tıklayın.</p>
-<p role="presentation">Bir anahtarı iptal ederseniz o anahtar artık kullanılmaz. Ama o anahtarla şifrelenmiş nesnelerin şifresini hâlâ çözebilir. Bu nedenle, anahtarları silmek yerine iptal etmenizi öneririz.</p>
 <p role="presentation">Özel anahtarın parolasını girin. Gerekirse, anahtarı iptal etme nedeninizi seçin.</p>
 <p role="presentation"><span class="guibutton"><strong>İptal et</strong></span>'e tıklayın.</p>
+<p role="presentation">Ayrıca menüdeki <span class="guibutton"><strong>İptal et</strong></span>'e de tıklayabilirsiniz.</p>
 </li>
 <li class="listitem">
 <p role="presentation">Bir özel anahtarı silmek için <span class="guibutton"><strong>Sil</strong></span>'e tıklayın.</p>
-<p role="presentation"><span class="phrase"><strong>Uyarı:</strong></span> Bir özel anahtarı silerseniz, artık o anahtarla şifrelenmiş nesnelerin şifresini çözemezsiniz.</p>
 <p role="presentation">Özel anahtarın parolasını girin.</p>
 <p role="presentation"><span class="guibutton"><strong>Sil</strong></span> düğmesine tıklayın.</p>
 </li>
 </ul>Bir ana anahtarı sildiğinizde ona karşılık gelen alt anahtar da silinir.</p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yourpgpkeys"></p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Ortak anahtarları yönetme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Alıcıların PGP anahtarlarını yönetme</a></p>
 <p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">S/MIME anahtarlarınızı yönetme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.keys.yourpgpkeys">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yourpgpkeys">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
index 7a4e0f937..317afe3fb 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Anahtar Yönetimi">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="Kendi PGP anahtarlarınızı yönetme">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Ortak anahtarları yönetme">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Alıcıların PGP anahtarlarını yönetme">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Alıcıların S/MIME anahtarlarını yönetme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Sonraki</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Sonraki</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -34,46 +34,27 @@
 <h2 class="sr-only">Anahtar Yönetimi</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yoursmimekeys">
 <div class="titlepage"><div><div><h3 class="title">S/MIME anahtarlarınızı yönetme</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.6.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys"><span class="phrase"><span class="guilabel"><strong>Guard güvenlik ayarları</strong></span></span>    sayfasında şunları yapabilirsiniz:</p>
+<a class="indexterm" name="id-1.14.13.9.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">Aşağıdaki seçenekler mevcuttur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">yeni S/MIME anahtarı ekleme</p>
 <p role="presentation">Birden fazla anahtarınız varsa hangisinin geçerli anahtar olacağını belirleyebilirsiniz. Verileriniz şifrelemek için geçerli anahtar kullanılır.</p>
 </li>
 <li class="listitem"><p role="presentation">S/MIME anahtarlarınızı görüntüleme, ayrıntıları görüntüleme</p></li>
-<li class="listitem"><p role="presentation">anahtarları indirme</p></li>
-<li class="listitem"><p role="presentation">anahtarları silme</p></li>
+<li class="listitem"><p role="presentation">kendi S/MIME anahtarlarınızı yönetme: geçerli yapma, kimlikleri düzenleme, iptal etme, indirme, silme</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys">
-<p class="title">S/MIME anahtar yönetim işlevlerini kullanma:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.add">
+<p class="title">Yeni S/MIME anahtarı ekleme:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
-<p role="presentation">Ayrıca uygulama başlatıcıdaki <span class="guibutton"><strong>Ayarlar</strong></span>'a da tıklayabilirsiniz.</p>
-<p role="presentation"><span class="guilabel"><strong>Ayarlar</strong></span> penceresi açılır.</p>
-</li>
-<li class="step">
-<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın.</p>
-<p role="presentation"><span class="phrase"><span class="guilabel"><strong>Guard güvenlik ayarları</strong></span></span> sayfası açıklacaktır.</p>
-</li>
-<li class="step">
+<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>S/MIME</strong></span>'a tıklayın.</p>
 <p role="presentation"><span class="guibutton"><strong>S/MIME'ı etkinleştir</strong></span>'i işaretleyin.</p>
-<p role="presentation"><span class="guibutton"><strong>Gelişmiş ayarları göster</strong></span>'i etkinleştirin.</p>
-<p role="presentation">Anahtar yönetim işlevleri görüntülenecektir.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.addkey">
-<p class="title">Yeni S/MIME anahtarı ekleme:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>Anahtarlar</strong></span> altındaki <span class="guibutton"><strong>Anahtarlarınız</strong></span>'a tıklayın. <span class="guilabel"><strong>Değiştirilecek anahtar türlerini seçin</strong></span> penceresi açılır.</p>
-<p role="presentation"><span class="guibutton"><strong>S/MIME</strong></span>'ı seçin. <span class="guilabel"><strong>Sertifikalarınız</strong></span> penceresi açılır.</p>
 </li>
-<li class="step"><p role="presentation"><span class="guilabel"><strong>Anahtar listeniz</strong></span>'in yanındaki. <span class="guibutton"><strong>Ekle</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> tıklayın. <span class="guilabel"><strong>S/MIME anahtarı yükle</strong></span> penceresi açılır.</p></li>
 <li class="step">
+<p role="presentation"><span class="guibutton"><strong>Özel sertifika yükle</strong></span>'ye tıklayın. <span class="guilabel"><strong>S/MIME anahtarlarını yükle</strong></span> penceresi açılır.</p>
 <p role="presentation">Aşağıdaki parolaları girin:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Yeni anahtarı yüklemek için <span class="phrase">Guard</span> güvenlik parolanızı girin. Yeni anahtar için yeni bir parola girin.</p></li>
+<li class="listitem"><p role="presentation">Yeni anahtarı yüklemek için <span class="phrase">Guard</span> güvenlik parolanız.</p></li>
 <li class="listitem">
 <p role="presentation">E-postaları şifrelemek için yeni bir parola.</p>
 <p role="presentation">Yeni parolayı onaylayın.</p>
@@ -85,58 +66,61 @@
 </ol></div>
 </div>
 <div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.display">
-<p class="title">Kendi S/MIME anahtarlarınızı görüntüleme ve bir S/MIME anahtarını geçerli anahtar yapma:</p>
+<p class="title">Kendi S/MIME anahtarlarınızı görmek için:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation"><span class="guibutton"><strong>Anahtarlar</strong></span> altındaki <span class="guilabel"><strong>Anahtarlarınız</strong></span>'a tıklayın. <span class="guilabel"><strong>Değiştirilecek anahtar türlerini seçin</strong></span> penceresi açılır.</p>
-<p role="presentation"><span class="guibutton"><strong>S/MIME</strong></span>'ı seçin.</p>
-<p role="presentation"><span class="guilabel"><strong>Sertifikalarınız</strong></span> penceresi açılır. S/MIME anahtarlarınız görüntülenecektir.</p>
+<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
+<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>S/MIME</strong></span>'a tıklayın.</p>
+<p role="presentation"><span class="guibutton"><strong>S/MIME'ı etkinleştir</strong></span>'i işaretleyin.</p>
+</li>
+<li class="step">
+<p role="presentation">Bir anahtarın ayrıntılarını görmek için anahtarın yanındaki <span class="guibutton"><strong>Anahtarları yönet</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> tıklayın. <span class="guilabel"><strong>Anahtar ayrıntıları</strong></span> penceresi açılır.</p>
+<p role="presentation">Anahtarın imzaları görmek için <span class="guibutton"><strong>İmzalar</strong></span>'a tıklayın.</p>
 </li>
-<li class="step"><p role="presentation">Anahtar listenizde birden fazla anahtar varsa geçerli anahtarı tanımlayabilirsiniz. Bunun için ana anahtarın yanındaki <span class="guibutton"><strong>Geçerli</strong></span> kutusunu işaretleyin. Bundan sonra şifreleme için geçerli anahtarınız kullanılacaktır.</p></li>
-<li class="step"><p role="presentation">Bir anahtarın ayrıntılarını görmek için anahtarın yanındaki <span class="guibutton"><strong>Ayrıntılar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span> tıklayın. <span class="guilabel"><strong>Anahtar ayrıntıları</strong></span> penceresi açılır. Anahtarın imzaları görmek için <span class="guibutton"><strong>İmzalar</strong></span>'a tıklayın.</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.download">
-<p class="title"><span class="guilabel"><strong>Anahtarlarınız</strong></span> penceresinde bir anahtarı indirme:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.manage">
+<p class="title">Mevcut S/MIME anahtarlarınızı yönetmek için:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Bir anahtarın yanındaki <span class="guibutton"><strong>İndir</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span> tıklayın.</p></li>
 <li class="step">
+<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
+<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>S/MIME</strong></span>'a tıklayın.</p>
+<p role="presentation"><span class="guibutton"><strong>S/MIME'ı etkinleştir</strong></span>'i işaretleyin.</p>
+</li>
+<li class="step"><p role="presentation">Bir anahtarın yanındaki <span class="guibutton"><strong>Anahtarları yönet</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> tıklayın. Aşağıdaki işlevleri kullanın.<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Anahtar listenizde birden fazla anahtar varsa geçerli anahtarı tanımlayabilirsiniz. Bunun için <span class="guibutton"><strong>Geçerli olarak işaretle</strong></span>'ye tıklayın. Bundan sonra şifreleme için geçerli anahtarınız kullanılacaktır.</p></li>
+<li class="listitem">
+<p role="presentation">Bir özel anahtarı indirmek isterseniz <span class="guibutton"><strong>İndir</strong></span>'e tıklayın.</p>
 <p role="presentation">Yalnızca özel anahtarınızı mı, ortak anahtarınızı mı yoksa her iki anahtarı da mı indirmek istediğinizi seçin.</p>
 <p role="presentation"><span class="phrase"><strong>Dikkat:</strong></span> Özel anahtarınız şifrelenmiş biçimde indirilecektir. Ancak özel anahtarınızı başkalarının ulaşabileceği bir sisteme indirmemelisiniz.</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.delete">
-<p class="title"><span class="guilabel"><strong>Anahtarlarınız</strong></span> penceresinde bir anahtarı silme:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Uyarı:</strong></span> Bir özel anahtarı silerseniz, artık o anahtarla şifrelenmiş nesnelerin şifresini çözemezsiniz. Emin değilseniz anahtarı silmeden iptal etmelisiniz. İptal edilen anahtarlar artık şifreleme için kullanılamaz. Ama o anahtarla şifrelenmiş nesnelerin şifresini hâlâ çözebilir.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Bir anahtarın yanındaki <span class="guibutton"><strong>Sil</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> tıklayın. <span class="guilabel"><strong>Özel anahtarı sil</strong></span> penceresi açılır.</p></li>
-<li class="step"><p role="presentation">Aşağıdaki seçenekleri kullanabilirsiniz:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Bir özel anahtarı iptal etmek veya silmek isterseniz <span class="guibutton"><strong>Sil</strong></span>'e tıklayın. <span class="guilabel"><strong>Özel anahtarı sil</strong></span> penceresi açılır. Notlar:<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Bir anahtarı iptal ederseniz o anahtar artık kullanılmaz. Ama o anahtarla şifrelenmiş nesnelerin şifresini hâlâ çözebilir. Bu nedenle, anahtarları silmek yerine iptal etmenizi öneririz.</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>Uyarı:</strong></span> Bir özel anahtarı silerseniz, artık o anahtarla şifrelenmiş nesnelerin şifresini çözemezsiniz.</p></li>
+</ul> <p role="presentation">Aşağıdaki seçenekleri kullanabilirsiniz:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">Bir özel anahtarı iptal etmek için <span class="guibutton"><strong>İptal et</strong></span>'e tıklayın.</p>
-<p role="presentation">Bir anahtarı iptal ederseniz o anahtar artık kullanılmaz. Ama o anahtarla şifrelenmiş nesnelerin şifresini hâlâ çözebilir. Bu nedenle, anahtarları silmek yerine iptal etmenizi öneririz.</p>
 <p role="presentation">Özel anahtarın parolasını girin. Gerekirse, anahtarı iptal etme nedeninizi seçin.</p>
 <p role="presentation"><span class="guibutton"><strong>İptal et</strong></span>'e tıklayın.</p>
+<p role="presentation">Ayrıca menüdeki <span class="guibutton"><strong>İptal et</strong></span>'e de tıklayabilirsiniz.</p>
 </li>
 <li class="listitem">
 <p role="presentation">Bir özel anahtarı silmek için <span class="guibutton"><strong>Sil</strong></span>'e tıklayın.</p>
-<p role="presentation"><span class="phrase"><strong>Uyarı:</strong></span> Bir özel anahtarı silerseniz, artık o anahtarla şifrelenmiş nesnelerin şifresini çözemezsiniz.</p>
 <p role="presentation">Özel anahtarın parolasını girin.</p>
 <p role="presentation"><span class="guibutton"><strong>Sil</strong></span> düğmesine tıklayın.</p>
 </li>
 </ul></p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yoursmimekeys"></p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Kendi PGP anahtarlarınızı yönetme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Ortak anahtarları yönetme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Alıcıların PGP anahtarlarını yönetme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.keys.yoursmimekeys">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yoursmimekeys">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.change.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.change.html
new file mode 100644
index 000000000..290e8c9a5
--- /dev/null
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.change.html
@@ -0,0 +1,66 @@
+<html lang="tr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Parola deÄŸiÅŸtirme</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Kullanım Kılavuzu">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Parola Yönetimi">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="Parola Yönetimi">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.reset.html" title="parolayı sıfırlama">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">Geri</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.reset.html">Sonraki</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+<span class="phrase">Guard</span> ile Veri Åžifreleme</h1>
+<h2 class="sr-only">Parola Yönetimi</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.change">
+<div class="titlepage"><div><div><h3 class="title">Parola deÄŸiÅŸtirme</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.6.2"></a><a class="indexterm" name="id-1.14.12.6.3"></a><p role="presentation" class="cap-smime">Yapılandırmaya bağlı olarak şifreleme için PGP yerine S/MIME kullanabilirsiniz. PGP ve S/MIME için ayrı parolalar kullanılacaktır.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.change">
+<p class="title"><span class="phrase">Guard</span> parolasını değiştirme:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.change"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
+<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>Parola Yönetimi (PGP)</strong></span><span class="cap-smime"> veya <span class="guibutton"><strong>Parola Yönetimi (S/MIME)</strong></span></span>'a tıklayın.</p>
+</li>
+<li class="step">
+<p role="presentation"><span class="guibutton"><strong>Eski parola</strong></span> alanına, verilerinizi şifrelerken kullandığınız eski parolayı yazın.</p>
+<p role="presentation"><span class="guibutton"><strong>Yeni parola</strong></span> alanına, bundan sonra verilerinizi şifrelerken kullanmak istediğiniz parolayı yazın.</p>
+<p role="presentation"><span class="guibutton"><strong>Yeni parolayı onaylayın</strong></span> alanına yeni parolayı tekrar yazın.</p>
+</li>
+<li class="step"><p role="presentation"><span class="guibutton"><strong>Parolayı değiştir</strong></span>'e tıklayın.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.change"></p>
+<p class="title">İlgili konular:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">parolayı sıfırlama</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Parola sıfırlama işlevini kaldırma</a></p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.password.change">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.deleterecovery.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.deleterecovery.html
new file mode 100644
index 000000000..a9ab434e4
--- /dev/null
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.deleterecovery.html
@@ -0,0 +1,65 @@
+<html lang="tr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Parola sıfırlama işlevini kaldırma</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Kullanım Kılavuzu">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Parola Yönetimi">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.reset.html" title="parolayı sıfırlama">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Anahtar Yönetimi">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.reset.html">Geri</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Sonraki</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+<span class="phrase">Guard</span> ile Veri Åžifreleme</h1>
+<h2 class="sr-only">Parola Yönetimi</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.deleterecovery">
+<div class="titlepage"><div><div><h3 class="title">Parola sıfırlama işlevini kaldırma</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.8.2"></a><p id="ox.appsuite.user.concept.guard.password.deleterecovery">Gerekirse parolanızı sıfırlayabilmek için parolanızın şifrelenmiş bir sürümünün sunucuya kaydedilmesi gerekir. Parolanızın sunucuya kaydedilmesini istemiyorsanız parola kurtarmayı silebilirsiniz.</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
+<p class="title">Parola sıfırlama işlevini kaldırma:</p>
+<div class="taskprerequisites">
+          <p><span class="phrase"><strong>Uyarı:</strong></span> Parola sıfırlama işlevini kaldırırsanız artık parolanızı sıfırlayamazsınız. Daha sonra parolanızı unutursanız şifrelenmiş verilerinizin şifresini çözmeniz mümkün olmayacaktır.</p>
+        </div>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.remove"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
+<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>Gelişmiş</strong></span>'e tıklayın.</p>
+</li>
+<li class="step"><p role="presentation"><span class="guibutton"><strong>Sıfırlama seçenekleri</strong></span> altındaki <span class="guibutton"><strong>Parola kurtarmayı sil</strong></span>'e tıklayın. <span class="guilabel"><strong>Kurtarmayı sil</strong></span> penceresi açılır.</p></li>
+<li class="step"><p role="presentation"><span class="guibutton"><strong>Sil</strong></span> düğmesine tıklayın.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.deleterecovery"></p>
+<p class="title">İlgili konular:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Parola deÄŸiÅŸtirme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">parolayı sıfırlama</a></p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.password.deleterecovery">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.html
index 793307f17..2f74f06f9 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Guard ile Veri Åžifreleme">
 <link rel="prev" href="ox.appsuite.user.sect.guard.logout.html" title="Guard'dan Çıkış Yapma">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="Anahtar Yönetimi">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.change.html" title="Parola deÄŸiÅŸtirme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.logout.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">Sonraki</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.change.html">Sonraki</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,95 +33,19 @@
 <span class="phrase">Guard</span> ile Veri Åžifreleme</h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.password">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Parola Yönetimi</h2></div></div></div>
-<a class="indexterm" name="id-1.14.12.2"></a><a class="indexterm" name="id-1.14.12.3"></a><a class="indexterm" name="id-1.14.12.4"></a><a class="indexterm" name="id-1.14.12.5"></a><a class="indexterm" name="id-1.14.12.6"></a><p id="ox.appsuite.user.concept.guard.password">Aşağıdaki seçenekler mevcuttur:</p>
+<a class="indexterm" name="id-1.14.12.2"></a><p id="ox.appsuite.user.concept.guard.password">Aşağıdaki seçenekler mevcuttur:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><span class="phrase">Guard</span> güvenlik parolasını değiştirme</p></li>
-<li class="listitem"><p role="presentation"><span class="phrase">Guard</span> güvenlik parolanızı unutursanız <span class="phrase">Guard</span>  güvenlik parolasını sıfırlamak için geçici bir <span class="phrase">Guard</span> güvenlik parolası talep edebilirsiniz.</p></li>
-<li class="listitem"><p role="presentation">Parola sıfırlamada kullanmak üzere bir e-posta adresi tanımlama.</p></li>
-<li class="listitem"><p role="presentation">Gerekirse parolanızı sıfırlayabilmek için parolanızın şifrelenmiş bir sürümünün sunucuya kaydedilmesi gerekir. Parolanızın sunucuya kaydedilmesini istemiyorsanız parola kurtarmayı silebilirsiniz.</p></li>
-<li class="listitem cap-smime" id="id-1.14.12.7.1.5"><p role="presentation">Yapılandırmaya bağlı olarak şifreleme için PGP yerine S/MIME kullanabilirsiniz. Bu durumda PGP ve S/MIME için ayrı parolalar kullanılacaktır.</p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Parola deÄŸiÅŸtirme</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">parolayı sıfırlama</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Parola sıfırlama işlevini kaldırma</a></p></li>
 </ul>
 <p>Not: Yapılandırmaya bağlı olarak, bu işlevlerin bazıları kullanılamayabilir.</p>
-<div class="task help-hide-inline" id="ox.appsuite.user.task.guard.password">
-<p class="title">Parola yönetim işlevlerini açmak için:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
-<p role="presentation">Ayrıca uygulama başlatıcıdaki <span class="guibutton"><strong>Ayarlar</strong></span>'a da tıklayabilirsiniz.</p>
-<p role="presentation"><span class="guilabel"><strong>Ayarlar</strong></span> penceresi açılır.</p>
-</li>
-<li class="step">
-<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın.</p>
-<p role="presentation"><span class="phrase"><span class="guilabel"><strong>Guard güvenlik ayarları</strong></span></span> sayfası açıklacaktır.</p>
-<p role="presentation">Parola yönetim işlevleri görüntülenecektir.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.change">
-<p class="title"><span class="phrase">Guard</span> parolasını değiştirme:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>Parolayı değiştir</strong></span>'e tıklayın.</p>
-<p role="presentation" class="cap-smime">Yapılandırmaya bağlı olarak, <span class="guilabel"><strong>Değiştirilecek anahtar türünü seçin</strong></span> penceresi açılır. Parolasını sıfırlamak istediğiniz şifreleme türüne bağlı olarak <span class="guibutton"><strong>PGP</strong></span> veya <span class="guibutton"><strong>S/MIME</strong></span>'ı seçin. <span class="guilabel"><strong>Parolayı sıfırla</strong></span> penceresi açılır.</p>
-</li>
-<li class="step">
-<p role="presentation"><span class="phrase"><span class="guibutton"><strong>Şu anki Guard güvenlik parolanızı girin</strong></span></span>alanına, şu ana kadar verilerinizi şifrelemek için kullandığınız parolayı girin.</p>
-<p role="presentation"><span class="phrase"><span class="guibutton"><strong>Yeni Guard güvenlik parolanızı girin</strong></span></span> alanına, bundan sonra verilerinizi şifrelemek için kullanacağınız parolayı girin.</p>
-<p role="presentation"><span class="phrase"><span class="guibutton"><strong>Yeni Guard güvenlik parolanızı onaylayın</strong></span></span> alanına parolayı yeniden girerek onaylayın.</p>
-</li>
-<li class="step"><p role="presentation"><span class="guibutton"><strong>Değiştir</strong></span>'e tıklayın.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.reset">
-<p class="title"><span class="phrase">Guard</span> parolasını sıfırlama:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>Parolayı sıfırla</strong></span>'ya tıklayın.</p>
-<p role="presentation" class="cap-smime">Yapılandırmaya bağlı olarak, <span class="guilabel"><strong>Değiştirilecek anahtar türünü seçin</strong></span> penceresi açılır. Parolasını sıfırlamak istediğiniz şifreleme türüne bağlı olarak <span class="guibutton"><strong>PGP</strong></span> veya <span class="guibutton"><strong>S/MIME</strong></span>'ı seçin. <span class="guilabel"><strong>Parolayı sıfırla</strong></span> penceresi açılır.</p>
-<p role="presentation"><span class="guibutton"><strong>Sıfırla</strong></span>'ya tıklayın.</p>
-</li>
-<li class="step">
-<p role="presentation">İkincil e-posta adresinize yeni bir parola gönderilecektir.</p>
-<p role="presentation">İkincil e-posta adresinizi girmediyseniz yeni parolanız birincil e-posta adresinize gönderilir.</p>
-<p role="presentation">Bu yeni parola artık <span class="phrase">Guard</span> güvenlik parolanızdır. Bu parolayı hemen <a class="link" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.task.guard.settings">değiştirmelisiniz</a>.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.secondarymail">
-<p class="title">Parolayı sıfırlamak için ikincil e-posta adresinizi değiştirme:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>Sıfırlama için e-posta adresini ayarlayın</strong></span>'a tıklayın.</p>
-<p role="presentation" class="cap-smime">Yapılandırmaya bağlı olarak, <span class="guilabel"><strong>Değiştirilecek anahtar türünü seçin</strong></span> penceresi açılır. Parolasını sıfırlamak istediğiniz şifreleme türüne bağlı olarak <span class="guibutton"><strong>PGP</strong></span> veya <span class="guibutton"><strong>S/MIME</strong></span>'ı seçin. <span class="guilabel"><strong>İkincil e-posta adresi</strong></span> penceresi açılır.</p>
-</li>
-<li class="step">
-<p role="presentation"><span class="phrase"><span class="guibutton"><strong>Şu anki Guard güvenlik parolanızı girin</strong></span></span>alanına, şu ana kadar verilerinizi şifrelemek için kullandığınız parolayı girin.</p>
-<p role="presentation"><span class="guibutton"><strong>Yeni ikincil e-posta adresini yazın</strong></span> alanına, <span class="phrase">Guard</span> güvenlik parolanızı sıfırlamak için geçici bir parola almak üzere kullanacağınız e-posta adresini yazın.</p>
-<p role="presentation">E-posta adresinizi <span class="guibutton"><strong>E-posta adresini onaylayın</strong></span> alanına yeniden yazın.</p>
-<p role="presentation"><span class="guibutton"><strong>E-posta adresini değiştir</strong></span>'e tıklayın.</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
-<p class="title">Parola sıfırlama işlevini kaldırma:</p>
-<div class="taskprerequisites">
-        <p><span class="phrase"><strong>Uyarı:</strong></span> Parola sıfırlama işlevini kaldırırsanız artık parolanızı sıfırlayamazsınız. Daha sonra parolanızı unutursanız şifrelenmiş verilerinizin şifresini çözmeniz mümkün olmayacaktır.</p>
-      </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation"><span class="guibutton"><strong>Gelişmiş ayarları göster</strong></span>'i etkinleştirin.</p>
-<p role="presentation"><span class="guibutton"><strong>Parola kurtarmayı sil</strong></span>'e tıklayın. <span class="guilabel"><strong>Kurtarmayı sil</strong></span> penceresi açılır.</p>
-</li>
-<li class="step"><p role="presentation"><span class="guibutton"><strong>Sil</strong></span> düğmesine tıklayın.</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.guard.password"></p>
 <p class="title">İlgili konular:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Kendi PGP anahtarlarınızı yönetme</a></p>
-<p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">S/MIME anahtarlarınızı yönetme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Ortak anahtarları yönetme</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Ayarları</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.guard.password">Ana başlık:<a class="xref" href="ox.appsuite.user.chap.guard.html"><i><span class="phrase">Guard</span> ile Veri Şifreleme</i></a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.reset.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.reset.html
new file mode 100644
index 000000000..9faf2cfbc
--- /dev/null
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.password.reset.html
@@ -0,0 +1,82 @@
+<html lang="tr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>parolayı sıfırlama</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Kullanım Kılavuzu">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="Parola Yönetimi">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.change.html" title="Parola deÄŸiÅŸtirme">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="Parola sıfırlama işlevini kaldırma">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.change.html">Geri</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Sonraki</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">
+<span class="phrase">Guard</span> ile Veri Åžifreleme</h1>
+<h2 class="sr-only">Parola Yönetimi</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.reset">
+<div class="titlepage"><div><div><h3 class="title">parolayı sıfırlama</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.7.2"></a><a class="indexterm" name="id-1.14.12.7.3"></a><p id="ox.appsuite.user.concept.guard.password.reset">Aşağıdaki seçenekler mevcuttur:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><span class="phrase">Guard</span> parolanızı unutursanız <span class="phrase">Guard</span> parolasını sıfırlamak için geçici bir <span class="phrase">Guard</span> parolası talep edebilirsiniz.</p></li>
+<li class="listitem"><p role="presentation">Parolayı sıfırlamak için bir e-posta adresi tanımlayabilirsiniz.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.password.reset">
+<p class="title"><span class="phrase">Guard</span> parolasını sıfırlama:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Menü çubuğundaki <span class="guibutton"><strong>Ayarlar</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.reset"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> tıklayın. <span class="guibutton"><strong>Tüm ayarlar</strong></span>'a tıklayın.</p>
+<p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın. Sağ bölmeden <span class="guibutton"><strong>Parola Yönetimi (PGP)</strong></span><span class="cap-smime"> veya <span class="guibutton"><strong>Parola Yönetimi (S/MIME)</strong></span></span>'a tıklayın.</p>
+</li>
+<li class="step">
+<p role="presentation">Geçici parolanın gönderileceği ikincil bir e-posta adresi ayarlamak için <span class="guibutton"><strong>Sıfırlama için e-posta adresi ayarla</strong></span>'ya tıklayın. <span class="guilabel"><strong>İkincil e-posta adresi</strong></span> penceresi açılır.</p>
+<p role="presentation">Mevcut parolanızı yazın. Parolayı sıfırlarken kullanmak istediğiniz e-posta adresini yazın.</p>
+</li>
+<li class="step">
+<p role="presentation"><span class="guibutton"><strong>Parolayı sıfırla</strong></span>'ya tıklayın. <span class="guilabel"><strong>Parolayı sıfırla</strong></span> penceresi açılır.</p>
+<p role="presentation"><span class="guibutton"><strong>Sıfırla</strong></span>'ya tıklayın.</p>
+</li>
+</ol></div>
+<div class="taskrelated">
+          <p>Sonuç:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">İkincil e-posta adresinize yeni bir parola gönderilecektir.</p>
+<p role="presentation">İkincil e-posta adresinizi girmediyseniz yeni parolanız birincil e-posta adresinize gönderilir.</p>
+</li>
+<li class="listitem"><p role="presentation">Bu yeni parola artık <span class="phrase">Guard</span> güvenlik parolanızdır. Bu parolayı hemen değiştirmelisiniz.</p></li>
+</ul>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.reset"></p>
+<p class="title">İlgili konular:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">Parola deÄŸiÅŸtirme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Parola sıfırlama işlevini kaldırma</a></p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.password.reset">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.settings.html b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.settings.html
index 8e4b92820..d8c12b5ca 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.guard.settings.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.guard.settings.html
@@ -1,12 +1,12 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Guard Ayarları</title>
+<title>GuardAyarları</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="Guard ile Veri Åžifreleme">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Ortak anahtarları yönetme">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="Alıcıların S/MIME anahtarlarını yönetme">
 <link rel="next" href="ox.appsuite.user.index.html" title="Dizin">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.index.html">Sonraki</a></li>
@@ -33,7 +33,7 @@
 <span class="phrase">Guard</span> ile Veri Åžifreleme</h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.settings">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<span class="phrase">Guard</span> Ayarları</h2></div></div></div>
+<span class="phrase">Guard</span>Ayarları</h2></div></div></div>
 <a class="indexterm" name="id-1.14.14.2"></a><a class="indexterm" name="id-1.14.14.3"></a><a class="indexterm" name="id-1.14.14.4"></a><div class="task help-hide-inline" id="ox.appsuite.user.task.guard.settings">
 <p class="title"><span class="phrase">Guard</span> ayarlarını açmak için:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,67 +44,118 @@
 </li>
 <li class="step"><p role="presentation">Sol bölmeden <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>'a tıklayın.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p><span class="phrase"><span class="guilabel"><strong>Guard güvenlik ayarları</strong></span></span> sayfası açıklacaktır.</p>
-      </div>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings">Aşağıdaki ayarlar kullanılabilir:</p>
+<p id="ox.appsuite.user.reference.guard.settings">Yapılandırmaya bağlı olarak aşağıdaki ayarlar kullanılabilir:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.default">Varsayılan <span class="phrase">Guard</span> ayarları</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.pgppasswords">Parola Yönetimi (PGP)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.smimepasswords">Parola Yönetimi (S/MIME)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yourpgpkeys">PGP Anahtarlarınız</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientpgpkeys">Alıcı PGP Anahtarları</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yoursmime">S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientsmime">S/MIME Alıcıları</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.advanced">GeliÅŸmiÅŸ</a></p></li>
+</ul>
+<p>Ayrıca bkz.:<a class="xref" href="ox.appsuite.user.sect.settings.search.html">Ayar Arama</a></p>
 <p id="ox.appsuite.user.reference.guard.settings.default"></p>
-<h3 class="title">Varsayılan ayarlar</h3>
+<h3 class="title">Varsayılan <span class="phrase">Guard</span> ayarları</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.encrypt"><b>E-posta yazarken varsayılan olarak şifreleme yap. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>Yeni e-postaların varsayılan olarak şifrelenip şifrelenmeyeceğini tanımlar.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.sign"><b>Giden e-postalara varsayılan olarak imza ekle. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>Yeni e-postaların varsayılan olarak şifrelenip şifrelenmeyeceğini tanımlar.</p></li>
-<li class="listitem cap-smime" id="id-1.14.14.7.2.1.3">
-<p id="ox.appsuite.user.task.guard.settings.default.smime"><b>İmzalama ve şifreleme için varsayılan olarak S/MIME kullanma. </b><a class="indexterm" name="id-1.14.14.7.2.1.3.1.2"></a></p>
-<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p role="presentation">İmzalama ve şifreleme için varsayılan olarak S/MIME kullanılıp kullanılmayacağını tanımlar.</p></li></ul>
-</li>
 <li class="listitem">
-<p id="ox.appsuite.user.task.guard.settings.default.inline"><b>Yeni e-postalarda varsayılan olarak PGP inline kullan. </b><a class="indexterm" name="id-1.14.14.7.2.1.4.1.2"></a>Not: Bu seçenek yalnızca <span class="guibutton"><strong>Gelişmiş ayarlar</strong></span> onay kutusu işaretlendiğinde kullanılabilir.</p>
+<p id="ox.appsuite.user.reference.guard.settings.default.create"><b>Oluşturma seçenekleri. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">Şifreleme için varsayılan olarak PGP/Inline kullanılıp kullanılmayacağını tanımlar.</p></li>
-<li class="listitem"><p role="presentation">Yalnızca alıcının e-posta istemcisi PGP'yi desteklemiyorsa bu ayarları kullanın. PGP/Inline kullanıldığında alıcı, PGP desteği olmasa da iletinin şifresini çözebilir.</p></li>
-<li class="listitem"><p role="presentation">Bu ayarı kullanırsanız e-postalarınızı HTML biçiminde gönderemezsiniz.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.encrypt"><b>E-posta yazarken varsayılan olarak şifreleme yap. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.1.1.2"></a>Yeni e-postaların varsayılan olarak şifrelenip şifrelenmeyeceğini tanımlar.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.sign"><b>Giden e-postalara varsayılan olarak imza ekle. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.2.1.2"></a>Yeni e-postaların varsayılan olarak şifrelenip şifrelenmeyeceğini tanımlar.</p></li>
+<li class="listitem cap-smime" id="id-1.14.14.7.2.1.1.1.3.1.3">
+<p id="ox.appsuite.user.task.guard.settings.default.create.smime"><b>İmzalama ve şifreleme için varsayılan olarak S/MIME kullanma. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.3.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: square; "><li class="listitem"><p role="presentation">İmzalama ve şifreleme için varsayılan olarak S/MIME kullanılıp kullanılmayacağını tanımlar.</p></li></ul>
+</li>
 </ul>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Varsayılan olarak parolayı hatırla. </b><a class="indexterm" name="id-1.14.14.7.2.1.5.1.2"></a><span class="phrase">Guard</span>'ın parolayı hatırlayacağı zaman aralığını tanımlar. <span class="phrase">Guard</span> arolanız sorulduğunda bu varsayılan değeri değiştirebilirsiniz.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>Varsayılan olarak parolayı hatırla. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a><span class="phrase">Guard</span>'ın parolayı hatırlayacağı zaman aralığını tanımlar. <span class="phrase">Guard</span> arolanız sorulduğunda bu varsayılan değeri değiştirebilirsiniz.</p></li>
 </ul>
-<p id="ox.appsuite.user.reference.guard.settings.password"></p>
-<h3 class="title">Parola yönetimi</h3>
+<p id="ox.appsuite.user.reference.guard.settings.pgppasswords"></p>
+<h3 class="title">Parola Yönetimi (PGP)</h3>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">Parolayı değiştirme ve sıfırlama işlevlerini içerir.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">PGP parolasını değiştirme ve sıfırlama işlevlerini içerir.</p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a></p></li>
 </ul>
-<div id="ox.appsuite.user.reference.guard.settings.smime" class="cap-smime">
-<p id="ox.appsuite.user.reference.guard.settings.smime"></p>
+<div id="ox.appsuite.user.reference.guard.settings.smimepasswords" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.smimepasswords"></p>
+<h3 class="title">Parola Yönetimi (S/MIME)</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">S/MIME parolasını değiştirme ve sıfırlama işlevlerini içerir.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.guard.password.html">Parola Yönetimi</a></p></li>
+</ul>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.yourpgpkeys"></p>
+<h3 class="title">PGP Anahtarlarınız</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">PGP anahtarlarınızı yönetme işlevlerini içerir.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">Kendi PGP anahtarlarınızı yönetme</a></p></li>
+</ul>
+<p id="ox.appsuite.user.reference.guard.settings.recipientpgpkeys"></p>
+<h3 class="title">Alıcı PGP Anahtarları</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">Alıcıların PGP anahtarlarını yönetme işlevlerini içerir.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Alıcıların PGP anahtarlarını yönetme</a></p></li>
+</ul>
+<div id="ox.appsuite.user.reference.guard.settings.yoursmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.yoursmime"></p>
 <h3 class="title">S/MIME</h3>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.smime.enable"><b>S/MIME'ı etkinleştir. </b><a class="indexterm" name="id-1.14.14.9.2.1.1.1.2"></a>S/MIME şifrelemesi ile e-posta gönderme ve alma olanağınızı tanımlar.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">S/MIME tipi şifrelemeyi yönetme işlevlerini içerir.</p>
+<p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p>
+</li></ul>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings.extended"></p>
+<div id="ox.appsuite.user.reference.guard.settings.recipientsmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.recipientsmime"></p>
+<h3 class="title">S/MIME Alıcıları</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">S/MIME tipi alıcı sertifikalarını görüntüleme ve ekleme işlevlerini içerir.</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p></li>
+</ul>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.advanced"></p>
 <h3 class="title">GeliÅŸmiÅŸ</h3>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<p id="ox.appsuite.user.reference.guard.settings.extended.advanced"><b>Gelişmiş ayarlar. </b><a class="indexterm" name="id-1.14.14.10.2.1.1.1.2"></a><span class="guibutton"><strong>Gelişmiş ayarları göster</strong></span> etkinse aşağıdaki ayarları ve işlevleri de kullanabilirsiniz.</p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
+<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>E-posta önbelleği</strong></span></p>
-<p role="presentation">Şifresi çözülen e-postaların, başka bir e-posta görüntülerken veya başka bir groupware uygulamasına geçerken tarayıcı önbelleğinde okunabilir bir biçimde tutulup tutulmayacağını tanımlar.</p>
-<p role="presentation">Şifresi çözülen e-postayı tarayıcı önbelleğinden kaldırmak için <span class="guibutton"><strong>E-postaları çözülmüş halde tutma</strong></span> seçeneğini etkinleştirin.</p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.email"><b>E-posta yazarken gelişmiş ayarları göster. </b></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<a class="indexterm" name="id-1.14.14.14.2.1.1.1.2.1.1.1"></a><p role="presentation">Bu ayarı açarsanız şifrelenmiş e-posta gönderirken başka seçenekleri de kullanabilirsiniz.</p>
+<p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Şifrelenmiş e-posta gönderme</a></p>
+</li></ul>
 </li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Anahtarlar</strong></span> bölümü</p>
-<p role="presentation">Kendi anahtarlarınızı, ortak anahtarları ve Autocrypt anahtarlarını yönetme.</p>
-<p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Anahtar Yönetimi</a></p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.inline"><b>Yeni e-postalarda varsayılan olarak PGP inline kullan. </b><a class="indexterm" name="id-1.14.14.14.2.1.2.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Şifreleme için varsayılan olarak PGP/Inline kullanılıp kullanılmayacağını tanımlar.</p></li>
+<li class="listitem"><p role="presentation">Yalnızca alıcının e-posta istemcisi PGP'yi desteklemiyorsa bu ayarları kullanın. PGP/Inline kullanıldığında alıcı, PGP desteği olmasa da iletinin şifresini çözebilir.</p></li>
+<li class="listitem"><p role="presentation">Bu ayarı kullanırsanız e-postalarınızı HTML biçiminde gönderemezsiniz.</p></li>
+</ul>
 </li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Autocrypt</strong></span> bölümü</p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.autocrypt"><b>Autocrypt Ayarı. </b><a class="indexterm" name="id-1.14.14.14.2.1.3.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
 <p role="presentation">Gelen e-postalar için Autocrypt kullanımını yapılandırır. Autocrypt anahtarlarını başka istemcilere aktarmanıza olanak verir.</p>
 <p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">E-posta Yazışmalarını Autocrypt ile Şifreleme</a></p>
+</li></ul>
 </li>
 <li class="listitem">
-<p role="presentation">Şifrelenmiş e-posta gönderirken başka seçenekler de kullanılabilir.</p>
-<p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Şifrelenmiş e-posta gönderme</a></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.cache"><b>E-posta önbelleği. </b><a class="indexterm" name="id-1.14.14.14.2.1.4.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation">Şifresi çözülen e-postaların, başka bir e-posta görüntülerken veya başka bir groupware uygulamasına geçerken tarayıcı önbelleğinde okunabilir bir biçimde tutulup tutulmayacağını tanımlar.</p>
+<p role="presentation">Şifresi çözülen e-postayı tarayıcı önbelleğinden kaldırmak için <span class="guibutton"><strong>E-postaları çözülmüş halde tutma</strong></span> seçeneğini etkinleştirin.</p>
+</li></ul>
 </li>
-</ul>
+<li class="listitem">
+<p id="ox.appsuite.user.task.guard.settings.advanced.reset"><b>Seçenekleri sıfırla. </b><a class="indexterm" name="id-1.14.14.14.2.1.5.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation"><span class="guibutton"><strong>Parola kurtarmayı sil</strong></span>. Unutulan parolaları kurtarma özelliğini kapatır.</p>
+<p role="presentation"><span class="phrase"><strong>Uyarı:</strong></span> Parola sıfırlama işlevini kaldırırsanız artık parolanızı sıfırlayamazsınız. Daha sonra parolanızı unutursanız şifrelenmiş verilerinizin şifresini çözmeniz mümkün olmayacaktır.</p>
+<p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">Parola sıfırlama işlevini kaldırma</a></p>
 </li></ul>
+</li>
+</ul>
 <p id="ox.appsuite.user.parent.guard.settings">Ana başlık:<a class="xref" href="ox.appsuite.user.chap.guard.html"><i><span class="phrase">Guard</span> ile Veri Şifreleme</i></a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.settings.commonsettings.html b/help/l10n/tr_TR/ox.appsuite.user.sect.settings.commonsettings.html
index 30b87b5a7..d8e05022f 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.settings.commonsettings.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.settings.commonsettings.html
@@ -124,8 +124,8 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li></ul>
 </li>
 <li class="listitem cap-deputy" id="id-1.4.6.11.2.1.3">
-<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Vekilleri Yönetme. </b></p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Vekilleri Yönetme</a></p></li></ul>
+<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Vekilleri yönet. </b></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Bkz. <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">vekilleri yönet</a></p></li></ul>
 </li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.settings.commonsettings.changepassword"><b>Parolayı değiştir. </b></p>
@@ -138,7 +138,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Ayar Arama</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için Geri Sayımı Kullanma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için geri sayım kullanma</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Yerel Uygulamaları Sihirbaz Yardımıyla Ayarlama</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.settings.countdown.html b/help/l10n/tr_TR/ox.appsuite.user.sect.settings.countdown.html
index c525e2934..3d8a83a36 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.settings.countdown.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.settings.countdown.html
@@ -1,13 +1,13 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Randevular için Geri Sayımı Kullanma</title>
+<title>Randevular için geri sayım kullanma</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Özelleştirilmiş Ayarlar">
 <link rel="prev" href="ox.appsuite.user.sect.settings.notifications.html" title="Bildirimleri Özelleştirme">
-<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Bildirim alanını kullanma">
+<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="bildirim alanını kullanma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Özelleştirilmiş Ayarlar</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.countdown">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Randevular için Geri Sayımı Kullanma</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Randevular için geri sayım kullanma</h2></div></div></div>
 <a class="indexterm" name="id-1.4.8.2"></a><a class="indexterm" name="id-1.4.8.3"></a><a class="indexterm" name="id-1.4.8.4"></a><p id="ox.appsuite.user.concept.settings.countdown">Yaklaşan randevular için geri sayım başlatabilirsiniz. Randevu başlamadan önce açılacak geri sayım penceresi size randevunuzu hatırlatacaktır.</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.settings.notificationarea.html b/help/l10n/tr_TR/ox.appsuite.user.sect.settings.notificationarea.html
index 55258067a..f7a299a86 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.settings.notificationarea.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.settings.notificationarea.html
@@ -1,12 +1,12 @@
 <html lang="tr">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Bildirim alanını kullanma</title>
+<title>bildirim alanını kullanma</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Özelleştirilmiş Ayarlar">
-<link rel="prev" href="ox.appsuite.user.sect.settings.countdown.html" title="Randevular için Geri Sayımı Kullanma">
+<link rel="prev" href="ox.appsuite.user.sect.settings.countdown.html" title="Randevular için geri sayım kullanma">
 <link rel="next" href="ox.appsuite.user.sect.settings.personaldata.html" title="Kişisel İletişim Bilgilerini Değiştirme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Özelleştirilmiş Ayarlar</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.notificationarea">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Bildirim alanını kullanma</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">bildirim alanını kullanma</h2></div></div></div>
 <a class="indexterm" name="id-1.4.9.2"></a><a class="indexterm" name="id-1.4.9.3"></a><p id="ox.appsuite.user.concept.settings.notificationarea">Aşağıdaki olaylar hakkında bildirim alanında bilgilendirileceksiniz:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Yaklaşan randevu ve görevlerin anımsatıcıları</p></li>
@@ -64,7 +64,7 @@
 <p role="presentation" class="feat-io-ox-core-managedResources">Yönetilen kaynaklar için rezervasyon isteği aldığınızda aşağıdaki işlevleri kullanabilirsiniz:<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Rezervasyon isteğini kaynak takvimde görmek için tarihe tıklayın.</p></li>
 <li class="listitem"><p role="presentation">Rezervasyon isteğini kabul etmek veya reddetmek için ilgili düğmeye tıklayın.</p></li>
-</ul></p>
+</ul> </p>
 <p role="presentation">Gecikmiş görevler varsa aşağıdaki işlevleri kullanabilirsiniz:<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Ayrıntılarını açılır pencerede görmek istediğiniz anımsatıcıya tıklayın.</p></li>
 <li class="listitem"><p role="presentation">Görevi düzenlemek için açılır penceredeki işlevleri kullanın.</p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.settings.notifications.html b/help/l10n/tr_TR/ox.appsuite.user.sect.settings.notifications.html
index 3a67941f4..8606985a2 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.settings.notifications.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.settings.notifications.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Özelleştirilmiş Ayarlar">
 <link rel="prev" href="ox.appsuite.user.sect.settings.commonsettings.html" title="Genel Ayarları Düzenleme">
-<link rel="next" href="ox.appsuite.user.sect.settings.countdown.html" title="Randevular için Geri Sayımı Kullanma">
+<link rel="next" href="ox.appsuite.user.sect.settings.countdown.html" title="Randevular için geri sayım kullanma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -58,7 +58,7 @@
 <p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications"></p>
 <h3 class="title">Masaüstü bildirimleri</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>masaüstü bildirimlerini göster. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Groupware arka plandayken gelen e-postalar için masaüstü bildirimi alıp almayacağınızı tanımlar.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>Masaüstü bildirimlerini göster. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Groupware arka plandayken gelen e-postalar için masaüstü bildirimi alıp almayacağınızı tanımlar.</p></li>
 <li class="listitem">
 <p role="presentation">Tarayıcı ayarlarına bağlı olarak <span class="guibutton"><strong>Tarayıcı izinlerini yönet</strong></span> düğmesi de görünebilir. Düğmeye tıklayın. Tarayıcınız bildirimlere izin verip vemediğiniz soracaktır. İstenen izni verin.</p>
 <p role="presentation">Not: Tarayıcıya bağlı olarak, yukarıdaki ayarın etkin hale gelmesi için tarayıcı ayarlarınızdan bildirimlere izin vermeniz gerekebilir. Tarayıcınızın yardım sayfalarından bu konuyla ilgili bilgi alabilirsiniz.</p>
@@ -70,7 +70,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.show"><b>Yeni anımsatıcılar olduğunda bildirim alanını otomatik olarak aç. </b><a class="indexterm" name="id-1.4.7.8.2.1.1.1.2"></a>Bir randevu veya görev veya için anımsatıcı geldiğinde bildirim alanının otomatik olarak açılıp açılmayacağını belirler.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.birthdays"><b>Bildirim alanında doğum günlerini göster. </b>Bildirim alanında yaklaşan doğum günlerini gösterilip gösterilmeyeceğini belirler.</p></li>
 </ul>
-<p>Bkz. <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Bildirim alanını kullanma</a></p>
+<p>Bkz. <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">bildirim alanını kullanma</a></p>
 <p id="ox.appsuite.user.reference.settings.notifications.email"></p>
 <h3 class="title">E-posta</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -83,14 +83,14 @@
 <p id="ox.appsuite.user.reference.settings.notifications.calendar"></p>
 <h3 class="title">Takvim</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem feat-io-ox-core-countdown" id="id-1.4.7.10.2.1.1"><p id="ox.appsuite.user.reference.settings.notifications.calendar.countdown"><b>Geri sayım. </b><a class="indexterm" name="id-1.4.7.10.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.3"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.4"></a>Yaklaşan randevular için geri sayım penceresinin görüntülenip görüntülenmeyeceğini tanımlar. Bkz. <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için Geri Sayımı Kullanma</a></p></li>
+<li class="listitem feat-io-ox-core-countdown" id="id-1.4.7.10.2.1.1"><p id="ox.appsuite.user.reference.settings.notifications.calendar.countdown"><b>Geri sayım. </b><a class="indexterm" name="id-1.4.7.10.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.3"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.4"></a>Yaklaşan randevular için geri sayım penceresinin görüntülenip görüntülenmeyeceğini tanımlar. Bkz. <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için geri sayım kullanma</a></p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.settings.notifications.calendar.email"><b>E-posta bildirimleri. </b>Aşağıdaki durumlarda e-posta bildirimi alıp almayacağınızı belirler:</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.changes"><b>Katıldığım bir randevu oluşturulduğunda, değiştirildiğinde veya silindiğinde bildirim gönder. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.1.1.2"></a>Katıldığınız bir randevu yeniden oluşturulduğunda, değiştirildiğinde veya silindiğinde.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>randevu katılımcısıysam diğer katılımcılar kabul veya reddettiğinde bildirim gönder. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Bir katılımcı sizin oluşturduğunuz bir randevuyu kabul veya reddettiğinde.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>randevu katılımcısıysam diğer katılımcılar kabul veya reddettiğinde bildirim gönder. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>Bir katılımcı sizin katıldığınız bir randevuyu kabul veya reddettiğinde.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>randevu kabul veya reddedildikten sonra davet e-postasını otomatik olarak sil. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Randevuyu kabul veya reddedikten sonra randevu davetini içeren e-posta bildiriminin otomatik olarak silinip silinmeyeceğini tanımlar. Bkz. <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Randevu Davetlerini Yanıtlama</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>Randevu katılımcısıysam diğer katılımcılar kabul veya reddettiğinde bildirim gönder. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>Bir katılımcı sizin oluşturduğunuz bir randevuyu kabul veya reddettiğinde.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>Randevu katılımcısıysam diğer katılımcılar kabul veya reddettiğinde bildirim gönder. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>Bir katılımcı sizin katıldığınız bir randevuyu kabul veya reddettiğinde.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>Randevu kabul veya reddedildikten sonra davet e-postasını otomatik olarak sil. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Randevuyu kabul veya reddedikten sonra randevu davetini içeren e-posta bildiriminin otomatik olarak silinip silinmeyeceğini tanımlar. Bkz. <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Randevu Davetlerini Yanıtlama</a></p></li>
 </ul>
 </li>
 </ul>
@@ -121,10 +121,10 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Ayar Arama</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için Geri Sayımı Kullanma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için geri sayım kullanma</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Genel Ayarları Düzenleme</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Bildirim alanını kullanma</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">bildirim alanını kullanma</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.settings.notifications">Ana başlık:<a class="xref" href="ox.appsuite.user.chap.settings.html"><i>Özelleştirilmiş Ayarlar</i></a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.settings.personaldata.html b/help/l10n/tr_TR/ox.appsuite.user.sect.settings.personaldata.html
index 0a00b5a80..fbef3e7c2 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.settings.personaldata.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.settings.personaldata.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Özelleştirilmiş Ayarlar">
-<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Bildirim alanını kullanma">
+<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="bildirim alanını kullanma">
 <link rel="next" href="ox.appsuite.user.sect.settings.wizard.html" title="Yerel Uygulamaları Sihirbaz Yardımıyla Ayarlama">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.settings.search.html b/help/l10n/tr_TR/ox.appsuite.user.sect.settings.search.html
index a5cd592fb..75f4935cc 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.settings.search.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.settings.search.html
@@ -58,13 +58,14 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Genel Ayarları Düzenleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Bildirimleri Özelleştirme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için Geri Sayımı Kullanma</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Randevular için geri sayım kullanma</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">E-posta Ayarları</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Takvim Ayarları</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Adres Defteri Ayarları</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span> Ayarları</a></p>
+<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Ayarları</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.settings.search">Ana başlık:<a class="xref" href="ox.appsuite.user.chap.settings.html"><i>Özelleştirilmiş Ayarlar</i></a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.add.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.add.html
index adf0b9d6e..f0dd84583 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.add.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.add.html
@@ -43,7 +43,7 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Görevleri içe aktarma</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">randevu oluÅŸturma</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Randevu oluÅŸturma</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.add">Ana başlık:<a class="xref" href="ox.appsuite.user.chap.tasks.html"><i><span class="phrase">Görevler</span></i></a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.detailview.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.detailview.html
index e98a2e865..ac7d59068 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.detailview.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.detailview.html
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation">Görevin konusu</p></li>
 <li class="listitem"><p role="presentation">Görevin anımsatma tarihi (varsa)</p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.7.10.4.1.5">
-<p role="presentation">Atanan kategoriler</p>
+<p role="presentation">atanan kategoriler</p>
 <p role="presentation">Bir kategoriye tıkladığınızda o kategoriye atanmış görevler aranır.</p>
 </li>
 <li class="listitem"><p role="presentation">Görev yinelenen bir görevse yineleme parametreleri görüntülenir.</p></li>
@@ -64,7 +64,7 @@
 <li class="listitem"><p role="presentation">başlangıç ​​tarihi</p></li>
 <li class="listitem"><p role="presentation">tanım</p></li>
 <li class="listitem"><p role="presentation">datura bilgileri</p></li>
-<li class="listitem"><p role="presentation">ekler</p></li>
+<li class="listitem"><p role="presentation">Ekler</p></li>
 <li class="listitem">
 <p role="presentation">katılımcıların adları</p>
 <p role="presentation">Bir ada tıklarsanız bir açılır pencere açılır. Katılımcının <span class="guibutton"><strong>hale görünümünü</strong></span> gösterir.</p>
@@ -79,14 +79,11 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">Görevler</span> liste görünümü</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.create.html">Düzenleme penceresi</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Görevleri Görüntüleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Görev Eklerini Görüntüleme ve Kaydetme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">Görev Katılımcılarını Arama</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Görevleri Yönetme</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Kişileri hale görünümünde görüntüleme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.gui.detailview">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">Görevler</span> Bileşenleri</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.foldertree.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.foldertree.html
index 4c2f930a8..fc4295928 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.foldertree.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.foldertree.html
@@ -54,6 +54,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Görevleri Görüntüleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Görev Listeleri Ekleme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Görevleri Yönetme</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Klasörleri Kullanarak Verileri Yönetme</a></p>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.list.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.list.html
index bed7e7f7d..52a5b94cc 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.list.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.list.html
@@ -51,17 +51,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.list.html">Liste görünümü</a></p></li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.settingsmenu.html">The <span class="phrase">Görevler</span> ayarlar menüsü</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.detailview.html"><span class="phrase">Görevler</span> ayrıntı görünümü</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Görevleri Görüntüleme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">Görev Eklerini Görüntüleme ve Kaydetme</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Görevleri Yönetme</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.list">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">Görevler</span> Bileşenleri</a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.settingsmenu.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
index 473a2ef4c..bb66cef1a 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
@@ -47,10 +47,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.menubar.html">Menü çubuğu</a></p></li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">Görevler</span> liste görünümü</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Ortak ve paylaşılan görev listelerine abone olma</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Ortak ve paylaşılan görev listelerine abone olma</a></p></li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.settingsmenu">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">Görevler</span> Bileşenleri</a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.toolbar.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.toolbar.html
index c8243d30a..3af5e005f 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.toolbar.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.gui.toolbar.html
@@ -52,13 +52,7 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Görevleri Düzenleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Bir görevin bitiş tarihini değiştirme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Görevleri bitmiş olarak işaretleme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Görevleri başka bir klasöre taşıma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Görev onaylarını değiştirme</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Görevleri dışa aktarma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.print.html">Görevleri yazdırma</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.delete.html">Görevleri silme</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Görevleri Yönetme</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.toolbar">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">Görevler</span> Bileşenleri</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.categories.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.categories.html
new file mode 100644
index 000000000..f95e2ffe6
--- /dev/null
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.categories.html
@@ -0,0 +1,85 @@
+<html lang="tr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Görevler için kategorileri kullanma</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="Kullanım Kılavuzu">
+<link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Görevleri Yönetme">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Bir görevin bitiş tarihini değiştirme">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Görevleri başka bir klasöre taşıma">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Geri</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Sonraki</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Görevler</span></h1>
+<h2 class="sr-only">Görevleri Yönetme</h2>
+<div class="sect2" id="ox.appsuite.user.sect.tasks.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Görevler için kategorileri kullanma</h3></div></div></div>
+<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.categories">Görevleri klasörlerden bağımsız olarak düzenlemek için kategorileri kullanabilirsiniz.</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Görevlere kategori atayabilirsiniz.</p></li>
+<li class="listitem"><p role="presentation">Bir kategoriye atanmış tüm görevleri görüntüleyebilirsiniz.</p></li>
+</ul>
+<p>Kendi kategorilerinizi oluşturabilir, düzenleyebilir ve silebilirsiniz. Bkz. <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a>.</p>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories">
+<p class="title">Görevlere kategori atamak için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Bir görev seçin. Araç çubuğundaki <span class="guibutton"><strong>Kişiyi düzenle</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.mark.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> tıklayın.</p>
+<p role="presentation">Görev düzenleme penceresi açılır.</p>
+</li>
+<li class="step">
+<p role="presentation">Bunu yapmak için <span class="guibutton"><strong>Kategoriler</strong></span>'in yanındaki <span class="guibutton"><strong>Kategori ekle</strong></span>'ye tıklayın. Bir kategori seçin.</p>
+<p role="presentation">Göreve atanmış bir kategoriyi kaldırmak isterseniz kategorinin yanındaki <span class="guibutton"><strong>Kategoriyi kaldır</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> tıklayın.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories.view">
+<p class="title">Belirli bir kategoriye atanmış göervleri görüntülemek için:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Kategori atanmış bir görev seçin.</p></li>
+<li class="step"><p role="presentation">Ayrıntı görünümde kategoriye tıklayın.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Sonuç:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Liste görünümünde, bu kategoriye atanmış tüm görevler gösterilir.</p></li>
+<li class="listitem"><p role="presentation">Önceki listeyi görmek isterseniz arama alanındaki <span class="guibutton"><strong>Aramayı iptal et</strong></span> simgesine <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> tıklayın.</p></li>
+</ul>
+          <p>İpucu: Arama seçeneklerini kullanarak da kategorileri arayabilirsiniz.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.tasks.manage.categories"></p>
+<p class="title">İlgili konular:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Görevlerde Arama Yapma</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Yeni e-postalarda varsayılan olarak PGP inline kullan</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Randevular için kategorileri kullanma</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Kişiler için kategorileri kullanma</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.tasks.manage.categories">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Görevleri Yönetme</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.changeduedate.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.changeduedate.html
index a5114a14e..863573664 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.changeduedate.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.changeduedate.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Görevleri Yönetme">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="Görevleri bitmiş olarak işaretleme">
-<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Görevleri başka bir klasöre taşıma">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Görevler için kategorileri kullanma">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Sonraki</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Sonraki</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -43,7 +43,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changeduedate"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">Görevler</span> liste görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.changestatus.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.changestatus.html
index 1fa847c4b..5cd2c4c6d 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.changestatus.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.changestatus.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Görevleri Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.changestatus">
 <div class="titlepage"><div><div><h3 class="title">Görev onaylarını değiştirme</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.10.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Görev katılımcısıysanız daha sonra bu görev için onayınızı değiştirebilirsiniz. Diğer görev katılımcılarının görebileceği bir yorum ekleyebilirsiniz.</p>
+<a class="indexterm" name="id-1.10.15.11.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">Görev katılımcısıysanız daha sonra bu görev için onayınızı değiştirebilirsiniz. Diğer görev katılımcılarının görebileceği bir yorum ekleyebilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.changestatus">
 <p class="title">Onay durumunuzu deÄŸiÅŸtirme:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,7 +44,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changestatus"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">Görevler</span> liste görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.delete.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.delete.html
index 1de56f384..374eb08c7 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.delete.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Görevleri Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Görevleri silme</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Uyarı:</strong></span> Silinen görevler <span class="phrase"><strong>geri getirilemez</strong></span>.</p>
+<a class="indexterm" name="id-1.10.15.15.2"></a><a class="indexterm" name="id-1.10.15.15.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Uyarı:</strong></span> Silinen görevler <span class="phrase"><strong>geri getirilemez</strong></span>.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.delete">
 <p class="title">Görevleri silme:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,7 +44,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.delete"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">Görevler</span> liste görünümü</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.manage.delete">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Görevleri Yönetme</a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.export.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.export.html
index 4661f734b..91c156160 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.export.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Görevleri Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Görevleri dışa aktarma</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">Görevleri iCal biçiminde dışa aktarabilirsiniz. Bu biçimi, örneğin görevlerinizi başka takvim uygulamalarına kaydetmek için kullanabilirsiniz. Bir klasördeki görevleri tek tek veya hepsini birden dışa aktarabilirsiniz.</p>
+<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><a class="indexterm" name="id-1.10.15.13.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">Görevleri iCal biçiminde dışa aktarabilirsiniz. Bu biçimi, örneğin görevlerinizi başka takvim uygulamalarına kaydetmek için kullanabilirsiniz. Bir klasördeki görevleri tek tek veya hepsini birden dışa aktarabilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.export.selected">
 <p class="title">Görevleri tek tek dışa aktarma:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -58,12 +58,16 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.export"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html"><span class="phrase">Görevler</span> klasör görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">Görevler</span> liste görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Görevleri içe aktarma</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.10.15.12.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Kişisel Verileri İndirme</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.10.15.13.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Kişisel Verileri İndirme</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.manage.export">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Görevleri Yönetme</a></p>
 </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.html
index 22ec45afb..887161097 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.html
@@ -36,6 +36,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Görevleri bitmiş olarak işaretleme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Bir görevin bitiş tarihini değiştirme</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Görevler için kategorileri kullanma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Görevleri başka bir klasöre taşıma</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Görev onaylarını değiştirme</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Görevleri içe aktarma</a></p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.import.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.import.html
index f7e8e74fe..b36f4b940 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.import.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Görevleri Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Görevleri içe aktarma</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.11.2"></a><a class="indexterm" name="id-1.10.15.11.3"></a><a class="indexterm" name="id-1.10.15.11.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">iCal biçimindeki dosyalardan görevleri içe aktarabilirsiniz.</p>
+<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">iCal biçimindeki dosyalardan görevleri içe aktarabilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.import">
 <p class="title">iCal dosyalarındaki görevleri içe aktarma:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -50,6 +50,9 @@
         </div>
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.import"></p>
+<p class="title">Kullanıcı arayüzü:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html"><span class="phrase">Görevler</span> klasör görünümü</a></p></li></ul>
+<p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">Görevleri dışa aktarma</a></p></li>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.markasdone.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.markasdone.html
index 202e53b92..316dd54fc 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.markasdone.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.markasdone.html
@@ -46,7 +46,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.markasdone"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">Görevler</span> liste görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.move.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.move.html
index 61104f1e6..64b5f6378 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.move.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.move.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="Kullanım Kılavuzu">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Görevleri Yönetme">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Bir görevin bitiş tarihini değiştirme">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Görevler için kategorileri kullanma">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.changestatus.html" title="Görev onaylarını değiştirme">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Yasal Uyarı">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Navigasyonu aç/kapat</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Geri</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Geri</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Başlangıç</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">İçindekiler</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Sonraki</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Görevleri Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Görevleri başka bir klasöre taşıma</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">Görevleri başka bir klasöre taşıyabilirsiniz.</p>
+<a class="indexterm" name="id-1.10.15.10.2"></a><a class="indexterm" name="id-1.10.15.10.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">Görevleri başka bir klasöre taşıyabilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.move">
 <p class="title">Görevleri başka bir klasöre taşıma:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,7 +46,11 @@
 <p id="ox.appsuite.user.tip.tasks.manage.move">İpucu: Klasör görünümünde seçtiğiniz nesneleri bir klasöre sürükleyerek de taşıyabilirsiniz.</p>
 <p id="ox.appsuite.user.related.tasks.manage.move"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html"><span class="phrase">Görevler</span> klasör görünümü</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">Görevler</span> liste görünümü</a></p>
+</li></ul>
 <p> </p>
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">Kişisel görev listesi ekleme</a></p></li></ul>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.print.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.print.html
index 3231e0c2e..4105a2269 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.print.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Görevleri Yönetme</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Görevleri yazdırma</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">Tek veya çok sayıda görevin bilgilerini yazdırabilirsiniz.</p>
+<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">Tek veya çok sayıda görevin bilgilerini yazdırabilirsiniz.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.print.data">
 <p class="title">Bir görevin bilgilerini yazdırma:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -45,7 +45,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.print"></p>
 <p class="title">Kullanıcı arayüzü:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">Görevler</span> araç çubuğu</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">Görevler</span> liste görünümü</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.manage.print">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Görevleri Yönetme</a></p>
 </div>
           </div>
diff --git a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.search.html b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.search.html
index ae8fd7705..3a0e6fd98 100644
--- a/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.search.html
+++ b/help/l10n/tr_TR/ox.appsuite.user.sect.tasks.search.html
@@ -81,7 +81,7 @@
 <p class="title">İlgili konular:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Görevleri Görüntüleme</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Kategorileri Yönetme</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Görevler için kategorileri kullanma</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.search">Ana başlık:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Görevleri Yönetme</a></p>
 </div>
diff --git a/help/l10n/zh_CN/bk01-toc.html b/help/l10n/zh_CN/bk01-toc.html
index 4ea46b861..e9de035bd 100644
--- a/help/l10n/zh_CN/bk01-toc.html
+++ b/help/l10n/zh_CN/bk01-toc.html
@@ -124,7 +124,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.new.html">新建电子邮件按钮</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">电子邮件</span>文件夹视图</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html"><span class="phrase">电子邮件</span>选项卡视图</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">收件夹类别条</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.popup.html"><span class="phrase">电子邮件</span>弹出窗口</a></li>
@@ -164,6 +164,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.movecopy.html">移动或复制电子邮件</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.mark.html">标记电子邮件成已读或未读</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.collectaddress.html">收集地址</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">默认使为新电子邮件用直列 PGP</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.label.html">分类电子邮件</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.source.html">显示电子邮件原始码</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.draft.html">使用电子邮件草稿</a></li>
@@ -175,6 +176,9 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.print.html">打印电子邮件</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.archive.html">电子邮件归档中</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.delete.html">删除电子邮件</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.recover.html">恢复电邮中</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.deleteforever.html">删除电子邮件</a></li>
+<li class="sect2 cap-dumpster"><a href="ox.appsuite.user.sect.email.manage.undelete.html">恢复永久删除的电邮</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理电子邮件文件夹</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.unifiedmail.html">使用统一邮件</a></li>
 </ul>
@@ -254,10 +258,11 @@
 </li>
 <li class="sect1 cap-calendar">
 <a href="ox.appsuite.user.sect.calendar.manage.html">管理约会</a><ul>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changestatus.html">更改约会状态</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changestatus.html">更改约会状态。</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changereminder.html">更改约会提醒</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">更改组织者</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.timezones.html">管理最爱时区</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">对约会使用类别</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.colors.html">使用日历颜色</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.move.html">将约会移至另一日历</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.import.html">导入约会</a></li>
@@ -340,6 +345,7 @@
 <a href="ox.appsuite.user.sect.contacts.manage.html">管理联系人</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.contacts.manage.sendmail.html">从地址簿选择电子邮件</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">邀请联系人到一个约会</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">对联系人使用类别</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.movecopy.html">移动或复制联系人</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">发送 联系人成 vCard</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.import.html">导入联系人</a></li>
@@ -388,6 +394,7 @@
 <a href="ox.appsuite.user.sect.tasks.manage.html">管理任务</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.markasdone.html">将任务标记为已完成任务</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">更改任务的截止日期</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">对任务使用类别</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.move.html">将任务移至另一文件夹</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changestatus.html">更改任务确认</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.import.html">导入任务</a></li>
@@ -554,12 +561,19 @@
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.logout.html">从<span class="phrase">Guard</span>注销</a></li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.password.html">密码管理</a></li>
+<li class="sect1 cap-guard">
+<a href="ox.appsuite.user.sect.guard.password.html">密码管理</a><ul>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.change.html">更改密码</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.reset.html">重设密码</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.deleterecovery.html">移除密码重设功能</a></li>
+</ul>
+</li>
 <li class="sect1 cap-guard">
 <a href="ox.appsuite.user.sect.guard.keys.html">钥管理</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的PGP钥</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理收件人的PGP钥</a></li>
 <li class="sect2 cap-smime"><a href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">管理自己的S/MIME钥</a></li>
-<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理公钥</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">管理收件人的S/MIME钥</a></li>
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>设定</a></li>
diff --git a/help/l10n/zh_CN/index.html b/help/l10n/zh_CN/index.html
index b23f50669..4b34db902 100644
--- a/help/l10n/zh_CN/index.html
+++ b/help/l10n/zh_CN/index.html
@@ -34,7 +34,7 @@
 </h3></div></div>
 <div><p class="copyright">版权 ©  OX Software GmbH </p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">法律通告</a></div>
-<div><p class="pubdate">星期二, 14. 十一月 2023 8.19.0 版本</p></div>
+<div><p class="pubdate">星期四, 21. 十二月 2023 8.20.0 版本</p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">帮助主题概观</h2>
@@ -67,6 +67,13 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">管理户口</a></p></li>
 </ul>
 </li>
+<li class="listitem" id="ox.appsuite.user.startpage.toc.keyboard" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.chap.keyboard.html"><i>键盘输入</i></a></p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.keyboard.navigation.html">使用键盘导航</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.keyboard.shortkeys.html">使用键盘捷径</a></p></li>
+</ul>
+</li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.portal" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.chap.portal.html"><i><span class="phrase">门户</span></i></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -81,15 +88,15 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">电子邮件</span>元件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">检视电子邮件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">发送电子邮件</a></p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.5.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">使用人工智能整合</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">拨接发送人/别的收件人</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.6.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">使用人工智能整合</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">拨接发送人/别的收件人</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">添加电子邮件文件夹</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">使用电子邮件过滤器</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">搜寻电子邮件</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.5.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">以代表身份发送或接收电子邮件</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">以代表身份发送或接收电子邮件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">添加电子邮件户口</a></p></li>
-<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.5.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a></p></li>
+<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-calendar" id="ox.appsuite.user.startpage.toc.calendar">
@@ -100,16 +107,16 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">创建约会</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">回应任务邀请</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">编辑约会</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">拨接约会参与者</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">拨接约会参与者</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.html">添加日历</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理约会</a></p></li>
-<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.6.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">使用资源日历</a></p></li>
+<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.7.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">使用资源日历</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">搜索约会</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">以代表身份创建、编辑、或管理约会</a></p></li>
-<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">使用群组</a></p></li>
-<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.6.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">使用资源</a></p></li>
-<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.6.1.15"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">使用已管理资源</a></p></li>
-<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.6.1.16"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">日历设定</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.7.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">以代表身份创建、编辑、或管理约会</a></p></li>
+<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.7.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">使用群组</a></p></li>
+<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">使用资源</a></p></li>
+<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.7.1.15"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">使用已管理资源</a></p></li>
+<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.7.1.16"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">日历设定</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-contacts" id="ox.appsuite.user.startpage.toc.contacts">
@@ -118,16 +125,16 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">地址簿</span>元件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">显示一个地址簿的联系人。</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">自动从一个地址簿添加联系人或资源</a></p></li>
-<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">自动从地址目录添加联系人或资源</a></p></li>
+<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.8.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">自动从地址目录添加联系人或资源</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">添加联系人</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.html">添加通讯组列表</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">编辑联系人或通讯组列表</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">拨接联系人</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.8.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">拨接联系人</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">添加地址簿</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.managesubscribed.html">刷新和管理地址簿订阅</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理联系人</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">搜寻联系人</a></p></li>
-<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">地址簿设定</a></p></li>
+<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.8.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">地址簿设定</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-tasks" id="ox.appsuite.user.startpage.toc.tasks">
@@ -154,18 +161,18 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">组织文件与<span class="phrase">云盘</span>文件夹</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.search.html">搜寻文件或文件夹</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">添加储存户口</a></p></li>
-<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.9.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">云盘</span>设定</a></p></li>
+<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.10.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">云盘</span>设定</a></p></li>
 </ul>
 </li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.dataorganisation" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>数据组织与共享</i></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">管理带文件夹的数据</a></p></li>
-<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.10.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">分享数据</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.10.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">管理代表</a></p></li>
+<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.11.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">分享数据</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.11.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">管理代表</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">管理户口</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.10.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.10.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下载个人数据</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.11.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.11.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下载个人数据</a></p></li>
 </ul>
 </li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.security" style="list-style-type: none">
@@ -174,7 +181,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">自动注销</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.emaillinkedimages.html">电子邮件里的外部连接图像</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.sessions.html">显示或从活跃客户端注销</a></p></li>
-<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.11.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">多因素身份认证</a></p></li>
+<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.12.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">多因素身份认证</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-guard" id="ox.appsuite.user.startpage.toc.guard">
diff --git a/help/l10n/zh_CN/ox.appsuite.user.chap.calendar.html b/help/l10n/zh_CN/ox.appsuite.user.chap.calendar.html
index a54146c1e..8443cdb2f 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.chap.calendar.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.chap.calendar.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="index.html" title="用户向导&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="电子邮件设定">
+<link rel="prev" href="ox.appsuite.user.sect.email.mailfilter.apply.html" title="套用一个规则到现存电子邮件">
 <link rel="next" href="ox.appsuite.user.sect.calendar.gui.html" title="日历元件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.mailfilter.apply.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.gui.html">下一页</a></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/zh_CN/ox.appsuite.user.chap.dataorganisation.html
index ae9201e46..eb35487c3 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.chap.dataorganisation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="index.html" title="用户向导&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="在 Windows 下设置 WebDAV">
+<link rel="prev" href="ox.appsuite.user.sect.drive.settings.html" title="云盘设定">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.folder.html" title="管理带文件夹的数据">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.settings.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.folder.html">下一页</a></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.chap.drive.html b/help/l10n/zh_CN/ox.appsuite.user.chap.drive.html
index f92485a50..9c13c7799 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.chap.drive.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="index.html" title="用户向导&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.search.html" title="搜索任务">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.delete.html" title="删除任务">
 <link rel="next" href="ox.appsuite.user.sect.drive.gui.html" title="云盘部件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.search.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.delete.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.drive.gui.html">下一页</a></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.chap.guard.html b/help/l10n/zh_CN/ox.appsuite.user.chap.guard.html
index 73c1a32ff..602e0addf 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.chap.guard.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="index.html" title="用户向导&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="管理确认方法">
+<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="自动注销">
 <link rel="next" href="ox.appsuite.user.sect.guard.setup.html" title="设置Guard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.autologout.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.setup.html">下一页</a></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.chap.security.html b/help/l10n/zh_CN/ox.appsuite.user.chap.security.html
index e9141b8ff..56a35fc5d 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.chap.security.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.chap.security.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="index.html" title="用户向导&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="检视、编辑、删除户口">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="下载个人数据">
 <link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="显示或从活跃客户端注销">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">下一页</a></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.chap.tasks.html b/help/l10n/zh_CN/ox.appsuite.user.chap.tasks.html
index 69472ee7b..6ca65cd14 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.chap.tasks.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.chap.tasks.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="index.html" title="用户向导&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="地址簿设定">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.delete.html" title="删除联系人">
 <link rel="next" href="ox.appsuite.user.sect.tasks.gui.html" title="任务元件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.settings.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.delete.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.gui.html">下一页</a></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.index.html b/help/l10n/zh_CN/ox.appsuite.user.index.html
index a8ec154e7..6422e033e 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.index.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="index.html" title="用户向导&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="Guard设定">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="管理收件人的S/MIME钥">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -21,7 +21,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.settings.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 </ul></div>
@@ -173,6 +173,8 @@
 <dt class="cap-calendar">任务,<a class="indexterm" href="ox.appsuite.user.chap.tasks.html">任务</a>
 </dt>
 <dd><dl>
+<dt class="feat-io-ox-core-categories">使用类别,<a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">对任务使用类别</a>
+</dt>
 <dt class="cap-tasks">保存附件,<a class="indexterm" href="ox.appsuite.user.sect.tasks.attachments.html">检视或保存任务附件</a>
 </dt>
 <dt class="cap-tasks">元件,<a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.html">任务元件</a>
@@ -344,7 +346,7 @@
 </dt>
 <dt class="cap-infostore">档案,<a class="indexterm" href="ox.appsuite.user.sect.drive.manage.delete.html">删除文件或云盘文件夹</a>
 </dt>
-<dt class="cap-webmail">电子邮件,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">删除电子邮件</a>
+<dt class="cap-webmail">电子邮件,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">删除电子邮件</a>,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">删除电子邮件</a>
 </dt>
 <dt class="cap-calendar">约会,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.delete.html">删除约会</a>
 </dt>
@@ -443,11 +445,12 @@
 </dt>
 </dl></dd>
 <dt class="cap-contacts">地址簿设定</dt>
-<dd><dl><dt class="cap-contacts">与地图服务连接邮递地址,<a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">地址簿设定</a>
-</dt></dl></dd>
-<dt class="cap-contacts">地址簿设置</dt>
-<dd><dl><dt class="cap-contacts">名称,<a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">地址簿设定</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="cap-contacts">与地图服务连接邮递地址,<a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">地址簿设定</a>
+</dt>
+<dt class="cap-contacts">名称,<a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">地址簿设定</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">复制</dt>
 <dd><dl>
 <dt class="cap-infostore">档案,<a class="indexterm" href="ox.appsuite.user.sect.drive.manage.copy.html">复制文件</a>
@@ -478,9 +481,9 @@
 </dt>
 <dt class="">密码</dt>
 <dd><dl>
-<dt class="cap-guard">Guard更改密码,<a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">密码管理</a>
+<dt class="cap-guard">Guard更改密码,<a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">更改密码</a>
 </dt>
-<dt class="cap-guard">Guard重设密码,<a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">密码管理</a>
+<dt class="cap-guard">Guard重设密码,<a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">重设密码</a>
 </dt>
 <dt class="">使用应用程序密码,<a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">使用应用程序密码</a>
 </dt>
@@ -489,10 +492,6 @@
 </dl></dd>
 <dt class="cap-webmail">导入</dt>
 <dd><dl>
-<dt class="cap-contacts">CSV 格式的联系人,<a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">导入联系人</a>
-</dt>
-<dt class="cap-contacts">vCard 格式的联系人,<a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">导入联系人</a>
-</dt>
 <dt class="cap-calendar">日历,<a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">从文件导入日历</a>
 </dt>
 <dt class="cap-webmail">电子邮件,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">导入 电子邮件</a>
@@ -586,6 +585,13 @@
 </dt></dl></dd>
 <dt class="">弹出,<a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.popup.html">弹出窗口</a>
 </dt>
+<dt class="cap-webmail">恢复</dt>
+<dd><dl>
+<dt class="cap-dumpster">永久删除的电邮,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">恢复永久删除的电邮</a>
+</dt>
+<dt class="cap-webmail">电邮,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">恢复电邮中</a>
+</dt>
+</dl></dd>
 <dt class="cap-portal">户口</dt>
 <dd><dl>
 <dt class="cap-webmail">停用或启用功能性电子邮件户口,<a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">停用或启用功能性电子邮件户口</a>
@@ -809,8 +815,6 @@
 </dt>
 <dt class="cap-infostore">文本文件,<a class="indexterm" href="ox.appsuite.user.sect.drive.text.html">创建或编辑文本文件</a>
 </dt>
-<dt class="cap-calendar">日历,<a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">添加日历</a>
-</dt>
 <dt class="cap-webmail">电子邮件,<a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">发送新电子邮件</a>
 </dt>
 <dt class="cap-webmail">电子邮件文件夹,<a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">添加电子邮件文件夹</a>
@@ -826,6 +830,8 @@
 <dd><dl>
 <dt class="cap-tasks">任务,<a class="indexterm" href="ox.appsuite.user.sect.tasks.add.create.html">创建新任务</a>
 </dt>
+<dt class="cap-calendar">日历,<a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">添加日历</a>
+</dt>
 <dt class="cap-tasks">添加个人任务列表,<a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.personal.html">添加个人任务列表</a>
 </dt>
 <dt class="cap-calendar">约会,<a class="indexterm" href="ox.appsuite.user.sect.calendar.add.create.html">创建新约会</a>
@@ -838,6 +844,8 @@
 </dt>
 <dt class="cap-calendar">使用日历颜色,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">使用日历颜色</a>
 </dt>
+<dt class="feat-io-ox-core-categories">使用类别,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">对约会使用类别</a>
+</dt>
 <dt class="feat-io-ox-core-resourceCalendars">使用资源日历,<a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">使用资源日历</a>
 </dt>
 <dt class="feat-io-ox-core-resourceCalendars">使用资源日历,以创建约会,<a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">使用资源日历,以创建约会。</a>
@@ -928,9 +936,9 @@
 </dt>
 <dt class="">在参与者接受或拒绝时,以约会创建者身份接收通知。,<a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">自定义通知</a>
 </dt>
-<dt class="">在参与者接受或拒绝时,以约会参与者身份接收通知,<a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">自定义通知</a>
+<dt class="">在参与者接受或拒绝时,以约会参与者身份接收通知。,<a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">自定义通知</a>
 </dt>
-<dt class="">在约会被接受或拒绝后,自动删除邀请电子邮件,<a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">自定义通知</a>
+<dt class="">在约会接受或拒绝后,自动删除邀请电子邮件,<a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">自定义通知</a>
 </dt>
 <dt class="cap-calendar">显示已拒绝约会,<a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">日历设定</a>
 </dt>
@@ -1029,6 +1037,10 @@
 </dt>
 <dt class="cap-calendar">汇入</dt>
 <dd><dl>
+<dt class="cap-contacts">csv 格式的联系人,<a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">导入联系人</a>
+</dt>
+<dt class="cap-contacts">vCard 格式的联系人,<a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">导入联系人</a>
+</dt>
 <dt class="cap-tasks">任务,<a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">导入任务</a>
 </dt>
 <dt class="cap-calendar">约会,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">导入约会</a>
@@ -1094,7 +1106,7 @@
 <dt class="">电子邮件,<a class="indexterm" href="ox.appsuite.user.chap.email.html">电子邮件</a>
 </dt>
 <dd><dl>
-<dt class="cap-webmail">从 EML 导入,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">导入 电子邮件</a>
+<dt class="cap-webmail">从 EML 汇入,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">导入 电子邮件</a>
 </dt>
 <dt class="cap-webmail">从地址簿发送,<a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">从地址簿选择电子邮件</a>
 </dt>
@@ -1116,9 +1128,11 @@
 </dt>
 <dt class="cap-webmail">使用签名,<a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">使用签名</a>
 </dt>
+<dt class="feat-io-ox-core-categories">使用类别,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">默认使为新电子邮件用直列 PGP</a>
+</dt>
 <dt class="cap-webmail">使用草稿,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">使用电子邮件草稿</a>
 </dt>
-<dt class="cap-webmail">保存成 EML,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">保存电子邮件</a>
+<dt class="cap-webmail">保存成 eml,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">保存电子邮件</a>
 </dt>
 <dt class="cap-webmail">保存附件,<a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">检视或保存电子邮件附件</a>
 </dt>
@@ -1158,8 +1172,6 @@
 </dt>
 <dt class="">外部图像,<a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">电子邮件里的外部连接图像</a>
 </dt>
-<dt class="cap-webmail">存档,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">电子邮件归档中</a>
-</dt>
 <dt class="cap-guard">导入Autocrypt钥,<a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">导入Autocrypt钥</a>
 </dt>
 <dt class="feat-io-ox-core-mailPDFExport">导出成 PDF,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">导出电子邮件成 PDF</a>
@@ -1170,14 +1182,18 @@
 </dt>
 <dt class="cap-webmail">弹出窗口,<a class="indexterm" href="ox.appsuite.user.sect.email.gui.popup.html">电子邮件弹出窗口</a>
 </dt>
+<dt class="cap-webmail">归档,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">电子邮件归档中</a>
+</dt>
 <dt class="cap-webmail">打印,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">打印电子邮件</a>
 </dt>
 <dt class="cap-webmail cap-switchboard">拨接发送人/别的收件人,<a class="indexterm" href="ox.appsuite.user.sect.email.call.html">拨接发送人/别的收件人</a>
 </dt>
-<dt class="cap-webmail">搜寻,<a class="indexterm" href="ox.appsuite.user.sect.email.search.html">搜寻电子邮件</a>
+<dt class="cap-webmail">搜索,<a class="indexterm" href="ox.appsuite.user.sect.email.search.html">搜寻电子邮件</a>
 </dt>
 <dt class="cap-webmail">收件夹类别,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">以收件夹类别操作</a>
 </dt>
+<dt class="cap-webmail">收件夹类别条,<a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">收件夹类别条</a>
+</dt>
 <dt class="cap-webmail">收集地址,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">收集地址</a>
 </dt>
 <dt class="cap-webmail">文件夹视图,<a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">电子邮件文件夹视图</a>
@@ -1248,8 +1264,6 @@
 </dt>
 <dt class="cap-webmail">选择一个发送人地址,<a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">选择一个发送人地址</a>
 </dt>
-<dt class="cap-webmail">选项卡条,<a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">电子邮件选项卡视图</a>
-</dt>
 <dt class="">通知音效,<a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">自定义通知</a>
 </dt>
 </dl></dd>
@@ -1273,8 +1287,6 @@
 </dt>
 <dt class="cap-webmail">在回复中插入原始电子邮件文本?,<a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a>
 </dt>
-<dt class="cap-webmail">开始时自动选择最新读取消息,<a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a>
-</dt>
 <dt class="cap-webmail">撰写的对话框,<a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a>
 </dt>
 <dt class="cap-webmail">显示文本预览,<a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a>
@@ -1341,7 +1353,23 @@
 <dd><dl>
 <dt class="cap-calendar cap-switchboard">拨接约会参与者,<a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">拨接约会参与者</a>
 </dt>
-<dt class="cap-contacts cap-switchboard">正拨接联系人,<a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">拨接联系人</a>
+<dt class="cap-contacts cap-switchboard">拨接联系人,<a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">拨接联系人</a>
+</dt>
+</dl></dd>
+<dt class="cap-webmail">电邮</dt>
+<dd><dl>
+<dt class="cap-webmail">恢复,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">恢复电邮中</a>
+</dt>
+<dt class="cap-dumpster">恢复永久删除的电邮,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">恢复永久删除的电邮</a>
+</dt>
+<dt class="cap-webmail">永久删除,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">删除电子邮件</a>
+</dt>
+</dl></dd>
+<dt class="cap-webmail">电邮设定</dt>
+<dd><dl>
+<dt class="cap-webmail">开始时自动选择最新读取消息,<a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a>
+</dt>
+<dt class="cap-webmail">显示类别,<a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a>
 </dt>
 </dl></dd>
 <dt class="cap-multifactor">登录</dt>
@@ -1377,8 +1405,18 @@
 <dt class="cap-multifactor">管理确认方法,<a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.manage.html">管理确认方法</a>
 </dt>
 <dt class="feat-io-ox-core-categories">类别</dt>
-<dd><dl><dt class="feat-io-ox-core-categories">管理,<a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="feat-io-ox-core-categories">为任务使用,<a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">对任务使用类别</a>
+</dt>
+<dt class="feat-io-ox-core-categories">为电邮使用,<a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">默认使为新电子邮件用直列 PGP</a>
+</dt>
+<dt class="feat-io-ox-core-categories">为约会使用,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">对约会使用类别</a>
+</dt>
+<dt class="feat-io-ox-core-categories">为联系人使用,<a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">对联系人使用类别</a>
+</dt>
+<dt class="feat-io-ox-core-categories">管理,<a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a>
+</dt>
+</dl></dd>
 <dt class="">约会</dt>
 <dd><dl>
 <dt class="cap-calendar">从 iCal 创建,<a class="indexterm" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">从 iCal 附件创建约会</a>
@@ -1399,6 +1437,8 @@
 </dt>
 <dt class="cap-calendar">使用日期选择器,<a class="indexterm" href="ox.appsuite.user.sect.calendar.add.datepicker.html">使用日期选择器</a>
 </dt>
+<dt class="feat-io-ox-core-categories">使用类别,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">对约会使用类别</a>
+</dt>
 <dt class="cap-calendar">使用约会提醒,<a class="indexterm" href="ox.appsuite.user.sect.calendar.add.alarms.html">使用约会提醒</a>
 </dt>
 <dt class="feat-io-ox-core-resourceCalendars">使用资源日历,以创建约会,<a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">使用资源日历,以创建约会。</a>
@@ -1413,8 +1453,6 @@
 </dt>
 <dt class="cap-calendar">删除,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.delete.html">删除约会</a>
 </dt>
-<dt class="cap-calendar">导入,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">导入约会</a>
-</dt>
 <dt class="cap-calendar">导出,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.export.html">汇出 约会</a>
 </dt>
 <dt class="cap-calendar">打印,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.print.html">打印约会</a>
@@ -1433,12 +1471,14 @@
 </dt>
 <dt class="cap-calendar">更改时间和历时,<a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">编辑约会</a>
 </dt>
-<dt class="cap-calendar">更改约会状态,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">更改约会状态</a>
+<dt class="cap-calendar">更改约会状态,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">更改约会状态。</a>
 </dt>
 <dt class="cap-calendar">更改组织者,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">更改组织者</a>
 </dt>
 <dt class="cap-calendar">检视附件,<a class="indexterm" href="ox.appsuite.user.sect.calendar.attachments.html">检视或保存约会附件</a>
 </dt>
+<dt class="cap-calendar">汇入,<a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">导入约会</a>
+</dt>
 <dt class="cap-calendar">添加参与者或资源,<a class="indexterm" href="ox.appsuite.user.sect.calendar.add.participants.html">添加参与者或资源</a>
 </dt>
 <dt class="cap-calendar">添加附件,<a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">添加附件</a>
@@ -1504,6 +1544,8 @@
 </dt>
 <dt class="cap-contacts">作为 vCard 发送,<a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">发送 联系人成 vCard</a>
 </dt>
+<dt class="feat-io-ox-core-categories">使用类别,<a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">对联系人使用类别</a>
+</dt>
 <dt class="cap-webmail">保存电子邮件收件人成通讯组列表,<a class="indexterm" href="ox.appsuite.user.sect.contacts.distributionlist.recipients.html">保存电子邮件收件人成通讯组列表</a>
 </dt>
 <dt class="cap-contacts">保存附件,<a class="indexterm" href="ox.appsuite.user.sect.contacts.attachments.html">检视或保存联系人附件</a>
@@ -1842,13 +1884,17 @@
 </dt>
 <dt class="cap-guard">显示Autocrypt钥,<a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">管理Autocrypt钥</a>
 </dt>
-<dt class="cap-guard">更改密码,<a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">密码管理</a>
+<dt class="cap-guard">更改密码,<a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">更改密码</a>
 </dt>
 <dt class="cap-guard">注销,<a class="indexterm" href="ox.appsuite.user.sect.guard.logout.html">从Guard注销</a>
 </dt>
 <dt class="cap-guard">电邮加密,<a class="indexterm" href="ox.appsuite.user.sect.guard.email.html">加密电子邮件交谈</a>
 </dt>
-<dt class="cap-guard">管理公共钥,<a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理公钥</a>
+<dt class="cap-guard">移除密码重设功能,<a class="indexterm" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">移除密码重设功能</a>
+</dt>
+<dt class="cap-guard">管理收件人的PGP钥,<a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理收件人的PGP钥</a>
+</dt>
+<dt class="cap-guard">管理收件人的S/MIME钥,<a class="indexterm" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">管理收件人的S/MIME钥</a>
 </dt>
 <dt class="cap-guard">管理自己的PGP钥,<a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的PGP钥</a>
 </dt>
@@ -1862,29 +1908,36 @@
 </dt>
 <dt class="cap-guard">读取已加密电邮,<a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">读取加密电子邮件</a>
 </dt>
-<dt class="cap-guard">重设密码,<a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">密码管理</a>
+<dt class="cap-guard">重设密码,<a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">重设密码</a>
 </dt>
 <dt class="cap-guard">钥管理,<a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">钥管理</a>
 </dt>
 <dt class="cap-guard">验证Autocrypt钥,<a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">管理Autocrypt钥</a>
 </dt>
 </dl></dd>
+<dt class="cap-guard">Guard 设定</dt>
+<dd><dl><dt class="cap-guard">撰写选项,<a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard设定</a>
+</dt></dl></dd>
 <dt class="cap-guard">Guard保安设定</dt>
 <dd><dl>
 <dt class="cap-guard">,<a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard设定</a>
 </dt>
-<dt class="cap-guard">S/MIME,<a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard设定</a>
-</dt>
 <dt class="cap-guard">于撰写电子邮件时默认发送加密,<a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard设定</a>
 </dt>
+<dt class="cap-guard">显示撰写邮件的进阶设定,<a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard设定</a>
+</dt>
 </dl></dd>
 <dt class="cap-guard">Guard保安设置</dt>
 <dd><dl>
+<dt class="cap-guard">Autocrypt设置,<a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard设定</a>
+</dt>
 <dt class="cap-guard">新邮件默认使用PGP直列,<a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard设定</a>
 </dt>
+<dt class="cap-guard">电邮缓存设置,<a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard设定</a>
+</dt>
 <dt class="cap-guard">记住默认密码,<a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard设定</a>
 </dt>
-<dt class="cap-guard">进阶设置,<a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard设定</a>
+<dt class="cap-guard">重设选项,<a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard设定</a>
 </dt>
 <dt class="cap-guard">默认添加签名到外送电子邮件,<a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard设定</a>
 </dt>
@@ -1920,12 +1973,12 @@
 </dt>
 <dt class="cap-calendar cap-switchboard">拨接约会参与者,<a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">拨接约会参与者</a>
 </dt>
-<dt class="cap-contacts cap-switchboard">拨接联系人中,<a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">拨接联系人</a>
+<dt class="cap-contacts cap-switchboard">拨接联系人,<a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">拨接联系人</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">排程音频/视频会议,<a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">排程音频/视频会议</a>
 </dt>
 </dl></dd>
-<dt class="cap-calendar">Jitsi 设定</dt>
+<dt class="cap-calendar">Jitsi 设置</dt>
 <dd><dl><dt class="cap-calendar">自动复制链接到位置,<a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">日历设定</a>
 </dt></dl></dd>
 </dl>
@@ -1997,7 +2050,7 @@
 </dt>
 <dt class="cap-calendar cap-switchboard">拨接约会参与者,<a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">拨接约会参与者</a>
 </dt>
-<dt class="cap-contacts cap-switchboard">拨接联系人中,<a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">拨接联系人</a>
+<dt class="cap-contacts cap-switchboard">拨接联系人,<a class="indexterm" href="ox.appsuite.user.sect.contacts.call.html">拨接联系人</a>
 </dt>
 <dt class="cap-calendar cap-switchboard">排程音频/视频会议,<a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">排程音频/视频会议</a>
 </dt>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.about.glossary.html b/help/l10n/zh_CN/ox.appsuite.user.sect.about.glossary.html
index f26086ce6..25a435ab0 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.about.glossary.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.about.glossary.html
@@ -105,11 +105,11 @@
 <p role="presentation">包括所有用户的地址数据。视配置而定,每位用户能够在此地址簿里编辑他们的个人数据。</p>
 <p role="presentation">视配置而定,此地址簿能有一个不同的名称,例如:<span class="guilabel"><strong>内部用户</strong></span>或<span class="guilabel"><strong>总地址簿</strong></span>。</p>
 </dd>
-<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">收件夹选项卡</span></dt>
+<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">收件箱类别</span></dt>
 <dd class="glossdef cap-webmail">
 <p role="presentation">收件夹选项卡提供一个保持<span class="guilabel"><strong>收件夹</strong></span>文件夹整齐的简易方式。使用选项卡,外来电子邮件会依照发送人保存到各<span class="guilabel"><strong>收件夹</strong></span>文件夹里。视配置而定,指定收件夹选项卡为预定义的。您能依照需要设置额外收件夹选项卡。</p>
 <p role="presentation">收件夹选项卡只能于<span class="guilabel"><strong>收件夹</strong></span>文件夹里使用。如果您需要更多储存选项,使用文件夹视图去创建电子邮件文件夹。</p>
-<p role="presentation" class="feat-io-ox-core-categories">备注:这里描述的收件夹选项卡只能用于电子邮件。视配置而定,您能够为约会、联系人、与任务使用各自类别。</p>
+<p role="presentation" class="feat-io-ox-core-categories">备注:这里描述的收件夹类别只能用于电子邮件。视配置而定,您能够为电邮、约会、联系人、与任务使用各自的类别。</p>
 <p role="presentation">相关主题:<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">以收件夹类别操作</a></p></li></ul></p>
 </dd>
 <dt id="ox.appsuite.user.reference.about.glossary.folder"><span class="glossterm">文件夹</span></dt>
@@ -143,8 +143,8 @@
 </dd>
 <dt class="feat-io-ox-core-categories" id="ox.appsuite.user.reference.about.glossary.categories"><span class="glossterm">类别</span></dt>
 <dd class="glossdef feat-io-ox-core-categories">
-<p role="presentation">类别能够用于分类约会、联系人、与任务。如此,系统地关联的对象就能够被鉴定与轻易找到。视配置而定,指定类别为预定义的。您能够设置您自己的类别。</p>
-<p role="presentation">备注:那些类别不能用于电子邮件。电子邮件有收件夹选项卡。</p>
+<p role="presentation">类别允许您独立于文件夹结构地,跨应用组织电邮、约会、联系人、与任务。此允许更简单地识别与找到逻辑关联的对象。例如:所有属于一个指定项目或一位指定对象的电邮、约会、联系人、与任务。视配置而定,指定类别为预定义的。您能够设置您自己的类别。</p>
+<p role="presentation">备注:您也能对电邮使用收件夹选项卡。</p>
 <p role="presentation">相关主题:<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a></p></li></ul></p>
 </dd>
 <dt id="ox.appsuite.user.reference.about.glossary.groupware"><span class="glossterm">组件</span></dt>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.create.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.create.html
index 6a11a55ca..3295f20c2 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.create.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.create.html
@@ -70,7 +70,7 @@
 <li class="listitem"><p role="presentation">为了创建一个全天约会,选择<span class="guibutton"><strong>工作周</strong></span>或<span class="guibutton"><strong>周</strong></span>日历视图。单击日历表里的一天。</p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.8.10.7.5.1.3">
 <p role="presentation">视配置而定,您能够分派一个类别到约会。为此,单击<span class="guibutton"><strong>添加类别</strong></span>(在<span class="guibutton"><strong>类别</strong></span>旁边)。选择一个现存类别或创建一个新的。</p>
-<p role="presentation">要删除一个类别,请单击类别旁边的 <span class="guibutton"><strong>删除类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.create.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+<p role="presentation">为了删除一个类别,请单击类别旁边的 <span class="guibutton"><strong>移除类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.create.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
 </li>
 </ul>
 <p id="ox.appsuite.user.example.calendar.add.create">示例:我如何能够以代表身份组织别人的约会?</p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.datepicker.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.datepicker.html
index 3ad586cc8..af1a04743 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.datepicker.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.datepicker.html
@@ -59,7 +59,7 @@
 <li class="listitem"><p role="presentation">单击在页头里的月份名称。将会显示当前年份。</p></li>
 <li class="listitem">
 <p role="presentation">使用<span class="guibutton"><strong>浏览</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.datepicker.browse.year"><object type="image/svg+xml" data="../../images/code.svg" height="15"></object></span>,浏览到需要的年份。</p>
-<p role="presentation">您也能够单击在页头里的一个年份。将会显示一个12个月的时间范围。单击需要的年份。</p>
+<p role="presentation">您也能够单击在页头里的一个年份。将会显示一个十二个月的时间范围。单击需要的年份。</p>
 </li>
 <li class="listitem"><p role="presentation">单击需要的月份。单击需要的日子。</p></li>
 </ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.participants.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.participants.html
index 032be63bc..6768e0394 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.participants.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.participants.html
@@ -62,6 +62,7 @@
 <li class="listitem"><p role="presentation">如果外部参与者接受约会,您将会接收到一个电子邮件。</p></li>
 </ul>
           <p role="presentation" class="feat-io-ox-core-managedResources">备注:于添加一个已管理资源时,预定代表会接收一个此资源的预定请求。于预定代表接受或拒绝您的资源预定请求之同时,您将会被通知。</p>
+          
         </div>
 </div>
 <p id="ox.appsuite.user.tip.calendar.add.participants">提示:要找寻所有参与者或资源的空档,您可以 <a class="link" href="ox.appsuite.user.sect.calendar.add.scheduling.html">使用排程视图</a>。</p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.serial.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.serial.html
index 7de801197..3bd164172 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.serial.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.add.serial.html
@@ -66,13 +66,13 @@
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">一个约会或一个任务应该每两个星期三举行一次。最后一次约会应该是在08-03-2023。</p>
+<p role="presentation">一个约会或一个任务应该每两个星期三举行一次。最后一次约会应该是在 2023 年 3 月 8 日。</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>每周</strong></span>重复</p></li>
 <li class="listitem"><p role="presentation">工作日 <span class="guibutton"><strong>星期三</strong></span></p></li>
 <li class="listitem"><p role="presentation">区隔 <span class="guibutton"><strong>2</strong></span> 周</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>在指定日期</strong></span>结束</p></li>
-<li class="listitem"><p role="presentation">结束于 <span class="guibutton"><strong>08-03-2023</strong></span></p></li>
+<li class="listitem"><p role="presentation">结束于 <span class="guibutton"><strong>2023 年 3 月 8 日</strong></span></p></li>
 </ul>
 </li>
 <li class="listitem">
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.create.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.create.html
index 15313a25a..b9b213cc4 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.create.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.create.html
@@ -103,7 +103,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">日历</span>详细视图</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">创建新约会</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">创建约会</a></p>
 <p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">以代表身份创建、编辑、或管理约会</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">编辑约会</a></p>
 </li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.datepicker.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.datepicker.html
index 24d4d307c..70dc7842e 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.datepicker.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.datepicker.html
@@ -48,7 +48,7 @@
 <p id="ox.appsuite.user.reference.calendar.gui.datepicker"></p>
 <p class="title">内容</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>浏览</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.datepicker.browse"><object type="image/svg+xml" data="../../images/code.svg" height="15"></object></span>。如果单击图标,可以浏览显示的时间范围:一个月、一年、12年。</p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>浏览</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.datepicker.browse"><object type="image/svg+xml" data="../../images/code.svg" height="15"></object></span>。如果单击图标,可以浏览显示的时间范围:一个月、一年、十二年。</p></li>
 <li class="listitem">
 <p role="presentation">如果显示一个月:</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -64,11 +64,11 @@
 <li class="listitem"><p role="presentation">页头包括年。</p></li>
 <li class="listitem"><p role="presentation">会显示月份的名称。</p></li>
 <li class="listitem"><p role="presentation">如果单击一个月份名称,会显示该月。</p></li>
-<li class="listitem"><p role="presentation">如果单击页头的年份,会显示一个12个月的时间范围。</p></li>
+<li class="listitem"><p role="presentation">如果单击页头的年份,会显示一个十二个月的时间范围。</p></li>
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">如果显示一个12个月的时间范围:</p>
+<p role="presentation">如果显示一个十二个月的时间范围:</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">页头包括时间范围的开始与结束。</p></li>
 <li class="listitem"><p role="presentation">会显示时间范围里的年份。</p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.detailview.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.detailview.html
index f08021db4..13d9eae77 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.detailview.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.detailview.html
@@ -97,10 +97,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">在光环视图里显示联系人</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">拨接约会参与者</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">更改约会状态</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">更改约会提醒</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理约会</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.detailview">母主题:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">日历</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.foldertree.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.foldertree.html
index ba37123b4..1ab2ae8b6 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.foldertree.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.foldertree.html
@@ -60,7 +60,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">检视约会</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">添加个人日历</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">使用日历颜色</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理约会</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">创建资源日历与资源日历群组</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.edit.html">编辑资源日历</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">使用资源日历,以创建约会。</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.list.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.list.html
index 1d0203f0d..fcb07b3f9 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.list.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.list.html
@@ -49,11 +49,11 @@
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">日历</span>详细视图</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">在不同的视图里显示约会</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.view.html">显示资源日历</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理约会</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.list">母主题:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">日历</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.minicalendar.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.minicalendar.html
index 528a3fc39..7d845aab8 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.minicalendar.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.minicalendar.html
@@ -45,7 +45,7 @@
 <p id="ox.appsuite.user.reference.calendar.gui.minicalendar"></p>
 <p class="title">内容</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>浏览</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.minicalendar.browse"><object type="image/svg+xml" data="../../images/code.svg" height="15"></object></span>。如果单击图标,可以浏览显示的时间范围:一个月、一年、12年。</p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>浏览</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.minicalendar.browse"><object type="image/svg+xml" data="../../images/code.svg" height="15"></object></span>。如果单击图标,可以浏览显示的时间范围:一个月、一年、十二年。</p></li>
 <li class="listitem">
 <p role="presentation">如果显示一个月:</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -61,11 +61,11 @@
 <li class="listitem"><p role="presentation">页头包括年。</p></li>
 <li class="listitem"><p role="presentation">会显示月份的名称。</p></li>
 <li class="listitem"><p role="presentation">如果单击一个月份名称,会显示该月。</p></li>
-<li class="listitem"><p role="presentation">如果单击页头的年份,会显示一个12个月的时间范围。</p></li>
+<li class="listitem"><p role="presentation">如果单击页头的年份,会显示一个十二个月的时间范围。</p></li>
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">如果显示一个12个月的时间范围:</p>
+<p role="presentation">如果显示一个十二个月的时间范围:</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">页头包括时间范围的开始与结束。</p></li>
 <li class="listitem"><p role="presentation">会显示时间范围里的年份。</p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.new.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.new.html
index 7b1bc982e..f3c656a7d 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.new.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.new.html
@@ -47,10 +47,7 @@
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">创建新约会</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">使用排程视图</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">创建约会</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">订阅谷歌日历</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">订阅公共和共享日历</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.popup.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.popup.html
index eec642a6d..d6f0f2b71 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.popup.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.popup.html
@@ -111,15 +111,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">编辑约会</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">创建一个跟进约会</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">更改约会状态</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">更改约会提醒</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">更改组织者</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">将约会移至另一日历</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">汇出 约会</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">打印约会</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">删除约会</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理约会</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">发送一个电子邮件给约会参与者</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.popup">母主题:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">日历</span>元件</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.toolbar.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.toolbar.html
index 6fe229bc3..10b197cb5 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.toolbar.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.gui.toolbar.html
@@ -71,14 +71,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">编辑约会</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">更改约会提醒</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">更改组织者</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">将约会移至另一日历</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">汇出 约会</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">打印约会</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">删除约会</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理约会</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.toolbar">母主题:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">日历</span>元件</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.invitation.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.invitation.html
index 629328994..af355f036 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.invitation.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.invitation.html
@@ -82,7 +82,7 @@
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">更改约会状态</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">更改约会状态。</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">自定义通知</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.invitation">母主题:<a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">日历</span></i></a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.categories.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.categories.html
new file mode 100644
index 000000000..05b535eb4
--- /dev/null
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.categories.html
@@ -0,0 +1,88 @@
+<html lang="zh_cn">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>对约会使用类别</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="用户向导&gt;">
+<link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="管理约会">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="管理最爱时区">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="使用日历颜色">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">上一页</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">下一页</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">日历</span></h1>
+<h2 class="sr-only">管理约会</h2>
+<div class="sect2" id="ox.appsuite.user.sect.calendar.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">对约会使用类别</h3></div></div></div>
+<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><a class="indexterm" name="id-1.8.15.11.4"></a><p id="ox.appsuite.user.concept.calendar.manage.categories">要独立于日历组织约会,您能够使用类别。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">您能够以类别标记约会。</p></li>
+<li class="listitem"><p role="presentation">您能够显示所有已经标记一个指定类别的约会。</p></li>
+</ul>
+<p>您能够创建、编辑、或删除自己的类别,请看<a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a>。</p>
+<div class="task" id="ox.appsuite.user.task.calendar.manage.categories">
+<p class="title">如何用类别标记约会:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">视视图而定,您有以下可能性:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">在日历视图里单击一个约会。在弹出窗口里单击<span class="guibutton"><strong>编辑约会</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>。</p></li>
+<li class="listitem"><p role="presentation">在列表视图中选择一个约会。在工具条里单击<span class="guibutton"><strong>编辑约会</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>。</p></li>
+</ul></p>
+<p role="presentation">会打开约会编辑窗口。</p>
+</li>
+<li class="step">
+<p role="presentation">为此,单击<span class="guibutton"><strong>添加类别</strong></span>(在<span class="guibutton"><strong>类别</strong></span>旁边)。选择一个类别。</p>
+<p role="presentation">为了从约会移除一个类别,请单击类别旁边的 <span class="guibutton"><strong>移除类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.calendar.categories.view">
+<p class="title">如何显示已经标记一个指定类别的约会:</p>
+<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">视视图而定,您有以下可能性:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">在一个日历视图里,单击一个标记类别的约会。在弹出窗口里,单击类别。</p></li>
+<li class="listitem"><p role="presentation">在一个列表视图里,单击一个标记类别的约会。单击详细视图里的类别。</p></li>
+</ul></p></li></ul></div>
+<div class="taskrelated">
+          <p>结果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">列表视图会显示所有已经标记此类别的约会。</p></li>
+<li class="listitem"><p role="presentation">要显示之前的视图,请在搜寻字段里单击<span class="guibutton"><strong>取消搜寻</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p></li>
+</ul>
+          <p>提示: 您还能使用搜寻选项搜寻一个类别去使用搜寻功能。</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.calendar.manage.categories"></p>
+<p class="title">相关主题:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">搜索约会</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">默认使为新电子邮件用直列 PGP</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">对联系人使用类别</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">对任务使用类别</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.calendar.manage.categories">母主题:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理约会</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.changeorganizer.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
index 7f0f8c0c6..e8f991dc5 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
@@ -59,8 +59,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changeorganizer"></p>
 <p class="title">用户界面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">日历</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">日历</span>列表视图</a></p>
 </li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.changereminder.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.changereminder.html
index 3fc72d63e..385e707cd 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.changereminder.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.changereminder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="管理约会">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="更改约会状态">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="更改约会状态。">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="更改组织者">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -55,9 +55,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changereminder"></p>
 <p class="title">用户界面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">日历</span>工具条</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">日历</span>详细视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">日历</span>列表视图</a></p>
 </li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.changestatus.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.changestatus.html
index 1fbe1b744..a3b9ca91f 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.changestatus.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.changestatus.html
@@ -1,7 +1,7 @@
 <html lang="zh_cn">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>更改约会状态</title>
+<title>更改约会状态。</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">日历</span></h1>
 <h2 class="sr-only">管理约会</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.changestatus">
-<div class="titlepage"><div><div><h3 class="title">更改约会状态</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">更改约会状态。</h3></div></div></div>
 <a class="indexterm" name="id-1.8.15.7.2"></a><a class="indexterm" name="id-1.8.15.7.3"></a><p id="ox.appsuite.user.concept.calendar.manage.changestatus">您也可以在稍后更改您的约会状态。您能够添加一个可见于其他参与者的批注。</p>
 <p id="ox.appsuite.user.hint.calendar.manage.changestatus">备注:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -47,7 +47,7 @@
 <li class="listitem"><p role="presentation">在列表视图中选择一个约会。将会在详细视图里显示约会。</p></li>
 </ul></p></li>
 <li class="step"><p role="presentation">使用以下方法之一:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">要无注释更改约会确认,单击其中一个按钮:<span class="guibutton"><strong>接受</strong></span>、<span class="guibutton"><strong>或许</strong></span>、<span class="guibutton"><strong>拒绝</strong></span>。</p></li>
+<li class="listitem"><p role="presentation">要无更改约会确认,单击其中一个按钮: <span class="guibutton"><strong>接受</strong></span>、<span class="guibutton"><strong>或许</strong></span>、<span class="guibutton"><strong>拒绝</strong></span>。</p></li>
 <li class="listitem">
 <p role="presentation">要带注释更改约会邀请,请单击<span class="guibutton"><strong>添加注释</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.changestatus.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p>
 <p role="presentation">选择其中一个选项:<span class="guibutton"><strong>接受</strong></span>、<span class="guibutton"><strong>或许</strong></span>、<span class="guibutton"><strong>拒绝</strong></span>(在<span class="guilabel"><strong>更改确认</strong></span>窗口里)。如必要,输入一个注释 。</p>
@@ -59,6 +59,7 @@
 <p class="title">用户界面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">日历</span>列表视图</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">日历</span>详细视图</a></p>
 </li></ul>
 <p> </p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.colors.html
index 6282ef755..c7c814a9a 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.colors.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.colors.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="管理约会">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="管理最爱时区">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="对约会使用类别">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.move.html" title="将约会移至另一日历">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.move.html">下一页</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理约会</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.colors">
 <div class="titlepage"><div><div><h3 class="title">使用日历颜色</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">您能够定义一个日历颜色。默认此日历里的所有约会,将会以日历的颜色显示。如果您在创建或编辑约会时分配一个单独颜色,该约会将会以分配的颜色显示,而不是日历的颜色显示。</p>
+<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">您能够定义一个日历颜色。默认此日历里的所有约会,将会以日历的颜色显示。如果您在创建或编辑约会时分配一个单独颜色,该约会将会以分配的颜色显示,而不是日历的颜色显示。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.colors">
 <p class="title">如何选择一种日历颜色:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -42,10 +42,13 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.calendar.manage.colors"></p>
+<p class="title">用户界面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">日历</span>文件夹视图</a></p></li></ul>
+<p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">约会如何再日历视图里显示?</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">日历</span>文件夹视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">约会如何再日历视图里显示?</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.colors">母主题:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理约会</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.delete.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.delete.html
index 16166bd60..8bca0cb18 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.delete.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理约会</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">删除约会</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>警告:</strong></span> 无法<span class="phrase"><strong>恢复</strong></span>已删除的约会。视配置而定,您只能够在您是约会组织者的情况下,在您的私人日历里删除一个约会。</p>
+<a class="indexterm" name="id-1.8.15.17.2"></a><a class="indexterm" name="id-1.8.15.17.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>警告:</strong></span> 无法<span class="phrase"><strong>恢复</strong></span>已删除的约会。视配置而定,您只能够在您是约会组织者的情况下,在您的私人日历里删除一个约会。</p>
 <p id="ox.appsuite.user.concept.calendar.manage.delete">如果您有删除项目的权限,您能够从日历删除约会。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.delete">
 <p class="title">如何删除约会:</p>
@@ -67,8 +67,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.delete"></p>
 <p class="title">用户界面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">日历</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">日历</span>列表视图</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.delete">母主题:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理约会</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.export.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.export.html
index 026a39e4f..e55163541 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.export.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理约会</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.export">
 <div class="titlepage"><div><div><h3 class="title">汇出 约会</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">您能以 iCal 格式里导出约会。您能够使用此格式与其他日历应用程序交换约会。您能够从一个日历导出单一或所有约会。</p>
+<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">您能以 iCal 格式里导出约会。您能够使用此格式与其他日历应用程序交换约会。您能够从一个日历导出单一或所有约会。</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.manage.export.selected">
 <p class="title">如何导出单一约会:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -60,14 +60,16 @@
 <p id="ox.appsuite.user.related.calendar.manage.export"></p>
 <p class="title">用户界面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">日历</span>文件夹视图</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">日历</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">日历</span>列表视图</a></p>
 </li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">导入约会</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.8.15.14.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下载个人数据</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.8.15.15.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下载个人数据</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.manage.export">母主题:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理约会</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.html
index 374871e55..7ff786c49 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="日历">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.folder.import.html" title="从文件导入日历">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="更改约会状态">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="更改约会状态。">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -34,10 +34,11 @@
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">管理约会</h2></div></div></div>
 <a class="indexterm" name="id-1.8.15.2"></a><a class="indexterm" name="id-1.8.15.3"></a><p id="ox.appsuite.user.orientation.calendar.manage">学习如何组织您的约会,与关于可用的约会动作。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">更改约会状态</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">更改约会状态。</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">更改约会提醒</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">更改组织者</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">管理最爱时区</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">对约会使用类别</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">使用日历颜色</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">将约会移至另一日历</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">导入约会</a></p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.import.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.import.html
index fb683ab2c..06dc2f3f2 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.import.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理约会</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.import">
 <div class="titlepage"><div><div><h3 class="title">导入约会</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><a class="indexterm" name="id-1.8.15.13.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">您能从文件以 iCal 格式导入约会。</p>
+<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">您能从文件以 iCal 格式导入约会。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.import">
 <p class="title">如何从 iCal 文件导入约会:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,6 +51,9 @@
         </div>
 </div>
 <p id="ox.appsuite.user.related.calendar.manage.import"></p>
+<p class="title">用户界面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">日历</span>文件夹视图</a></p></li></ul>
+<p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">汇出 约会</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.move.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.move.html
index 2fd41b3cb..3e87a68ad 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.move.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.move.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理约会</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.move">
 <div class="titlepage"><div><div><h3 class="title">将约会移至另一日历</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">您能够移动单一约会到别的日历,但约会系列不行。</p>
+<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">您能够移动单一约会到别的日历,但约会系列不行。</p>
 <p>前提:您有在目标日历创建对象的合适权限。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.move">
 <p class="title">如何移动约会到别的日历:</p>
@@ -52,8 +52,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.move"></p>
 <p class="title">用户界面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">日历</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">日历</span>列表视图</a></p>
 </li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.print.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.print.html
index 19e411ab0..6f23d6aa7 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.print.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理约会</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.print">
 <div class="titlepage"><div><div><h3 class="title">打印约会</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><a class="indexterm" name="id-1.8.15.15.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">要打印日历和约会,您可以:</p>
+<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><a class="indexterm" name="id-1.8.15.16.4"></a><a class="indexterm" name="id-1.8.15.16.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">要打印日历和约会,您可以:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">打印一个含约会的日历表</p></li>
 <li class="listitem"><p role="presentation">打印约会数据</p></li>
@@ -82,9 +82,11 @@
 <p id="ox.appsuite.user.related.calendar.manage.print"></p>
 <p class="title">用户界面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html"><span class="phrase">日历</span>设定菜单</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">日历</span>文件夹视图</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">日历</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">日历</span>列表视图</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.print">母主题:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理约会</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.timezones.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.timezones.html
index 9ca573cde..1e8c13df2 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.timezones.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.manage.timezones.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="管理约会">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="更改组织者">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="使用日历颜色">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="对约会使用类别">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">下一页</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">下一页</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.search.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.search.html
index 0c9ee1817..2e69d68cf 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.search.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.search.html
@@ -73,14 +73,14 @@
 <li class="listitem"><p role="presentation">您能够在搜寻字段里单击<span class="guibutton"><strong>更多搜寻选项</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.search.options.addfilter"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>以添加过滤器和开始一个新搜寻。</p></li>
 <li class="listitem"><p role="presentation">您能够在过滤器旁边单击<span class="guibutton"><strong>移除过滤器</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.search.options.removefilter"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>以移除一个过滤器和开始一个新搜寻。</p></li>
 </ul>
-        <p>为了结束搜寻,单击在输入字段里的<span class="guibutton"><strong>取消搜寻</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.search.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+        <p>为了结束搜寻,单击在搜寻字段里的<span class="guibutton"><strong>取消搜寻</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.search.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
       </div>
 </div>
 <p id="ox.appsuite.user.related.calendar.search"></p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">在不同的视图里显示约会</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">对约会使用类别</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.search">母主题:<a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">日历</span></i></a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.appointments.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.appointments.html
index e7aadbf65..49746cdfd 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.appointments.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.appointments.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">检视约会</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.appointments">
 <div class="titlepage"><div><div><h3 class="title">约会如何再日历视图里显示?</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.9.2"></a><a class="indexterm" name="id-1.8.8.9.3"></a><a class="indexterm" name="id-1.8.8.9.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">以下约会属性定义一个约会在日历视图里的显示方式:</p>
+<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><a class="indexterm" name="id-1.8.8.8.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">以下约会属性定义一个约会在日历视图里的显示方式:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">约会颜色</p>
@@ -62,7 +62,7 @@
 <p role="presentation">一个拒绝的约会将会以灰色显示。主题将会以<span class="guibutton"><strong>已拒绝</strong></span>图标前缀<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.declined"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>。主题被划掉。</p>
 <p role="presentation">在日历设定里,您能定义将要否显示已拒绝约会。</p>
 </li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.6.2.1.6"><p role="presentation">当所有其他参与者都拒绝了一个约会,将会用 <span class="guibutton"><strong>全部拒绝</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>图标来标记该约会。</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.6.2.1.6"><p role="presentation">当所有其他参与者都拒绝了一个约会,将会用 <span class="guibutton"><strong>全部拒绝</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>图标来标记该约会。</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.view.appointments.private"></p>
 <h4 class="title">私人约会显示</h4>
@@ -89,7 +89,7 @@
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.secret"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span>秘密约会</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.unconfirmed"><object type="image/svg+xml" data="../../images/question-circle.svg" height="15"></object></span>未确定约会</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.rejected"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>已拒绝约会</p></li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>被所有参与者拒绝的约会</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>被所有参与者拒绝的约会</p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.view.appointments"></p>
 <p class="title">相关主题:</p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.html
index 60ed32086..4b5834751 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.html
@@ -38,9 +38,6 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.timezones.html">显示多个时区</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">约会如何再日历视图里显示?</a></p></li>
 </ul>
-<p id="ox.appsuite.user.related.calendar.view"></p>
-<p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">日历</span>文件夹视图</a></p></li></ul>
 <p id="ox.appsuite.user.parent.calendar.view">母主题:<a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">日历</span></i></a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.timezones.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.timezones.html
index c8bb5c79f..02fce9425 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.timezones.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.timezones.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">检视约会</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.timezones">
 <div class="titlepage"><div><div><h3 class="title">显示多个时区</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">除了默认时区以外,您能显示您已经添加到最爱的时区。默认时区可以在基本设置里更改。</p>
+<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">除了默认时区以外,您能显示您已经添加到最爱的时区。默认时区可以在基本设置里更改。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.timezones">
 <p class="title">如何在一个日历视图里显示多个时区:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.views.html b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.views.html
index 51c796dc2..b5407bf04 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.views.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.calendar.view.views.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">检视约会</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.views">
 <div class="titlepage"><div><div><h3 class="title">在不同的视图里显示约会</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><a class="indexterm" name="id-1.8.8.7.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">学习如何以各种视图显示一个或多个日历里的约会:</p>
+<a class="indexterm" name="id-1.8.8.6.2"></a><a class="indexterm" name="id-1.8.8.6.3"></a><a class="indexterm" name="id-1.8.8.6.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">学习如何以各种视图显示一个或多个日历里的约会:</p>
 <div class="task" id="ox.appsuite.user.task.calendar.view.views">
 <p class="title">如何检视一个约会:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.add.create.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.add.create.html
index 861bc2179..30e38def4 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.add.create.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.add.create.html
@@ -59,7 +59,7 @@
 <li class="listitem"><p role="presentation">为了要编辑或删除一个图像,单击它。</p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.12.5.7.1.3">
 <p role="presentation">视配置而定,您能够分派一个类别到联系人。为此,单击<span class="guibutton"><strong>添加类别</strong></span>(在<span class="guibutton"><strong>类别</strong></span>旁边)。选择一个现存类别或创建一个新的。</p>
-<p role="presentation">要删除一个类别,请单击类别旁边的 <span class="guibutton"><strong>删除类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.add.create.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+<p role="presentation">为了删除一个类别,请单击类别旁边的 <span class="guibutton"><strong>移除类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.add.create.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
 </li>
 <li class="listitem">
 <p role="presentation">要添加额外输入字段,单击那些元件:</p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.create.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.create.html
index 676ddcf56..622cd23ce 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.create.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.create.html
@@ -80,13 +80,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">编辑窗口</a></p></li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">地址簿</span>详细视图</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">创建一个新联系人</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">添加联系人</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">编辑联系人或通讯组列表</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.create">母主题:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">地址簿</span>元件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.detailview.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.detailview.html
index 026eb5eaa..96bcfbc3d 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.detailview.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.detailview.html
@@ -50,7 +50,7 @@
 </li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.4"><p role="presentation">视配置而定:联系人当前通话之可行性</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.5">
-<p role="presentation">是配置而定:与联系人沟通的图标:</p>
+<p role="presentation">视配置而定:与联系人沟通的图标:</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>电子邮件</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.detailview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>。为撰写电子邮件打开窗口。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>拨接</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.gui.detailview.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>。打开带有拨接功能的菜单。</p></li>
@@ -89,15 +89,11 @@
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">地址簿</span>列表视图</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.create.html">联系人编辑窗口</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">显示一个地址簿的联系人。</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.attachments.html">检视或保存联系人附件</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">拨接联系人</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理联系人</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理联系人</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.detailview">母主题:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">地址簿</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.foldertree.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.foldertree.html
index cfc5c92be..7a74b3278 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.foldertree.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.foldertree.html
@@ -57,6 +57,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">显示一个地址簿的联系人。</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">添加地址簿</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理联系人</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">管理带文件夹的数据</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.list.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.list.html
index f8d0a74af..9930b7273 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.list.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.list.html
@@ -61,11 +61,8 @@
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.settingsmenu.html"><span class="phrase">地址簿</span>设定菜单</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">地址簿</span>详细视图</a></p>
-</li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">显示一个地址簿的联系人。</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理联系人</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.list">母主题:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">地址簿</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.new.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.new.html
index b7d76065c..20fdc18ec 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.new.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.new.html
@@ -47,7 +47,7 @@
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">创建一个新联系人</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">添加联系人</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">创建新通讯组列表</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">订阅到外部地址簿</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">订阅公共和共享地址簿</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.toolbar.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.toolbar.html
index 2c51c58e2..309fb81c9 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.toolbar.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.gui.toolbar.html
@@ -56,13 +56,7 @@
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">编辑联系人或通讯组列表</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">从地址簿选择电子邮件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">邀请联系人到一个约会</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">移动或复制联系人</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">发送 联系人成 vCard</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">汇出 联系人</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.print.html">打印联系人</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.delete.html">删除联系人</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理联系人</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.toolbar">母主题:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">地址簿</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.categories.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.categories.html
new file mode 100644
index 000000000..5cb41f0cf
--- /dev/null
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.categories.html
@@ -0,0 +1,85 @@
+<html lang="zh_cn">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>对联系人使用类别</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="用户向导&gt;">
+<link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="管理联系人">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="邀请联系人到一个约会">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="移动或复制联系人">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">上一页</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">下一页</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">地址簿</span></h1>
+<h2 class="sr-only">管理联系人</h2>
+<div class="sect2" id="ox.appsuite.user.sect.contacts.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">对联系人使用类别</h3></div></div></div>
+<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><p id="ox.appsuite.user.concept.contacts.manage.categories">要独立于文件夹组织联系人,您能够使用类别。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">您能够以类别标记联系人。</p></li>
+<li class="listitem"><p role="presentation">您能够显示所有已经标记一个指定类别的联系人。</p></li>
+</ul>
+<p>您能够创建、编辑、或删除自己的类别,请看<a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a>。</p>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories">
+<p class="title">如何用类别标记联系人:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">选择联系人。在工具条里单击<span class="guibutton"><strong>编辑联系人</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>。</p>
+<p role="presentation">会打开联系人编辑窗口。</p>
+</li>
+<li class="step">
+<p role="presentation">为此,单击<span class="guibutton"><strong>添加类别</strong></span>(在<span class="guibutton"><strong>类别</strong></span>旁边)。选择一个类别。</p>
+<p role="presentation">为了从联系人移除一个类别,请单击类别旁边的 <span class="guibutton"><strong>移除类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories.view">
+<p class="title">如何显示已经标记一个指定类别的联系人:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">选择一个已经标记类别的联系人。</p></li>
+<li class="step"><p role="presentation">单击详细视图里的类别。</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>结果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">列表视图会显示所有已经标记此类别的联系人。</p></li>
+<li class="listitem"><p role="presentation">要显示之前的列表,请在搜寻字段里单击<span class="guibutton"><strong>取消搜寻</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p></li>
+</ul>
+          <p>提示: 您还能使用搜寻选项搜寻一个类别去使用搜寻功能。</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.contacts.manage.categories"></p>
+<p class="title">相关主题:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">搜寻联系人</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">默认使为新电子邮件用直列 PGP</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">对约会使用类别</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">对任务使用类别</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.contacts.manage.categories">母主题:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理联系人</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.delete.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.delete.html
index 5101fbbea..85bcbfb4a 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.delete.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理联系人</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">删除联系人</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>警告:</strong></span>已删除的联系人和分发列表<span class="phrase"><strong>不</strong></span>能被恢复。</p>
+<a class="indexterm" name="id-1.9.17.15.2"></a><a class="indexterm" name="id-1.9.17.15.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>警告:</strong></span>已删除的联系人和分发列表<span class="phrase"><strong>不</strong></span>能被恢复。</p>
 <p id="ox.appsuite.user.concept.contacts.manage.delete">如果您有从此地址簿删除项目的权限,您就能从其删除联系人或通讯组列表。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">您不能够从<span class="guibutton"><strong>所有用户</strong></span>地址簿删除联系人。</p></li>
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.delete"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">地址簿</span>列表视图</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.delete">母主题:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理联系人</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.export.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.export.html
index 8248d7686..4485aa4fa 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.export.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理联系人</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.export">
 <div class="titlepage"><div><div><h3 class="title">汇出 联系人</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">您能够导出联系人或通讯组列表到那些格式:</p>
+<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><a class="indexterm" name="id-1.9.17.13.4"></a><a class="indexterm" name="id-1.9.17.13.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">您能够导出联系人或通讯组列表到那些格式:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">vCard。您能够使用此格式与其他电子邮件应用程序交换联系人。</p></li>
 <li class="listitem"><p role="presentation">CSV 您能使用此格式以导出联系人到试算表格式。</p></li>
@@ -51,7 +51,7 @@
 <li class="step"><p role="presentation">单击<span class="guibutton"><strong>汇出</strong></span>。</p></li>
 </ol></div>
 <div class="taskrelated">
-          <p>结果:已导出带有联系人的 vCard 或 CSV 文件将会在下载文件夹里创建。</p>
+          <p>结果:带有已导出联系人的 vCard 或 CSV 文件将会在下载文件夹里创建。</p>
         </div>
 </div>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.export.folder">
@@ -66,12 +66,16 @@
 <li class="step"><p role="presentation">单击<span class="guibutton"><strong>汇出</strong></span>。</p></li>
 </ol></div>
 <div class="taskrelated">
-          <p>结果:已导出带有联系人的 vCard 或 CSV 文件将会在下载文件夹里创建。</p>
+          <p>结果:带有已导出联系人的 vCard 或 CSV 文件将会在下载文件夹里创建。</p>
         </div>
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.export"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html"><span class="phrase">地址簿</span>文件夹视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">地址簿</span>列表视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -79,7 +83,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">发送 联系人成 vCard</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">导入联系人</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.9.17.12.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下载个人数据</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.9.17.13.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下载个人数据</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.export">母主题:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理联系人</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.html
index 3f1d03e0b..5bb7ab757 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.html
@@ -36,6 +36,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem cap-webmail" id="id-1.9.17.4.1.1"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">从地址簿选择电子邮件</a></p></li>
 <li class="listitem cap-calendar" id="id-1.9.17.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">邀请联系人到一个约会</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">对联系人使用类别</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">移动或复制联系人</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">发送 联系人成 vCard</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">导入联系人</a></p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.import.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.import.html
index 42e5c1d19..b82d3d5f6 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.import.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理联系人</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.import">
 <div class="titlepage"><div><div><h3 class="title">导入联系人</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><a class="indexterm" name="id-1.9.17.11.5"></a><a class="indexterm" name="id-1.9.17.11.6"></a><a class="indexterm" name="id-1.9.17.11.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">您能够从带有以下格式的文件导入联系人:</p>
+<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><a class="indexterm" name="id-1.9.17.12.6"></a><a class="indexterm" name="id-1.9.17.12.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">您能够从带有以下格式的文件导入联系人:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">vCard。备注:</p>
@@ -67,6 +67,9 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.import"></p>
+<p class="title">用户界面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html"><span class="phrase">地址簿</span>文件夹视图</a></p></li></ul>
+<p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">汇出 联系人</a></p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.inviteappointment.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
index c64b01df3..130ab1363 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="管理联系人">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.manage.sendmail.html" title="从地址簿选择电子邮件">
-<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="移动或复制联系人">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="对联系人使用类别">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">下一页</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">下一页</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -48,7 +48,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.inviteappointment"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">地址簿</span>列表视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">地址簿</span>详细视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">创建新约会</a></p></li></ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.movecopy.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.movecopy.html
index 1bf716fb5..862b1ffa6 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.movecopy.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.movecopy.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="管理联系人">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="邀请联系人到一个约会">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="对联系人使用类别">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html" title="发送 联系人成 vCard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">下一页</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理联系人</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.movecopy">
 <div class="titlepage"><div><div><h3 class="title">移动或复制联系人</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><a class="indexterm" name="id-1.9.17.9.4"></a><a class="indexterm" name="id-1.9.17.9.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">您能够移动或复制联系人或通讯组列表到别的地址簿。</p>
+<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><a class="indexterm" name="id-1.9.17.10.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">您能够移动或复制联系人或通讯组列表到别的地址簿。</p>
 <p id="ox.appsuite.user.hints.contacts.manage.movecopy">备注:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">您不能移动或复制联系人或通讯组列表到<span class="guibutton"><strong>所有用户</strong></span>地址簿。</p></li>
@@ -56,7 +56,10 @@
 <p id="ox.appsuite.user.tip.contacts.manage.movecopy">提示:您也能从文件夹视图拖动对象到一个地址簿,以移动选定的对象。</p>
 <p id="ox.appsuite.user.related.contacts.manage.movecopy"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">地址簿</span>列表视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.personal.html">添加个人地址簿</a></p></li></ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.print.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.print.html
index dea05e297..8c0b06e56 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.print.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理联系人</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.print">
 <div class="titlepage"><div><div><h3 class="title">打印联系人</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">你能打印一个或多个联系人的数据。您能在不同打印布局里选择。</p>
+<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">你能打印一个或多个联系人的数据。您能在不同打印布局里选择。</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.print.list">
 <p class="title">如何打印联系人数据:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -48,7 +48,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.print"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html"><span class="phrase">地址簿</span>文件夹视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">地址簿</span>列表视图</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.print">母主题:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理联系人</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.sendmail.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.sendmail.html
index 890910367..20481016d 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.sendmail.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.sendmail.html
@@ -48,7 +48,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendmail"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">地址簿</span>列表视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">地址簿</span>详细视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">发送新电子邮件</a></p></li></ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.sendvcard.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.sendvcard.html
index ded03f9af..2fb966d5b 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.sendvcard.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.manage.sendvcard.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理联系人</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.sendvcard">
 <div class="titlepage"><div><div><h3 class="title">发送 联系人成 vCard</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">您可以发送联系人或通讯组列表成 vCard 附件到电子邮件。</p>
+<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">您可以发送联系人或通讯组列表成 vCard 附件到电子邮件。</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.sendvcard">
 <p class="title">如何作为 vCard 附件发送一个联系人:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,12 +44,15 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendvcard"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">地址簿</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">地址簿</span>列表视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">汇出 联系人</a></p></li>
-<li class="listitem cap-webmail" id="id-1.9.17.10.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">发送新电子邮件</a></p></li>
+<li class="listitem cap-webmail" id="id-1.9.17.11.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">发送新电子邮件</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendvcard">母主题:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理联系人</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.search.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.search.html
index a9eb18009..094bb5fcf 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.search.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.search.html
@@ -74,14 +74,14 @@
 <li class="listitem"><p role="presentation">您能够在搜寻字段里单击<span class="guibutton"><strong>更多搜寻选项</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.search.options.addfilter"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>以添加过滤器和开始一个新搜寻。</p></li>
 <li class="listitem"><p role="presentation">您能够在过滤器旁边单击<span class="guibutton"><strong>移除过滤器</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.search.options.removefilter"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>以移除一个过滤器和开始一个新搜寻。</p></li>
 </ul>
-        <p>为了结束搜寻,单击在输入字段里的<span class="guibutton"><strong>取消搜寻</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.search.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+        <p>为了结束搜寻,单击在搜寻字段里的<span class="guibutton"><strong>取消搜寻</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.search.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
       </div>
 </div>
 <p id="ox.appsuite.user.related.contacts.search"></p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">显示一个地址簿的联系人。</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">对联系人使用类别</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.search">母主题:<a class="xref" href="ox.appsuite.user.chap.contacts.html"><i><span class="phrase">地址簿</span></i></a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.useaddressbook.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.useaddressbook.html
index 8310ddcd7..ae525c542 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.useaddressbook.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.useaddressbook.html
@@ -55,7 +55,7 @@
 <p role="presentation">选择最少一个对象。选中的项目将会在列表下面显示。要取消选择,单击<span class="guibutton"><strong>清除选择</strong></span>。</p>
 <p role="presentation">您也可以使用您系统的多重选择功能。</p>
 </li>
-<li class="step"><p role="presentation">如必要,重复第 2 和第 3 步以找寻与选择更多对象。</p></li>
+<li class="step"><p role="presentation">如必要,重复第二和第三步以找寻与选择更多对象。</p></li>
 <li class="step"><p role="presentation">要自动插入选定对象的电子邮件地址,单击<span class="guibutton"><strong>选择</strong></span>。</p></li>
 </ol></div>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.useaddressdirectory.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.useaddressdirectory.html
index 31de0f5d5..07678709d 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.useaddressdirectory.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.useaddressdirectory.html
@@ -65,7 +65,7 @@
 <p role="presentation">选择最少一个对象。</p>
 <p role="presentation">选中的联系人、通讯组列表、与资源,将会在底部显示成一个列表。您能够从列表移除单一对象。</p>
 </li>
-<li class="step"><p role="presentation">如必要,重复第 2 和第 4 步以找寻与选择更多对象。</p></li>
+<li class="step"><p role="presentation">如必要,重复第二和第四步以找寻与选择更多对象。</p></li>
 <li class="step"><p role="presentation">要自动插入选定对象的电子邮件地址,单击<span class="guibutton"><strong>选择</strong></span>。</p></li>
 </ol></div>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.view.haloview.html b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.view.haloview.html
index ab9606554..b9e88e74b 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.view.haloview.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.contacts.view.haloview.html
@@ -47,7 +47,7 @@
 <li class="listitem"><p role="presentation">姓氏、名字</p></li>
 <li class="listitem"><p role="presentation">业务数据(如有输入)</p></li>
 <li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.4"><p role="presentation">视配置而定:联系人当前通话之可行性</p></li>
-<li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">是配置而定:与联系人沟通的图标:<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem cap-switchboard" id="id-1.9.8.9.5.2.1.2.1.5"><p role="presentation">视配置而定:与联系人沟通的图标:<ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>电子邮件</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.email"><object type="image/svg+xml" data="../../images/envelope.svg" height="15"></object></span>。为撰写电子邮件打开窗口。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>拨接</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>。打开带有拨接功能的菜单。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>邀请</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.view.haloview.invite"><object type="image/svg+xml" data="../../images/calendar-plus.svg" height="15"></object></span>。打开用以创建一个约会的窗口。</p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.dataorganisation.categories.html b/help/l10n/zh_CN/ox.appsuite.user.sect.dataorganisation.categories.html
index f4cd29e66..af0700750 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.dataorganisation.categories.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.dataorganisation.categories.html
@@ -32,15 +32,15 @@
   <h1 class="sr-only">数据组织与共享</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.categories">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">管理类别</h2></div></div></div>
-<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">学习如何管理<a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">类别</a>以分类约会、联系人、与任务。类别有以下属性:</p>
+<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">学习如何管理允许您独立于文件夹结构地,跨应用组织电邮、约会、联系人、与任务的<a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">类别</a>。比如您能够为一个指定项目或一位客户使用自己的类别。类别有以下属性:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">一个包含名称与颜色的类别。</p></li>
 <li class="listitem"><p role="presentation">在搜寻对象时,您能够使用类别为搜寻词。</p></li>
 <li class="listitem"><p role="presentation">视配置而定,指定类别为预定义的。那些类别不能够被编辑或删除。</p></li>
 <li class="listitem"><p role="presentation">您能够创建、编辑、与删除自己的类别。</p></li>
-<li class="listitem"><p role="presentation">您能够分派一个或数个类别到约会、联系人、与任务,之后删除它们。</p></li>
+<li class="listitem"><p role="presentation">您能够分派一个或数个类别到电邮、约会、联系人、与任务,之后删除它们。</p></li>
 </ul>
-<p>备注:那些类别不能用于电子邮件。电子邮件的话,有收件夹类别,清看<a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">以收件夹类别操作</a>。</p>
+<p>备注:您也能对电邮使用收件夹选项卡。一个指定的收件夹类别能够被分派到一个电邮。类别依靠发送人,请看<a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">以收件夹类别操作</a>,</p>
 <p id="ox.appsuite.user.concept.dataorganisation.categories">有以下选项:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">创建一个自己的类别</p></li>
@@ -51,9 +51,15 @@
 <p class="title">如何管理您的类别:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step help-hide-inline">
+<p role="presentation">单击在菜单条右边的<span class="guibutton"><strong>设置</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。会打开<span class="guilabel"><strong>设定</strong></span>窗口。</p>
+<p role="presentation">单击左面里的 <span class="guibutton"><strong>基本</strong></span>。单击<span class="guibutton"><strong>管理类别</strong></span>(在<span class="guibutton"><strong>进阶设定</strong></span>下面)。</p>
+<p role="presentation">您也能够使用以下方法的其中之一:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">选择一个电子邮件。在工具条里单击 <span class="guibutton"><strong>添加类别</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>。选择<span class="guibutton"><strong>管理类别</strong></span>。</p></li>
+<li class="listitem">
 <p role="presentation">创建或编辑一个约会、联系人、或任务,以打开其编辑窗口。</p>
 <p role="presentation">为此,单击<span class="guibutton"><strong>添加类别</strong></span>(在<span class="guibutton"><strong>类别</strong></span>旁边)。选择<span class="guibutton"><strong>管理类别</strong></span>。</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">您也能够使用<span class="guibutton"><strong>管理类别</strong></span>按钮(在<span class="guibutton"><strong>进阶设定</strong></span>下面的常规设定里)。</p></li></ul>
+</li>
+</ul></p>
 <p role="presentation">会打开<span class="guilabel"><strong>管理类别</strong></span>窗口。</p>
 </li>
 <li class="step">
@@ -68,21 +74,12 @@
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">创建新约会</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">创建一个新联系人</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">创建新任务</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">编辑约会</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">编辑联系人或通讯组列表</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">编辑任务</a></p>
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">默认使为新电子邮件用直列 PGP</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">对约会使用类别</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">对联系人使用类别</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">对任务使用类别</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">调整常规设定</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">搜索约会</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">搜寻联系人</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">搜索任务</a></p>
-</li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.categories">母主题:<a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>数据组织与共享</i></a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.content.html b/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.content.html
index 48dc26c7e..7b3bb695d 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.content.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.content.html
@@ -71,6 +71,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">检视<span class="phrase">云盘</span>文件夹内容</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">显示文件内容</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">组织文件与<span class="phrase">云盘</span>文件夹</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">管理带文件夹的数据</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">分享数据</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.foldertree.html b/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.foldertree.html
index cc3e233ab..608c471ec 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.foldertree.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.foldertree.html
@@ -45,7 +45,7 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>我的文件</strong></span>。包括您的文件和文件和文件夹。默认是包括文档、音乐、图像、和视频的文件夹。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>我的分享</strong></span>。显示您与其他用户和外部联系人分享的文件和文件夹。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>我的附件</strong></span>。显示您发送或接收电子邮件的文件附件。</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>垃圾筒</strong></span>。包括您删除了的文件和文件夹。</p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>垃圾桶</strong></span>。包括您删除了的文件和文件夹。</p></li>
 <li class="listitem">
 <p role="presentation"><span class="guibutton"><strong>共享文件</strong></span>。包括与其他用户分享的文件。</p>
 <p role="presentation">如果分享数据来自别的组件安装,用户名称将会以别的域名延申。</p>
@@ -68,6 +68,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">云盘</span>:创建文件夹</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">订阅公共与共享<span class="phrase">云盘</span>文件夹</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">组织文件与<span class="phrase">云盘</span>文件夹</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">管理带文件夹的数据</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">分享数据</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.toolbar.html b/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.toolbar.html
index cacd5222e..8041289c9 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.toolbar.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.toolbar.html
@@ -68,20 +68,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">检视<span class="phrase">云盘</span>文件夹内容</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">显示文件内容</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.send.html">以电子邮件附件发送档案</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">编辑文件名称</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">创建或编辑描述</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.move.html">移动文件或<span class="phrase">云盘</span>文件夹</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.copy.html">复制文件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">保存文件成 PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">打印文件成 PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.addportal.html">添加文件到门户</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.favorite.html">添加文件或<span class="phrase">云盘</span>文件夹到最爱</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.delete.html">删除文件或<span class="phrase">云盘</span>文件夹</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.lock.html">锁起或解锁文件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">处理版本</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">组织文件与<span class="phrase">云盘</span>文件夹</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">加密或解密文件</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.toolbar">母主题:<a class="xref" href="ox.appsuite.user.sect.drive.gui.html"><span class="phrase">云盘</span>部件</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.viewer.html b/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.viewer.html
index 3f3b068bd..947d3dee6 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.viewer.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.drive.gui.viewer.html
@@ -87,13 +87,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">显示文件内容</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">举行一场演讲</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">编辑文件名称</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">创建或编辑描述</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">保存文件成 PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">打印文件成 PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">处理版本</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">组织文件与<span class="phrase">云盘</span>文件夹</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">分享数据</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.viewer">母主题:<a class="xref" href="ox.appsuite.user.sect.drive.gui.html"><span class="phrase">云盘</span>部件</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.drive.search.html b/help/l10n/zh_CN/ox.appsuite.user.sect.drive.search.html
index 6419abca9..dba9cca1d 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.drive.search.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.drive.search.html
@@ -68,7 +68,7 @@
 <li class="listitem"><p role="presentation">您能够在搜寻字段里单击<span class="guibutton"><strong>更多搜寻选项</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.drive.search.options.addfilter"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>以添加过滤器和开始一个新搜寻。</p></li>
 <li class="listitem"><p role="presentation">您能够在过滤器旁边单击<span class="guibutton"><strong>移除过滤器</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.drive.search.options.removefilter"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>以移除一个过滤器和开始一个新搜寻。</p></li>
 </ul>
-        <p>为了结束搜寻,单击在输入字段里的<span class="guibutton"><strong>取消搜寻</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.drive.search.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+        <p>为了结束搜寻,单击在搜寻字段里的<span class="guibutton"><strong>取消搜寻</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.drive.search.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
       </div>
 </div>
 <p id="ox.appsuite.user.related.drive.search"></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.create.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.create.html
index 6a4af6849..8b738a533 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.create.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.create.html
@@ -56,7 +56,7 @@
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>抄送</strong></span>, <span class="guibutton"><strong>密送</strong></span>按钮。打开或关闭<span class="guibutton"><strong>抄送</strong></span>或<span class="guibutton"><strong>密送</strong></span>输入字段。</p></li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>RE</strong></span>按钮。打开<span class="guibutton"><strong>回复给</strong></span>到输入字段。</p>
+<p role="presentation"><span class="guibutton"><strong>AW</strong></span>按钮。打开<span class="guibutton"><strong>回复给</strong></span>到输入字段。</p>
 <p role="presentation">您的电子邮件回复将发送到输入字段中输入的电子邮件地址。</p>
 </li>
 <li class="listitem">
@@ -77,6 +77,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>发送</strong></span>。发送电子邮件给输入的收件人。</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.13.5.1.5"><p role="presentation"><span class="guibutton"><strong>稍后发送</strong></span>。打开允许您选择电邮应该何时发送的一个菜单。</p></li>
 <li class="listitem">
 <p role="presentation">按钮条</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -108,17 +109,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">编辑窗口</a></p></li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">发送新电子邮件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">回复电子邮件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">转发电子邮件</a></p>
-<p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">于撰写电子邮件时使用人工智能功能</a></p>
-<p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">以代表身份发送或接收电子邮件</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">发送电子邮件</a></p>
 <p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">发送已加密电子邮件</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.email.gui.create">母主题:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">电子邮件</span>元件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.detailview.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.detailview.html
index 23d223e64..37ab2873e 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.detailview.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.detailview.html
@@ -57,6 +57,7 @@
 <li class="listitem">
 <p role="presentation">视配置而定,以下功能之一将会可用:</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>设置类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>.. 打开带有分派一个类别或用来管理类别的菜单。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>设置颜色</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>。打开菜单,允许您用颜色标签到电子邮件上。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>标示</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span> 。标示电子邮件。</p></li>
 </ul>
@@ -74,6 +75,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation">如果选择<span class="guibutton"><strong>已发送</strong></span>文件夹里一个带有链接形式附件的电子邮件,将会在电子邮件文本顶部显示附件的信息。</p></li>
+<li class="listitem"><p role="presentation">视配置而定:如可用,将会显示已分派类别。</p></li>
 <li class="listitem">
 <p role="presentation">电子邮件文本</p>
 <p role="presentation">之前电子邮件的引用会于行首标记。</p>
@@ -87,15 +89,11 @@
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html"><span class="phrase">电子邮件</span>弹出窗口</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">电子邮件编辑窗口</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">检视电子邮件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">回复电子邮件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">检视或保存电子邮件附件</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.detailview">母主题:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">电子邮件</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.foldertree.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.foldertree.html
index 18a567cab..3c21a55c0 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.foldertree.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.foldertree.html
@@ -43,13 +43,15 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>收件箱</strong></span>。默认情况下,所有外来电子邮件会到达此文件夹。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>草稿</strong></span>。包括保存成草稿的电子邮件。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>已发送</strong></span>。包括您已发送的电子邮件。</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>垃圾筒</strong></span>。包括您已删除的电子邮件。</p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>垃圾桶</strong></span>。包括您已删除的电子邮件。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>存档</strong></span>。包括您已删除的电子邮件。此文件夹将会与初次归档一个电子邮件时被自动创建。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>我的文件夹</strong></span>。包括您创建的电子邮件文件夹。此文件夹将会与初次创建一个电子邮件时被自动创建。</p></li>
 </ul>
 <p>视配置与电子邮件设定而定,可能有更多文件夹可用。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">未读电子邮件的文件夹、标出消息的文件夹</p></li>
+<li class="listitem"><p role="presentation">标出消息的文件夹</p></li>
+<li class="listitem"><p role="presentation">未读消息的文件夹</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.7.5.2.3"><p role="presentation">将会稍后发送消息的文件夹</p></li>
 <li class="listitem"><p role="presentation">您订阅了的共享与公共电子邮件文件夹。</p></li>
 <li class="listitem"><p role="presentation">来自管理员派发给您的功能性电子邮件户口之文件夹。</p></li>
 </ul>
@@ -62,10 +64,10 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">检视电子邮件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">添加电子邮件文件夹</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">停用或启用功能性电子邮件户口</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">停用或启用功能性电子邮件户口</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">管理带文件夹的数据</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">分享数据</a></p>
 </li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.html
index fdaae9770..2ac9d4d80 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.html
@@ -39,7 +39,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">新建电子邮件按钮</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">电子邮件</span>文件夹视图</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html"><span class="phrase">电子邮件</span>选项卡视图</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">收件夹类别条</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html"><span class="phrase">电子邮件</span>弹出窗口</a></p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.list.html
index 9b5b7fbd8..829c2aa19 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.list.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.list.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="电子邮件元件">
-<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="电子邮件选项卡视图">
+<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="收件夹类别条">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.detailview.html" title="电子邮件详细视图">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -46,6 +46,7 @@
 <li class="listitem"><p role="presentation">以下详情会在每一封电子邮件里显示:发送人、收件人、接收的日期。未读电子邮件会标示<span class="guibutton"><strong>未读</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span>。</p></li>
 <li class="listitem"><p role="presentation">一个发送人名称上的工具提示显示其电子邮件地址。</p></li>
 <li class="listitem"><p role="presentation">如果可用,会显示额外信息:附件图标、有色标签或标记、<a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">帖子</a>的电子邮件数目、优先级。</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.10.5.1.7"><p role="presentation">如可用,将会显示已分派类别。在电子邮件设置里,您能指定在列表视图里要否显示已分派类别。</p></li>
 <li class="listitem"><p role="presentation">已加密电子邮件会标记已加密图标 <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.encrypted"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span>。</p></li>
 <li class="listitem">
 <p role="presentation">如果启用了假期通知,会在列表视图上面显示一个通知。</p>
@@ -63,12 +64,9 @@
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html"><span class="phrase">电子邮件</span>设定菜单</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">检视电子邮件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.list">母主题:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">电子邮件</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.new.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.new.html
index b280d981c..a88f0c29a 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.new.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.new.html
@@ -47,7 +47,7 @@
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">发送新电子邮件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">发送电子邮件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">添加电子邮件户口</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">检视或保存电子邮件附件</a></p>
 </li></ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.popup.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.popup.html
index 97ae86e8e..f6c56ee78 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.popup.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.popup.html
@@ -63,8 +63,7 @@
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">拨接发送人/别的收件人</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">拨接发送人/别的收件人</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">在光环视图里显示联系人</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.popup">母主题:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">电子邮件</span>元件</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.settingsmenu.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.settingsmenu.html
index 827dc4639..901cc1a71 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.settingsmenu.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.settingsmenu.html
@@ -54,7 +54,6 @@
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">添加电子邮件户口</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">检视或保存电子邮件附件</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.tabs.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.tabs.html
index bfca6273f..771d0d492 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.tabs.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.tabs.html
@@ -1,7 +1,7 @@
 <html lang="zh_cn">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>电子邮件选项卡视图</title>
+<title>收件夹类别条</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
@@ -33,22 +33,18 @@
 <h2 class="sr-only">
 <span class="phrase">电子邮件</span>元件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.tabs">
-<div class="titlepage"><div><div><h3 class="title">
-<span class="phrase">电子邮件</span>选项卡视图</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">收件夹类别条</h3></div></div></div>
 <a class="indexterm" name="id-1.7.8.9.2"></a><p id="ox.appsuite.user.concept.email.gui.tabs">为在<span class="guibutton"><strong>收件箱</strong></span>文件夹里的电子邮件显示预定义收件夹选项卡。这允许您分派外来电子邮件到以发送人排序的某个选项卡。</p>
 <p id="ox.appsuite.user.reference.email.gui.tabs"></p>
 <p class="title">备注:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">视配置而定,收件夹选项卡可能不可用。</p></li>
-<li class="listitem"><p role="presentation">如果选项卡可用,您就能显示或隐藏收件夹选项卡条。为此,在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>收件箱类别</strong></span>。</p></li>
+<li class="listitem"><p role="presentation">如果收件夹类别可用,您就能显示或隐藏收件夹类别条。为此,在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>收件箱类别</strong></span>。</p></li>
 <li class="listitem"><p role="presentation">收件夹选项卡号、名称、与其顺序为预设的。视设置而定,有些收件夹选项卡能更名或停用。</p></li>
 </ul>
 <p id="ox.appsuite.user.related.email.gui.tabs"></p>
 <p class="title">相关主题:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">以收件夹类别操作</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">以收件夹类别操作</a></p></li></ul>
 <p id="ox.appsuite.user.reference.email.gui.tabs.parent">母主题:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">电子邮件</span>元件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.toolbar.html
index aff43c611..6fb4aa720 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.toolbar.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.gui.toolbar.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="电子邮件元件">
 <link rel="prev" href="ox.appsuite.user.sect.email.gui.foldertree.html" title="电子邮件文件夹视图">
-<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="电子邮件选项卡视图">
+<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="收件夹类别条">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -43,7 +43,8 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>存档</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.archive"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span> 。存档您选择的电子邮件。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>回复</strong></span>与<span class="guibutton"><strong>转发</strong></span>选中电子邮件的图标:<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">视配置而定:<span class="guibutton"><strong>人工智能整合</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>。打开带有编辑电子邮件内容的人工智能功能菜单。</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>设置类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>。打开允许您移动一个电子邮件到一个类别的菜单。此图标只会在收件箱选项卡条显示时可用。</p></li>
+<li class="listitem"><p role="presentation">视配置而定:<span class="guibutton"><strong>设置收件夹类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.inboxcategories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>。打开允许您移动一个电子邮件到一个类别的菜单。此图标只会在收件箱选项卡条显示时可用。</p></li>
+<li class="listitem"><p role="presentation">视配置而定:<span class="guibutton"><strong>设置类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>。打开带有分派一个类别或用来管理类别的菜单。</p></li>
 <li class="listitem"><p role="presentation">视配置而定:<span class="guibutton"><strong>设置颜色</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>。打开菜单允许您用颜色标签到选中的电子邮件上。</p></li>
 <li class="listitem"><p role="presentation">视配置而定:<span class="guibutton"><strong>标签</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>。标示电子邮件。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>移动</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.moveto"><object type="image/svg+xml" data="../../images/folder-symlink.svg" height="15"></object></span>。移动选中的电子邮件到别的文件夹。</p></li>
@@ -55,25 +56,12 @@
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html"><span class="phrase">电子邮件</span>选项卡视图</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">回复电子邮件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">转发电子邮件</a></p>
 </li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">于回复电子邮件时使用人工智能功能</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">移动或复制电子邮件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">标记电子邮件成已读或未读</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">分类电子邮件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">显示电子邮件原始码</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">使用电子邮件草稿</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">创建电子邮件提醒</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">添加电子邮件到门户</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">保存电子邮件</a></p>
-<p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">导出电子邮件成 PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">打印电子邮件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">删除电子邮件</a></p>
-</li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">于回复电子邮件时使用人工智能功能</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.toolbar">母主题:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">电子邮件</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.addportal.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.addportal.html
index a37e60afe..51d68fbae 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.addportal.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.addportal.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理电子邮件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.addportal">
 <div class="titlepage"><div><div><h3 class="title">添加电子邮件到门户</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.15.2"></a><a class="indexterm" name="id-1.7.15.15.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">您可以添加一个电子邮件小部件到门户。</p>
+<a class="indexterm" name="id-1.7.15.16.2"></a><a class="indexterm" name="id-1.7.15.16.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">您可以添加一个电子邮件小部件到门户。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.addportal">
 <p class="title">如何添加电子邮件到门户:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,7 +46,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.addportal"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.add.html">添加门户小部件</a></p></li></ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.archive.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.archive.html
index 466177281..ddf462d6b 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.archive.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.archive.html
@@ -33,9 +33,9 @@
 <h2 class="sr-only">管理电子邮件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.archive">
 <div class="titlepage"><div><div><h3 class="title">电子邮件归档中</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.20.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">在存档电子邮件时,那些电子邮件会移动到<span class="guibutton"><strong>存档</strong></span>文件夹。<span class="guibutton"><strong>归档</strong></span>文件夹每年度个别包含一个子文件夹。归档电子邮件保存到以收件年份排序的子文件夹里。<span class="guibutton"><strong>归档</strong></span>文件夹在您初次使用此功能时立刻创建。有以下选项:</p>
+<a class="indexterm" name="id-1.7.15.21.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">在存档电子邮件时,那些电子邮件会移动到<span class="guibutton"><strong>存档</strong></span>文件夹。<span class="guibutton"><strong>归档</strong></span>文件夹每年度个别包含一个子文件夹。归档电子邮件保存到以收件年份排序的子文件夹里。<span class="guibutton"><strong>归档</strong></span>文件夹在您初次使用此功能时立刻创建。有以下选项:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">存档一个文件夹的超过 90 天电子邮件。</p></li>
+<li class="listitem"><p role="presentation">存档一个文件夹的超过九十天电子邮件。</p></li>
 <li class="listitem"><p role="presentation">激活单一电子邮件</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.archivefolder">
@@ -57,6 +57,13 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.archive"></p>
+<p class="title">用户界面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">电子邮件</span>文件夹视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p>
+</li></ul>
+<p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">打印电子邮件</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.archive">母主题:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.categories.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.categories.html
new file mode 100644
index 000000000..3673d21ec
--- /dev/null
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.categories.html
@@ -0,0 +1,90 @@
+<html lang="zh_cn">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>默认使为新电子邮件用直列 PGP</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="用户向导&gt;">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理电子邮件">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="收集地址">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="分类电子邮件">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">上一页</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">下一页</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">电子邮件</span></h1>
+<h2 class="sr-only">管理电子邮件</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">默认使为新电子邮件用直列 PGP</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.categories">要独立于文件夹组织电邮,您能够使用类别。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">您能够以类别标记电邮。</p></li>
+<li class="listitem"><p role="presentation">您能够检视所有已经标记一个指定类别的电邮。</p></li>
+</ul>
+<p>您能够创建、编辑、或删除自己的类别,请看<a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a>。</p>
+<p id="ox.appsuite.user.tip.email.manage.categories">独立于类别,您能够使用收件夹类别。有了收件夹类别,您就能组织关联发送人的电邮,请看<a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">以收件夹类别操作</a>。</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.mark">
+<p class="title">如何用类别标记电邮:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">选择一封或多封电子邮件。</p></li>
+<li class="step">
+<p role="presentation">在工具条里单击 <span class="guibutton"><strong>设定类别</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.mark.add"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>。选择一个类别。</p>
+<p role="presentation">要从电邮移除一个类别,请单击类别。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.view">
+<p class="title">如何显示已经标记一个指定类别的电邮:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">选择一个已经标记类别的电邮。</p></li>
+<li class="step"><p role="presentation">单击详细视图里的类别。</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>结果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">列表视图会显示所有已经标记此类别的电邮。</p></li>
+<li class="listitem"><p role="presentation">每一个电邮,都将会显示包含该电邮的文件夹。</p></li>
+<li class="listitem"><p role="presentation">要显示之前的列表,请在搜寻字段里单击<span class="guibutton"><strong>取消搜寻</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p></li>
+</ul>
+          <p>提示: 您还能使用搜寻选项搜寻一个类别去使用搜寻功能。</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.categories"></p>
+<p class="title">用户界面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p>
+</li></ul>
+<p> </p>
+<p class="title">相关主题:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">搜寻电子邮件</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">对约会使用类别</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">对联系人使用类别</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">对任务使用类别</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.categories">母主题:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.collectaddress.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.collectaddress.html
index 04d386cda..17def8fdb 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.collectaddress.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.collectaddress.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理电子邮件">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.mark.html" title="标记电子邮件成已读或未读">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="分类电子邮件">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="默认使为新电子邮件用直列 PGP">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.mark.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">下一页</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.categories.html">下一页</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -35,7 +35,7 @@
 <div class="titlepage"><div><div><h3 class="title">收集地址</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.10.2"></a><a class="indexterm" name="id-1.7.15.10.3"></a><p id="ox.appsuite.user.concept.email.manage.collectaddress">有以下选项:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">在电子邮件设定里,激活在发送或接收电子邮件时自动收集新邮件地址。</p></li>
+<li class="listitem"><p role="presentation">在进阶电子邮件设定里,激活在发送或接收电子邮件时自动收集新邮件地址。</p></li>
 <li class="listitem"><p role="presentation">手动添加电子邮件地址到一个地址簿。</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.collectaddress">
@@ -51,7 +51,7 @@
           <p>备注:此功能只为新联系人可用。</p>
         </div>
 </div>
-<p role="presentation" class="cap-contacts"><p class="title">相关主题:</p><ul class="itemizedlist" style="list-style-type: none; ">
+<p role="presentation" class="cap-contacts"><p class="title">用户界面:</p><ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p></li></ul> <p class="title">相关主题:</p><ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">创建一个新联系人</a></p></li>
 </ul></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.delete.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.delete.html
index 4c9c89bf8..55841821b 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.delete.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.delete.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理电子邮件">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.archive.html" title="电子邮件归档中">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="清理电子邮件文件夹">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.recover.html" title="恢复电邮中">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.archive.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">下一页</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.recover.html">下一页</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,20 +33,20 @@
 <h2 class="sr-only">管理电子邮件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">删除电子邮件</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.21.2"></a><a class="indexterm" name="id-1.7.15.21.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">有以下选项:</p>
+<a class="indexterm" name="id-1.7.15.22.2"></a><a class="indexterm" name="id-1.7.15.22.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">有以下选项:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">定义电子邮件删除后要移动到垃圾桶还是永久移除。</p>
-<p role="presentation">移动到垃圾桶的电子邮件能够恢复。</p>
+<p role="presentation">您能够定义电邮要否于删除时,移动到垃圾桶或永久移除。</p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">移动到垃圾桶的电邮能够恢复。</p></li>
+<li class="listitem"><p role="presentation"><span class="cap-dumpster">永久删除的电邮能在14天内恢复。当此时段过去后:</span><span class="phrase"><strong>无法</strong></span>恢复永久删除的电子邮件。</p></li>
+</ul>
 </li>
-<li class="listitem"><p role="presentation">删除个别电子邮件或整个电子邮件交谈。</p></li>
-<li class="listitem"><p role="presentation">删除一个电子邮件文件夹的所有邮件。</p></li>
-<li class="listitem"><p role="presentation">从垃圾桶恢复电子邮件。</p></li>
-<li class="listitem"><p role="presentation">从垃圾筒永久性删除电子邮件。</p></li>
-<li class="listitem"><p role="presentation">以清空垃圾桶从垃圾桶永久删除所有电子邮件。</p></li>
+<li class="listitem"><p role="presentation">您能够删除单一电邮或整个交谈。</p></li>
+<li class="listitem"><p role="presentation">您能够删除一个电邮文件夹里的所有电邮。</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.delete.setting">
-<p class="title">如何定义电子邮件删除后要移动到垃圾桶还是永久移除。</p>
+<p class="title">如何定义电邮要否于删除时,移动到垃圾桶或永久移除:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.setting"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
@@ -56,25 +56,25 @@
 <p role="presentation">单击左面里的 <span class="guibutton"><strong>邮件</strong></span>。</p>
 <p role="presentation">在右面单击<span class="guibutton"><strong>进阶设定</strong></span>。</p>
 </li>
-<li class="step"><p role="presentation">定义于删除电子邮件时的行为:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">如果电子邮件要移动到垃圾桶,就停用<span class="guibutton"><strong>永久移除已删除电子邮件</strong></span>。</p></li>
+<li class="step"><p role="presentation">定义于删除电邮时的行为:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">如果电邮要移动到垃圾桶里,停用<span class="guibutton"><strong>永久移除已删除电邮</strong></span>。</p></li>
 <li class="listitem">
-<p role="presentation">如果电子邮件要永久删除,就启用<span class="guibutton"><strong>永久移除已删除电子邮件</strong></span>。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span><span class="phrase"><strong>无法</strong></span>恢复永久删除的电子邮件。</p>
+<p role="presentation">如果要永久删除电邮,启用<span class="guibutton"><strong>永久移除已删除电邮</strong></span>。</p>
+<p role="presentation"><span class="phrase"><strong>警告:</strong></span>视配置而定,<span class="phrase"><strong>不能</strong></span>恢复永久删除的电子邮件。</p>
 </li>
 </ul></p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.delete">
-<p class="title">如何删除一个电子邮件:</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.single">
+<p class="title">如何删除单一电邮:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">选择一封或多封电子邮件。</p></li>
 <li class="step">
-<p role="presentation">在工具条里单击<span class="guibutton"><strong>删除</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
+<p role="presentation">在工具条里单击<span class="guibutton"><strong>删除</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
 <p role="presentation">或:<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">按下您键盘上的 [Del] 或 [Backspace] 按键。</p></li>
-<li class="listitem"><p role="presentation">在电子邮件的上下文菜单里,单击<span class="guibutton"><strong>删除</strong></span>。</p></li>
-<li class="listitem"><p role="presentation">如果您选中一个电子邮件,使用详细视图里的<span class="guibutton"><strong>删除</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p></li>
+<li class="listitem"><p role="presentation">在电邮的上下文菜单中,单击<span class="guibutton"><strong>删除</strong></span> 。</p></li>
+<li class="listitem"><p role="presentation">如果您选中一个电子邮件,使用详细视图里的<span class="guibutton"><strong>删除</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p></li>
 </ul></p>
 </li>
 </ol></div>
@@ -82,27 +82,27 @@
           <p>结果:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">如果设定<a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>永久移除已删除电子邮件</strong></span></a>为停用:</p>
+<p role="presentation">如果<span class="guibutton"><strong>永久移除已删除的电邮</strong></span>为停用:</p>
 <p role="presentation">电子邮件移动到垃圾桶文件夹。</p>
 </li>
 <li class="listitem">
-<p role="presentation">如果设定<span class="guibutton"><strong>永久移除已删除电子邮件</strong></span>为启用:</p>
-<p role="presentation">您将会被问要否永久删除电子邮件。</p>
+<p role="presentation">如果<span class="guibutton"><strong>永久移除已删除的电邮</strong></span>为启用:</p>
+<p role="presentation">您将会被询问要否永久删除电邮。</p>
 </li>
 </ul>  
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptyfolder">
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.emptyfolder">
 <p class="title">如何删除文件夹内的所有电子邮件:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">在文件夹视图中选择您要删除电子邮件的文件夹。</p></li>
 <li class="step">
 <p role="presentation">使用以下方法之一:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">单击文件夹名称旁边的<span class="guibutton"><strong>动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
-<li class="listitem"><p role="presentation">在列表上单击<span class="guibutton"><strong>更多动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
+<li class="listitem"><p role="presentation">单击文件夹名称旁边的<span class="guibutton"><strong>动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
+<li class="listitem"><p role="presentation">单击列表上的<span class="guibutton"><strong>更多动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
 </ul></p>
 <p role="presentation">单击<span class="guibutton"><strong>删除所有消息</strong></span>按钮。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span>如果设定<a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>永久移除已删除电子邮件</strong></span></a>为启用,就不能恢复已删除电子邮件。</p>
+<p role="presentation"><span class="phrase"><strong>警告:</strong></span>如果<span class="guibutton"><strong>永久移除已删除的电邮</strong></span>为启用,视配置而定,已删除电邮就<span class="phrase"><strong>不能</strong></span>恢复。</p>
 </li>
 <li class="step"><p role="presentation">确定您要删除此文件夹的内容。</p></li>
 </ol></div>
@@ -110,70 +110,32 @@
           <p>结果:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">如果设定<a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>永久移除已删除电子邮件</strong></span></a>为停用:</p>
+<p role="presentation">如果<span class="guibutton"><strong>永久移除已删除的电邮</strong></span>为停用:</p>
 <p role="presentation">电子邮件移动到垃圾桶文件夹。</p>
 </li>
 <li class="listitem">
-<p role="presentation">如果设定<span class="guibutton"><strong>永久移除已删除电子邮件</strong></span>为启用:</p>
-<p role="presentation">电子邮件将被永久删除。</p>
+<p role="presentation">如果<span class="guibutton"><strong>永久移除已删除的电邮</strong></span>为启用:</p>
+<p role="presentation">电邮将被永久删除。</p>
 </li>
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
-<p class="title">如何恢复已删除的电子邮件:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">从文件夹视图里打开<span class="guibutton"><strong>垃圾桶</strong></span>文件夹。</p></li>
-<li class="step"><p role="presentation">选择一封或多封电子邮件。</p></li>
-<li class="step"><p role="presentation">在电子邮件的上下文菜单里,单击<span class="guibutton"><strong>移动</strong></span>。</p></li>
-<li class="step"><p role="presentation">在<span class="guilabel"><strong>移动</strong></span>窗口选择一个文件夹。单击<span class="guibutton"><strong>移动</strong></span>按钮。</p></li>
-</ol></div>
-<div class="taskrelated">
-          <p>或:</p>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">为了从垃圾桶恢复所有电子邮件,单击列表上面的 <span class="guibutton"><strong>更多动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。单击<span class="guibutton"><strong>移动所有消息</strong></span>按钮。</p></li>
-<li class="listitem"><p role="presentation">如果您选中一个电子邮件,使用详细视图里的<span class="guibutton"><strong>更多动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。单击<span class="guibutton"><strong>移动</strong></span>。</p></li>
-</ul>
-        </div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever">
-<p class="title">如何永久删除一个电子邮件:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>警告:</strong></span><span class="phrase"><strong>无法</strong></span>恢复永久删除的电子邮件。</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">从文件夹视图里打开<span class="guibutton"><strong>垃圾桶</strong></span>文件夹。</p></li>
-<li class="step"><p role="presentation">选择一封或多封电子邮件。</p></li>
-<li class="step">
-<p role="presentation">在工具条里单击<span class="guibutton"><strong>删除</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
-<p role="presentation">如果您选定单个电子邮件,您也能使用详细视图里的<span class="guibutton"><strong>删除</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
-</li>
-<li class="step"><p role="presentation">确定您要永久删除选中的电子邮件。</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptytrash">
-<p class="title">如何从垃圾桶文件夹永久删除内容:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>警告:</strong></span><span class="phrase"><strong>无法</strong></span>恢复永久删除的电子邮件。</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">从文件夹视图里选择<span class="guibutton"><strong>垃圾桶</strong></span>文件夹。</p></li>
-<li class="step">
-<p role="presentation">使用以下方法之一:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">单击<span class="guibutton"><strong>更多动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>(在<span class="guibutton"><strong>垃圾桶</strong></span>旁边)。</p></li>
-<li class="listitem"><p role="presentation">在列表上单击<span class="guibutton"><strong>更多动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
-</ul></p>
-<p role="presentation">单击<span class="guibutton"><strong>清空文件夹</strong></span>。</p>
-</li>
-<li class="step"><p role="presentation">确定您要删除文件夹的内容。</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.email.manage.delete"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">电子邮件</span>文件夹视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理电子邮件文件夹</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">恢复电邮中</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">删除电子邮件</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.22.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">恢复永久删除的电邮</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理电子邮件文件夹</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.email.manage.delete">母主题:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.deleteforever.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.deleteforever.html
new file mode 100644
index 000000000..46ed772de
--- /dev/null
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.deleteforever.html
@@ -0,0 +1,87 @@
+<html lang="zh_cn">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>删除电子邮件</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="用户向导&gt;">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理电子邮件">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.recover.html" title="恢复电邮中">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.undelete.html" title="恢复永久删除的电邮">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.recover.html">上一页</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.undelete.html">下一页</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">电子邮件</span></h1>
+<h2 class="sr-only">管理电子邮件</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.deleteforever">
+<div class="titlepage"><div><div><h3 class="title">删除电子邮件</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.24.2"></a><a class="indexterm" name="id-1.7.15.24.3"></a><p id="ox.appsuite.user.concept.email.manage.deleteforever">有以下选项:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">从垃圾桶永久性删除单一电邮。</p></li>
+<li class="listitem"><p role="presentation">以清空垃圾桶从垃圾桶永久删除所有电邮。</p></li>
+</ul>
+<p id="ox.appsuite.user.hint.email.manage.deleteforever.html"><span class="cap-dumpster">永久删除的电邮能在14天内恢复。当此时段过去后:</span><span class="phrase"><strong>不能</strong></span>恢复永久删除的电子邮件。</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.single">
+<p class="title">如何永久删除单一电邮:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">从文件夹视图里打开<span class="guibutton"><strong>垃圾桶</strong></span>文件夹。</p></li>
+<li class="step"><p role="presentation">选择一封或多封电子邮件。</p></li>
+<li class="step">
+<p role="presentation">在工具条里单击<span class="guibutton"><strong>删除</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
+<p role="presentation">如果您选定单个电子邮件,您也能使用详细视图里的<span class="guibutton"><strong>删除</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
+</li>
+<li class="step"><p role="presentation">确定您要删除选中的电邮。</p></li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.emptytrash">
+<p class="title">如何从垃圾桶永久删除所有电邮:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">从文件夹视图里选择<span class="guibutton"><strong>垃圾桶</strong></span>文件夹。</p></li>
+<li class="step">
+<p role="presentation">使用以下方法之一:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">单击<span class="guibutton"><strong>更多动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>(在<span class="guibutton"><strong>垃圾桶</strong></span>旁边)。</p></li>
+<li class="listitem"><p role="presentation">单击列表上的<span class="guibutton"><strong>更多动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
+</ul></p>
+<p role="presentation">单击<span class="guibutton"><strong>清空文件夹</strong></span>。</p>
+</li>
+<li class="step"><p role="presentation">确定您要删除文件夹的内容。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.deleteforever"></p>
+<p class="title">用户界面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">电子邮件</span>文件夹视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
+</li></ul>
+<p> </p>
+<p class="title">相关主题:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">删除电子邮件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">恢复电邮中</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.24.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">恢复永久删除的电邮</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理电子邮件文件夹</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.deleteforever">母主题:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.draft.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.draft.html
index 57e278a06..10b0d653f 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.draft.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.draft.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理电子邮件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.draft">
 <div class="titlepage"><div><div><h3 class="title">使用电子邮件草稿</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">于撰写一个电子邮件时,电子邮件会定时自动保存成一个草稿。有以下选项:</p>
+<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">于撰写一个电子邮件时,电子邮件会定时自动保存成一个草稿。有以下选项:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">编辑或发送一个电子邮件草稿。</p></li>
 <li class="listitem"><p role="presentation">编辑或发送一个电子邮件草稿副本。</p></li>
@@ -64,7 +64,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.draft"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">电子邮件</span>文件夹视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.expungefolder.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.expungefolder.html
index 6386d2ca6..0b0256daa 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.expungefolder.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.expungefolder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理电子邮件">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="删除电子邮件">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.undelete.html" title="恢复永久删除的电邮">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.unifiedmail.html" title="使用统一邮件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.undelete.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">下一页</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理电子邮件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.expungefolder">
 <div class="titlepage"><div><div><h3 class="title">清理电子邮件文件夹</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.22.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">视电子邮件客户端设置而定,您在一个像 Apple Mail、MS Outlook、或 Mozilla Thunderbird 的电子邮件客户端删除的电子邮件,可能只会在从客户端注销后才会删除。暂时那些电子邮件将会在组件里以勾销显示。要删除那些电子邮件,清理该电子邮件文件夹。</p>
+<a class="indexterm" name="id-1.7.15.26.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">视电子邮件客户端设置而定,您在一个像 Apple Mail、MS Outlook、或 Mozilla Thunderbird 的电子邮件客户端删除的电子邮件,可能只会在从客户端注销后才会删除。暂时那些电子邮件将会在组件里以勾销显示。要删除那些电子邮件,清理该电子邮件文件夹。</p>
 <p id="ox.appsuite.user.hint.email.manage.expungefolder">备注:视配置而定,因为电子邮件不会显示,所以此功能不可用。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.expunge">
 <p class="title">如何清理一个电子邮件文件夹:</p>
@@ -43,6 +43,9 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.expungefolder"></p>
+<p class="title">用户界面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">电子邮件</span>文件夹视图</a></p></li></ul>
+<p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">删除电子邮件</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.expungefolder">母主题:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.html
index c32af9dfe..efbe3cb0f 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.html
@@ -38,17 +38,21 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">移动或复制电子邮件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">标记电子邮件成已读或未读</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">收集地址</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">默认使为新电子邮件用直列 PGP</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">分类电子邮件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">显示电子邮件原始码</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">使用电子邮件草稿</a></p></li>
-<li class="listitem cap-tasks" id="id-1.7.15.4.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">创建电子邮件提醒</a></p></li>
+<li class="listitem cap-tasks" id="id-1.7.15.4.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">创建电子邮件提醒</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">添加电子邮件到门户</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">保存电子邮件</a></p></li>
-<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">导出电子邮件成 PDF</a></p></li>
+<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">导出电子邮件成 PDF</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">导入 电子邮件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">打印电子邮件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">电子邮件归档中</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">删除电子邮件</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">恢复电邮中</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">删除电子邮件</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.4.1.19"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">恢复永久删除的电邮</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理电子邮件文件夹</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">使用统一邮件</a></p></li>
 </ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.import.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.import.html
index 7c7a0af4e..b2e1f2798 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.import.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理电子邮件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.import">
 <div class="titlepage"><div><div><h3 class="title">导入 电子邮件</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><p id="ox.appsuite.user.concept.email.manage.import">您可以汇入一个 EML 格式的电子邮件。</p>
+<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.import">您可以汇入一个 EML 格式的电子邮件。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.import">
 <p class="title">如何汇入一个电子邮件:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -42,6 +42,12 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.import"></p>
+<p class="title">用户界面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">电子邮件</span>文件夹视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p>
+</li></ul>
+<p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">保存电子邮件</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.import">母主题:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.inboxcategories.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.inboxcategories.html
index ab01548bc..f138ad7c9 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.inboxcategories.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.inboxcategories.html
@@ -39,7 +39,7 @@
 <li class="listitem"><p role="presentation">分派外来电子邮件到收件箱类别</p></li>
 <li class="listitem"><p role="presentation">编辑收件夹选项卡类别</p></li>
 </ul>
-<p role="presentation" class="feat-io-ox-core-categories">备注:这里描述的收件夹类别只能用于电子邮件。视配置而定,您能够为约会、联系人、与任务使用各自类别。请看<a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a>。</p>
+<p role="presentation" class="feat-io-ox-core-categories">备注:这里描述的收件夹类别只能用于电子邮件。视配置而定,您能够为电邮、约会、联系人、与任务使用各自类别。请看<a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">默认使为新电子邮件用直列 PGP</a>。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.inboxcategories.activate">
 <p class="title">如何启用或停用收件夹选项卡:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -47,7 +47,7 @@
 <p role="presentation">要启用收件夹选项卡,在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.activate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>收件箱类别</strong></span>。</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">您也能够在电子邮件设定里,使用 <span class="guibutton"><strong>配置收件夹类别</strong></span> 按钮(在<span class="guibutton"><strong>阅读</strong></span>下面)。</p></li></ul>
 <p role="presentation">会打开<span class="guilabel"><strong>配置类别</strong></span>窗口。会显示可用收件夹类别。单击<span class="guibutton"><strong>启用类别</strong></span>。</p>
-<p role="presentation">一个选项卡条将会在菜单条下的右面显示。</p>
+<p role="presentation">在菜单条下,将会显示收件夹类别。</p>
 </li>
 <li class="step">
 <p role="presentation">要停用收件夹选项卡,在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.deactivate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>收件箱类别</strong></span>。</p>
@@ -63,7 +63,7 @@
 <p role="presentation">还没有分派到一个收件夹类别的电子邮件,会在<span class="guibutton"><strong>通用</strong></span>选项卡里显示。</p>
 </li>
 <li class="step">
-<p role="presentation">从列表视图拖动一个电子邮件到选项卡条的一个选项卡,然后放在那里。</p>
+<p role="presentation">从列表视图拖动一个电子邮件到收件夹类别条的一个类别,然后放在那里。</p>
 <p role="presentation">您也能选择一个电子邮件。在工具条里单击 <span class="guibutton"><strong>设定类别</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>。从菜单里选择一个选项卡。</p>
 </li>
 <li class="step"><p role="presentation">为了结束进程,进行以下动作之一:<ul class="itemizedlist" style="list-style-type: disc; ">
@@ -77,14 +77,14 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>收件箱类别</strong></span>。</p>
-<p role="presentation">您也能单击类别条里的<span class="guibutton"><strong>配置类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p>
+<p role="presentation">您也能单击收件夹类别条里的<span class="guibutton"><strong>配置类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p>
 <p role="presentation">会打开<span class="guilabel"><strong>配置类别</strong></span>窗口。</p>
 </li>
 <li class="step">
 <p role="presentation">要启用或停用一个收件夹类别,启用或停用对应的复选框。</p>
 <p role="presentation">要更名一个收件夹类别,编辑对应文本。</p>
 <p role="presentation">备注:一些类别不能编辑。</p>
-<p role="presentation">为了隐藏类别条,单击<span class="guibutton"><strong>停用类别</strong></span>。</p>
+<p role="presentation">为了隐藏收件夹类别条,单击<span class="guibutton"><strong>停用类别</strong></span>。</p>
 </li>
 <li class="step"><p role="presentation">单击 <span class="guibutton"><strong>保存</strong></span>。</p></li>
 </ol></div>
@@ -93,14 +93,11 @@
 <p class="title">用户界面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html"><span class="phrase">电子邮件</span>设定菜单</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html"><span class="phrase">电子邮件</span>选项卡视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">收件夹类别条</a></p>
 </li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">检视电子邮件</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.inboxcategories">母主题:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.label.html
index 8aead3444..1c19d0352 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.label.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.label.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理电子邮件">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="收集地址">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="默认使为新电子邮件用直列 PGP">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.source.html" title="显示电子邮件原始码">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.categories.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.source.html">下一页</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理电子邮件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.label">
 <div class="titlepage"><div><div><h3 class="title">分类电子邮件</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.label">视配置而定,您能够使用以下选项之一以分类电子邮件:</p>
+<a class="indexterm" name="id-1.7.15.12.2"></a><a class="indexterm" name="id-1.7.15.12.3"></a><p id="ox.appsuite.user.concept.email.manage.label">视配置而定,您能够使用以下选项之一以分类电子邮件:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">一个有色标签</p></li>
 <li class="listitem"><p role="presentation">一个标志</p></li>
@@ -64,7 +64,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.label"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.mark.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.mark.html
index 09c3ee602..556977162 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.mark.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.mark.html
@@ -57,7 +57,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.mark"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">检视电子邮件</a></p></li></ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.movecopy.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.movecopy.html
index c9e4972a7..c9c0249ea 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.movecopy.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.movecopy.html
@@ -62,7 +62,11 @@
 </ul>
 <p id="ox.appsuite.user.related.email.manage.movecopy"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.pdfexport.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.pdfexport.html
index cd9126824..246037229 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.pdfexport.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.pdfexport.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理电子邮件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.pdfexport">
 <div class="titlepage"><div><div><h3 class="title">导出电子邮件成 PDF</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.17.2"></a><a class="indexterm" name="id-1.7.15.17.3"></a><a class="indexterm" name="id-1.7.15.17.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">备注:视配置而定,此功能可能不可用。</p>
+<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><a class="indexterm" name="id-1.7.15.18.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">备注:视配置而定,此功能可能不可用。</p>
 <p id="ox.appsuite.user.concept.email.manage.pdfexport">您能够导出一个电子邮件与其docx格式附件成 PDF。于PDF文件被创建的同时,它将会在您定义的<span class="phrase">云盘</span>文件夹里。视数据容量而定,下载可能需时片刻。一旦进程完成, 您将会接收一个通知。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.pdfexport">
 <p class="title">如何导出电子邮件成 PDF:</p>
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.pdfexport"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">保存电子邮件</a></p></li></ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.print.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.print.html
index 55e497ac7..f141e7e36 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.print.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理电子邮件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.print">
 <div class="titlepage"><div><div><h3 class="title">打印电子邮件</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.print">您能够打印一个或多个电子邮件的内容。</p>
+<a class="indexterm" name="id-1.7.15.20.2"></a><a class="indexterm" name="id-1.7.15.20.3"></a><p id="ox.appsuite.user.concept.email.manage.print">您能够打印一个或多个电子邮件的内容。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.print">
 <p class="title">如何打印电子邮件内容:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.print"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">电子邮件归档中</a></p></li></ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.recover.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.recover.html
new file mode 100644
index 000000000..36afcbb0b
--- /dev/null
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.recover.html
@@ -0,0 +1,92 @@
+<html lang="zh_cn">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>恢复电邮中</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="用户向导&gt;">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理电子邮件">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="删除电子邮件">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="删除电子邮件">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">上一页</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">下一页</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">电子邮件</span></h1>
+<h2 class="sr-only">管理电子邮件</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.recover">
+<div class="titlepage"><div><div><h3 class="title">恢复电邮中</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.recover">有以下选项:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">从垃圾桶恢复单一电邮。</p></li>
+<li class="listitem"><p role="presentation">从垃圾桶恢复所有电邮。</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.single">
+<p class="title">如何从垃圾桶恢复单一电邮:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">从文件夹视图里打开<span class="guibutton"><strong>垃圾桶</strong></span>文件夹。</p></li>
+<li class="step">
+<p role="presentation">选择一封或多封电子邮件。</p>
+<p role="presentation">在电邮的上下文菜单中,单击<span class="guibutton"><strong>移动</strong></span> 。</p>
+</li>
+<li class="step"><p role="presentation">在<span class="guilabel"><strong>移动</strong></span>窗口选择一个文件夹。单击<span class="guibutton"><strong>移动</strong></span>。</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>或:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">使用拖放从垃圾桶移动电邮到一个文件夹视图里的文件夹里。</p></li>
+<li class="listitem"><p role="presentation">如果您选中一个电子邮件,使用详细视图里的<span class="guibutton"><strong>更多动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.single.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。单击<span class="guibutton"><strong>移动</strong></span>。</p></li>
+</ul>
+        </div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.all">
+<p class="title">如何从垃圾桶恢复所有电邮:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">从文件夹视图里选择<span class="guibutton"><strong>垃圾桶</strong></span>文件夹。</p></li>
+<li class="step">
+<p role="presentation">使用以下方法之一:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">单击<span class="guibutton"><strong>更多动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>(在<span class="guibutton"><strong>垃圾桶</strong></span>旁边)。</p></li>
+<li class="listitem"><p role="presentation">单击列表上的<span class="guibutton"><strong>更多动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
+</ul></p>
+<p role="presentation">单击<span class="guibutton"><strong>移动所有消息</strong></span>按钮。</p>
+</li>
+<li class="step"><p role="presentation">在<span class="guilabel"><strong>移动</strong></span>窗口选择一个文件夹。单击<span class="guibutton"><strong>移动所有</strong></span>。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.recover"></p>
+<p class="title">用户界面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">电子邮件</span>文件夹视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
+</li></ul>
+<p> </p>
+<p class="title">相关主题:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">删除电子邮件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">删除电子邮件</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.23.7.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">恢复永久删除的电邮</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理电子邮件文件夹</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.recover">母主题:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.reminder.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.reminder.html
index 45a0d48e1..ffa97bc0c 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.reminder.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.reminder.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理电子邮件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.reminder">
 <div class="titlepage"><div><div><h3 class="title">创建电子邮件提醒</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">您能够为一封电子邮件激活一个提醒。此功能创建一个任务和提醒您截止日期。</p>
+<a class="indexterm" name="id-1.7.15.15.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">您能够为一封电子邮件激活一个提醒。此功能创建一个任务和提醒您截止日期。</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.email.manage.reminder">
 <p class="title">如何创建一个电子邮件提醒:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -47,7 +47,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.reminder"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">创建新任务</a></p></li></ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.save.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.save.html
index a966c6dd1..84ff1cfde 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.save.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.save.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理电子邮件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.save">
 <div class="titlepage"><div><div><h3 class="title">保存电子邮件</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.16.2"></a><p id="ox.appsuite.user.concept.email.manage.save">您可以保存电子邮件成文本档案。文版档案有 eml 的文件延伸。如果您选择多个电子邮件,将会为每一个电子邮件创建一个 eml 文件。eml 文件将会保存在一个 zip 存档里。</p>
+<a class="indexterm" name="id-1.7.15.17.2"></a><p id="ox.appsuite.user.concept.email.manage.save">您可以保存电子邮件成文本档案。文版档案有 eml 的文件延伸。如果您选择多个电子邮件,将会为每一个电子邮件创建一个 eml 文件。eml 文件将会保存在一个 zip 存档里。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.save">
 <p class="title">如何保存电子邮件:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,7 +44,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.save"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -52,7 +55,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">导入 电子邮件</a></p>
 <p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">导出电子邮件成 PDF</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.7.15.16.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下载个人数据</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.7.15.17.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下载个人数据</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.save">母主题:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.source.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.source.html
index 63f4b339b..5e916d900 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.source.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.source.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理电子邮件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.source">
 <div class="titlepage"><div><div><h3 class="title">显示电子邮件原始码</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.12.2"></a><p id="ox.appsuite.user.concept.email.manage.source">电子邮件原始码包含一个电子邮件的完整内容:完整电子邮件标头数据。</p>
+<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.source">电子邮件原始码包含一个电子邮件的完整内容:完整电子邮件标头数据。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.source">
 <p class="title">如何显示电子邮件原始码:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,7 +46,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.source"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">电子邮件</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.undelete.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.undelete.html
new file mode 100644
index 000000000..221efe4dd
--- /dev/null
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.undelete.html
@@ -0,0 +1,70 @@
+<html lang="zh_cn">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>恢复永久删除的电邮</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="用户向导&gt;">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理电子邮件">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="删除电子邮件">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="清理电子邮件文件夹">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">上一页</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">下一页</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">电子邮件</span></h1>
+<h2 class="sr-only">管理电子邮件</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.undelete">
+<div class="titlepage"><div><div><h3 class="title">恢复永久删除的电邮</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.25.2"></a><a class="indexterm" name="id-1.7.15.25.3"></a><p id="ox.appsuite.user.concept.email.manage.undelete.html">您能够在14天内恢复永久删除的电邮。当此时段过去后,永久删除的电邮就不可挽回地失去。</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
+<p class="title">如何恢复永久删除的电邮:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">从文件夹视图里选择<span class="guibutton"><strong>垃圾桶</strong></span>文件夹。</p></li>
+<li class="step">
+<p role="presentation">单击<span class="guibutton"><strong>更多动作</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>(在<span class="guibutton"><strong>垃圾桶</strong></span>旁边)。</p>
+<p role="presentation">单击<span class="guibutton"><strong>恢复已删除项目</strong></span>。</p>
+</li>
+<li class="step">
+<p role="presentation">在<span class="guilabel"><strong>恢复已删除项目</strong></span>窗口里,选择要恢复的电邮。</p>
+<p role="presentation">单击<span class="guibutton"><strong>移动已删除项目</strong></span>。</p>
+</li>
+<li class="step">
+<p role="presentation">在<span class="guilabel"><strong>移动</strong></span>窗口里,指定应该包含已恢复电邮的文件夹。</p>
+<p role="presentation">单击<span class="guibutton"><strong>移动</strong></span>。</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.undelete"></p>
+<p class="title">用户界面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">电子邮件</span>文件夹视图</a></p></li></ul>
+<p> </p>
+<p class="title">相关主题:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">删除电子邮件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">恢复电邮中</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">删除电子邮件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理电子邮件文件夹</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.undelete">母主题:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理电子邮件</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.unifiedmail.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.unifiedmail.html
index d8d0b1f3a..81df96fb6 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.unifiedmail.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.manage.unifiedmail.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理电子邮件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.unifiedmail">
 <div class="titlepage"><div><div><h3 class="title">使用统一邮件</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">使用统一邮件您可以在一个中央文件夹里,显示多个电子邮件户口的邮件。这样您可以快速概观多个电子邮件户口收件夹。统一邮件可以如以下描述:</p>
+<a class="indexterm" name="id-1.7.15.27.2"></a><a class="indexterm" name="id-1.7.15.27.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">使用统一邮件您可以在一个中央文件夹里,显示多个电子邮件户口的邮件。这样您可以快速概观多个电子邮件户口收件夹。统一邮件可以如以下描述:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">除了一个电子邮件户口收件夹,<span class="guibutton"><strong>统一邮件</strong></span>文件夹显示一个户口电子邮件的更多视图。电子邮件只会显示一次。</p></li>
 <li class="listitem"><p role="presentation">在收件夹子文件夹里的电子邮件,不会再<span class="guibutton"><strong>统一邮件</strong></span>文件夹内显示。</p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.openai.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.openai.html
index 2dcb81f55..27ac3a92a 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.openai.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.openai.html
@@ -37,7 +37,7 @@
 <li class="listitem"><p role="presentation">编辑现存电子邮件内容或用文本建议以回复它们</p></li>
 <li class="listitem"><p role="presentation">用创建的文本建议发送新电子邮件</p></li>
 </ul>
-<p>备注:于使用人工智能时,对应电子邮件的内容将会发送到Microsoft Azure OpenAI Service</p>
+<p>备注:于使用人工智能整合时,对应电邮的内容将会发送到一个OpenAI服务去。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">于您初次使用一个人工智能功能时,会打开一个发送此数据的同意对话盒。您只能于同意发送数据后使用人工智能功能。</p></li>
 <li class="listitem"><p role="presentation">您能够更改您的合意以随时发送数据。为此,单击<span class="guibutton"><strong>更改合意</strong></span>(在电子邮件设定里的<span class="guibutton"><strong>人工智能整合</strong></span>下面)。</p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.search.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.search.html
index 7cf8f26a9..5d410a4c2 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.search.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.search.html
@@ -86,14 +86,17 @@
 <li class="listitem"><p role="presentation">您能够在搜寻字段里单击<span class="guibutton"><strong>更多搜寻选项</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.search.options.addfilter"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>以添加过滤器和开始一个新搜寻。</p></li>
 <li class="listitem"><p role="presentation">您能够在过滤器旁边单击<span class="guibutton"><strong>移除过滤器</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.search.options.removefilter"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>以移除一个过滤器和开始一个新搜寻。</p></li>
 </ul>
-        <p>为了结束搜寻,单击在输入字段里的<span class="guibutton"><strong>取消搜寻</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.search.options.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+        <p>为了结束搜寻,单击在搜寻字段里的<span class="guibutton"><strong>取消搜寻</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.search.options.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
       </div>
 </div>
 <p id="ox.appsuite.user.related.email.search"></p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">检视电子邮件</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">分类电子邮件</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">分类电子邮件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">默认使为新电子邮件用直列 PGP</a></p>
+</li>
 </ul>
 <p id="ox.appsuite.user.parent.email.search">母主题:<a class="xref" href="ox.appsuite.user.chap.email.html"><i><span class="phrase">电子邮件</span></i></a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.send.attendees.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.send.attendees.html
index 9a5c0c986..90f2fa564 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.send.attendees.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.send.attendees.html
@@ -47,14 +47,14 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.send.attendees"></p>
-<p class="title">相关主题:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
+<p class="title">用户界面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">日历</span>弹出窗口</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">日历</span>工具条</a></p>
-</li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">发送新电子邮件</a></p></li>
-</ul>
+</li></ul>
+<p> </p>
+<p class="title">相关主题:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">发送新电子邮件</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.send.attendees">母主题:<a class="xref" href="ox.appsuite.user.sect.email.send.html">发送电子邮件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.send.new.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.send.new.html
index edb427f4f..98da098d9 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.send.new.html
@@ -88,7 +88,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">新建电子邮件按钮</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">电子邮件编辑窗口</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">从属动作:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">自动从一个地址簿添加联系人或资源</a></p>
@@ -104,18 +104,7 @@
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">回复电子邮件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">转发电子邮件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">自动转发电子邮件</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">发送一个电子邮件给约会参与者</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">自动发送假期通知</a></p>
-<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">发送已加密电子邮件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">发送 联系人成 vCard</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">从地址簿选择电子邮件</a></p>
-</li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">于撰写电子邮件时使用人工智能功能</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">于撰写电子邮件时使用人工智能功能</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">电子邮件设定</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.send.new">母主题:<a class="xref" href="ox.appsuite.user.sect.email.send.html">发送电子邮件</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.send.replyto.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.send.replyto.html
index 5a22cfc83..e0125ec08 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.send.replyto.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.send.replyto.html
@@ -39,10 +39,10 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">在电子邮件编辑窗口中,点击发件人地址旁边的 <span class="guibutton"><strong>RE</strong></span>。将会显示<span class="guibutton"><strong>回复</strong></span>输入字段。</p>
-<p role="presentation">如果您在编辑主要电子邮件账户时指定了默认的回复地址,<span class="guibutton"><strong>回复</strong></span> 输入框会自动显示出来。输入字段包括预设回复地址。</p>
+<p role="presentation">如果您在编辑主要电子邮件账户时指定了预设的回复地址,<span class="guibutton"><strong>回复</strong></span> 输入框会自动显示出来。输入字段包括预设回复地址。</p>
 </li>
 <li class="step">
-<p role="presentation">在 <span class="guibutton"><strong>回复</strong></span> 输入框中,输入您希望收件人回复您的电子邮件的电子邮件地址。<ul class="itemizedlist" style="list-style-type: disc; ">
+<p role="presentation">在 <span class="guibutton"><strong>回复</strong></span> 输入框中,输入回复您的电子邮件的应该发送到的地址。<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">在输入收件人时,将会显示匹配的提议。要接受一个提议,单击它。</p></li>
 <li class="listitem"><p role="presentation">要从一个地址簿选择联系人,单击输入字段右边的<span class="guibutton"><strong>选择联系人</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.replyto.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span>。</p></li>
 </ul></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.settings.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.settings.html
index 7dd50592e..d9ddb9d92 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.settings.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.settings.html
@@ -50,8 +50,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.composereply">撰写于回复</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.20.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">模板</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.rules">规则</a></p></li>
-<li class="listitem feat-zoom" id="id-1.7.20.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">人工智能整合</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.7.20.5.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">进阶设置</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">人工智能整合</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">进阶设置</a></p></li>
 </ul>
 <p>也请参阅:<a class="xref" href="ox.appsuite.user.sect.settings.search.html">搜寻设置</a></p>
 <p id="ox.appsuite.user.reference.email.settings.reading"></p>
@@ -63,8 +63,9 @@
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.list"><b>联系人图像、选择框、简单. </b>定义显示联系人图像、复选框、或以上元素皆非,将会显示在列表视图里。</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.preview"><b>显示文本预览. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.2.1.2"></a>定义邮件内容的第一个词将会否显示在电子邮件列表视图里。</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>永远显示日期与时间. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>定义是否不止接收日期而且还有时间将会显示在电子邮件列表视图里。</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>显示消息大小. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>定义邮件大小将会否在电子邮件列表视图里显示。</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.20.6.2.1.2.1.3.1.3"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>显示类别. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>定义分派到电邮类别,将会否在电邮列表视图里显示。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>永远显示日期与时间. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>定义是否不止接收日期而且还有时间将会显示在电子邮件列表视图里。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>显示消息大小. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.5.1.2"></a>定义邮件大小将会否在电子邮件列表视图里显示。</p></li>
 </ul>
 </li>
 <li class="listitem">
@@ -75,10 +76,10 @@
 </ul>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>标记为已读. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>定义选择电子邮件后将会自动标记成已读的间隔。</p>
+<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>标记为“已读”. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>定义选择电子邮件后将会自动标记成已读的间隔。</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.immediately"><b>立刻. </b>电子邮件将会标记为已读。</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.seconds"><b>5 秒后、20 秒后. </b>电子邮件将会于定义的间隔后标记为已读。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.seconds"><b>五秒后、二十秒后. </b>电子邮件将会于定义的间隔后标记为已读。</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.never"><b>从不. </b>电子邮件将会自动标记为已读。</p></li>
 </ul>
 </li>
@@ -119,7 +120,7 @@
 <p id="ox.appsuite.user.reference.email.settings.composereply.compose.undosend"><b>取消发送. </b><a class="indexterm" name="id-1.7.20.8.2.1.3.1.2"></a>定义电子邮件将要即时发送或于一个小延迟后。</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.composereply.compose.undosend.immediately"><b>不带延迟. </b>电子邮件将会立刻发送。您不能撤销电子邮件的发送。</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.composereply.compose.undosend.seconds"><b>5 秒后、10 秒后. </b>电子邮件将会于选定延迟后发送。您能够于此时段内撤销发送电子邮件。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.composereply.compose.undosend.seconds"><b>五秒后、十秒后. </b>电子邮件将会于选定延迟后发送。您能够于此时段内撤销发送电子邮件。</p></li>
 </ul>
 </div></li>
 </ul>
@@ -144,8 +145,8 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.html"><b>允许显示 HTML 格式的电子邮件. </b><a class="indexterm" name="id-1.7.20.12.2.1.1.1.2"></a>. 指定是否允许显示 HTML 邮件。</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>显示阅读回执请求. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>指定如果一个接收的电子邮件包含邮件送达回执时,要否显示一个送达回执。</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>永久移除已删除的电子邮件. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>定义已删除电子邮件将会永久移除,还是移到垃圾筒文件夹。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span>永久移除的电子邮件消息不能被恢复。</p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>永久移除已删除的电子邮件. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>定义已删除电子邮件将会永久移除,还是移到垃圾桶文件夹。</p>
+<p role="presentation"><span class="phrase"><strong>警告:</strong></span>视配置而定,<span class="bold">不能</span>恢复永久删除的电子邮件。</p>
 <p role="presentation">请参阅 <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">删除电子邮件</a></p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.selectrecent"><b>开始时自动选择最新读取消息. </b><a class="indexterm" name="id-1.7.20.12.2.1.4.1.2"></a>定义于开始应用时,将会否自动选择最近读取消息。</p></li>
@@ -156,7 +157,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.mailinglist"><b>回复一个邮件列表前询问. </b><a class="indexterm" name="id-1.7.20.12.2.1.9.1.2"></a>定义您于回复一个通讯组列表时是否必须确认收件人。</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.appendvcard"><b>永远附上我的详细联系人数据成 vCard. </b><a class="indexterm" name="id-1.7.20.12.2.1.10.1.2"></a>. 指定是否以 vCard 格式将您的联系资料附加到新电子邮件。</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>将电子邮件转发成. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>指定转发电子邮件时如何发送电子邮件文本。</p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>将电子邮件转发为. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>指定转发电子邮件时如何发送电子邮件文本。</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p><b>内联. </b>文本会在新电子邮件文本里发送。</p></li>
 <li class="listitem"><p><b>附件. </b>文本会在发送成新电子邮件时称为附件。</p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.email.view.html b/help/l10n/zh_CN/ox.appsuite.user.sect.email.view.html
index 5e2685e99..f0e8ae8a7 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.email.view.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.email.view.html
@@ -77,11 +77,10 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">电子邮件</span>列表视图</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">电子邮件</span>详细视图</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">以收件夹类别操作</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">检视或保存电子邮件附件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">显示电子邮件原始码</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">标记电子邮件成已读或未读</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.autocrypt.clients.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.autocrypt.clients.html
index 9da80f02f..ebf5d8c2c 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.autocrypt.clients.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.autocrypt.clients.html
@@ -39,7 +39,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.autocrypt.clients"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
-<p role="presentation">会打开<span class="guilabel"><strong>设定</strong></span>窗口。</p>
+<p role="presentation">会打开<span class="guilabel"><strong>设置</strong></span>窗口。</p>
 </li>
 <li class="step"><p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p></li>
 <li class="step"><p role="presentation">启用<span class="guibutton"><strong>显示进阶设置</strong></span>。将会显示用作管理与Autocrypt设置的项目。</p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.autocrypt.importkey.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.autocrypt.importkey.html
index b0bff38b8..04345a0bd 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.autocrypt.importkey.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.autocrypt.importkey.html
@@ -56,7 +56,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.autocrypt.importkey"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
-<p role="presentation">会打开<span class="guilabel"><strong>设定</strong></span>窗口。</p>
+<p role="presentation">会打开<span class="guilabel"><strong>设置</strong></span>窗口。</p>
 </li>
 <li class="step"><p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p></li>
 <li class="step"><p role="presentation">启用<span class="guibutton"><strong>显示进阶设置</strong></span>。将会显示用作管理与Autocrypt设置的项目。</p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.autocrypt.manage.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.autocrypt.manage.html
index 37d087fa1..34480eedc 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.autocrypt.manage.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.autocrypt.manage.html
@@ -50,7 +50,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.autocrypt.manage.verify"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
-<p role="presentation">会打开<span class="guilabel"><strong>设定</strong></span>窗口。</p>
+<p role="presentation">会打开<span class="guilabel"><strong>设置</strong></span>窗口。</p>
 </li>
 <li class="step"><p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p></li>
 <li class="step"><p role="presentation">启用<span class="guibutton"><strong>显示进阶设置</strong></span>。将会显示用作管理与Autocrypt设置的项目。</p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.documents.createencrypted.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.documents.createencrypted.html
index a6280cbc6..2bcf21e28 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.documents.createencrypted.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.documents.createencrypted.html
@@ -62,7 +62,7 @@
 <p role="presentation">您能够定义<span class="phrase">Guard</span>应该记得保安密码多久。为此,启用<span class="guibutton"><strong>记得我的密码</strong></span>。从列表选择一个值。</p>
 <p role="presentation">在 Guard 保安设置里,你能为时间范围<a class="link" href="ox.appsuite.user.sect.guard.settings.html">定义一个默认值</a>。</p>
 </li>
-<li class="step"><p role="presentation">单击菜单栏里的 <span class="guibutton"><strong>无名</strong></span>。 然后按 Enter 键。</p></li>
+<li class="step"><p role="presentation">单击菜单栏里的 <span class="guibutton"><strong>无名</strong></span>。 输入一个名称。</p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.documents.createencrypted"></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.email.incoming.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.email.incoming.html
index c8ed7d7af..79600aabf 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.email.incoming.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.email.incoming.html
@@ -39,15 +39,15 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.email.incoming.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
-<p role="presentation">会打开<span class="guilabel"><strong>设定</strong></span>窗口。</p>
+<p role="presentation">会打开<span class="guilabel"><strong>设置</strong></span>窗口。</p>
 </li>
 <li class="step"><p role="presentation">单击左面里的 <span class="guibutton"><strong>邮件</strong></span>。单击<span class="guibutton"><strong>过滤器规则</strong></span>。</p></li>
-<li class="step"><p role="presentation">单击<span class="guibutton"><strong>添加新准则</strong></span>。会打开<span class="guilabel"><strong>创建新规则</strong></span>窗口。<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">输入一个规则名称。</p></li>
+<li class="step"><p role="presentation">单击<span class="guibutton"><strong>添加新准则</strong></span>。会打开<span class="guilabel"><strong>创建新规则</strong></span>。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">输入规则名称。</p></li>
 <li class="listitem"><p role="presentation">单击<span class="guibutton"><strong>添加条件</strong></span>。从下拉菜单作出一个选择。完成条件详情。</p></li>
 <li class="listitem"><p role="presentation">单击<span class="guibutton"><strong>添加动作</strong></span>。从菜单选择加密动作。完成动作详情。</p></li>
 </ul></p></li>
-<li class="step"><p role="presentation">您可以设置在符合规则时,要否处理后续规则。为此启用或停用<span class="guibutton"><strong>处理后续规则</strong></span>。</p></li>
+<li class="step"><p role="presentation">您可以设置在规则符合时,要否处理后续规则。为此,启用或停用<span class="guibutton"><strong>处理后续规则</strong></span>。</p></li>
 <li class="step"><p role="presentation">单击 <span class="guibutton"><strong>保存</strong></span>。</p></li>
 </ol></div>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.email.send.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.email.send.html
index 0408b70a6..c1b49ba02 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.email.send.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.email.send.html
@@ -46,9 +46,9 @@
 <li class="step">
 <p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.email.encryption.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
 <p role="presentation">您也能单击应用执行器里的<span class="guibutton"><strong>设定</strong></span>。</p>
-<p role="presentation">会打开<span class="guilabel"><strong>设定</strong></span>窗口。</p>
+<p role="presentation">会打开<span class="guilabel"><strong>设置</strong></span>窗口。</p>
 </li>
-<li class="step"><p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p></li>
+<li class="step"><p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。在右面单击<span class="guibutton"><strong>S/MIME</strong></span>。</p></li>
 <li class="step">
 <p role="presentation">启用<span class="guibutton"><strong>启用S/MIME</strong></span>。</p>
 <p role="presentation">如果S/MIME加密应该设置成默认,请启用<span class="guibutton"><strong>默认使用S/MIME作签署与加密</strong></span>(在<span class="guibutton"><strong>默认</strong></span>下面)。</p>
@@ -74,7 +74,7 @@
 <li class="listitem"><p role="presentation">要启用电子邮件收件人发送一个已加密回复,收件人需要拥有您的公钥。您能发送您的公钥为附件。为此,启用<span class="guibutton"><strong>附上我的公钥</strong></span>。</p></li>
 <li class="listitem">
 <p role="presentation">于使用PGP时,以下选项适用:</p>
-<p role="presentation">如果 <span class="guibutton"><strong>显示进阶设置</strong></span> 已启用(在<span class="phrase">Guard</span>设置里),您就能设置 PGP 格式。</p>
+<p role="presentation">如果在 <span class="guibutton"><strong>撰写邮件时显示高级设置</strong></span> 选项下启用了 <span class="phrase">Guard</span>、、、 设置中的 <span class="guibutton"><strong>高阶</strong></span>,您就能设置PGP格式。</p>
 <p role="presentation">默认情况下,已加密电子邮件会以<span class="guibutton"><strong>Mime</strong></span>格式发送。有些比较旧的电子邮件客户端只支持 PGP/直列。如果收件人使用该客户端,启用 <span class="guibutton"><strong>直列</strong></span>。</p>
 <p role="presentation">备注:如果您使用<span class="guibutton"><strong>直列</strong></span>,您就不能以HTML格式发送电子邮件。</p>
 </li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.html
index e580e30a3..07f7716fe 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="以Guard加密数据">
-<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="密码管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="移除密码重设功能">
 <link rel="next" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="管理自己的PGP钥">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">下一页</a></li>
@@ -43,9 +43,17 @@
 <p id="ox.appsuite.user.possibilities.guard.keys">有以下选项:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的PGP钥</a></p></li>
-<li class="listitem cap-smime" id="id-1.14.13.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">管理自己的S/MIME钥</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理公钥</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理收件人的PGP钥</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">管理自己的S/MIME钥</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">管理收件人的S/MIME钥</a></p></li>
 </ul>
+<p id="ox.appsuite.user.related.guard.keys"></p>
+<p class="title">相关主题:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">密码管理</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>设定</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.keys">母主题:<a class="xref" href="ox.appsuite.user.chap.guard.html"><i>以<span class="phrase">Guard</span>加密数据</i></a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.pgppublickeys.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
index b1bb3cc0a..54f39578b 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
@@ -1,13 +1,13 @@
 <html lang="zh_cn">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>管理公钥</title>
+<title>管理收件人的PGP钥</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="钥管理">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="管理自己的S/MIME钥">
-<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Guard设定">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="管理自己的PGP钥">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="管理自己的S/MIME钥">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,65 +22,46 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">下一页</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">下一页</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">以<span class="phrase">Guard</span>加密数据</h1>
 <h2 class="sr-only">钥管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.pgppublickeys">
-<div class="titlepage"><div><div><h3 class="title">管理公钥</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">在<span class="phrase"><span class="guilabel"><strong>Guard 保安设置</strong></span></span>页面上,您能够:</p>
+<div class="titlepage"><div><div><h3 class="title">管理收件人的PGP钥</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.8.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">有以下选项:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">显示公钥</p></li>
+<li class="listitem"><p role="presentation">显示或删除公钥</p></li>
 <li class="listitem"><p role="presentation">上载公钥</p></li>
-<li class="listitem"><p role="presentation">删除一个您自己的公钥</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.guard.pgppublickeys">
-<p class="title">如何使用钥管理功能:</p>
+<p class="title">如何管理收件人的PGP钥:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
-<p role="presentation">您也能单击应用执行器里的<span class="guibutton"><strong>设定</strong></span>。</p>
-<p role="presentation">会打开<span class="guilabel"><strong>设定</strong></span>窗口。</p>
+<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
+<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。单击右面里的<span class="guibutton"><strong>收件人PGP钥</strong></span>。</p>
+<p role="presentation">将显示收件人的公共PGP钥。</p>
 </li>
 <li class="step">
-<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p>
-<p role="presentation">将会显示<span class="phrase"><span class="guilabel"><strong>Guard 保安设置</strong></span></span>页面。</p>
-</li>
-<li class="step">
-<p role="presentation">启用<span class="guibutton"><strong>显示进阶设置</strong></span>。</p>
-<p role="presentation">将显示钥管理功能。</p>
+<p role="presentation">要显示一个钥的详情,单击钥ID。</p>
+<p role="presentation">为了删除一个钥,请单击钥旁边的<span class="guibutton"><strong>删除</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.display">
-<p class="title">如何显示公钥:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
+<p class="title">如何上载一个收件人的公钥:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">单击<span class="guibutton"><strong>收件人的公钥</strong></span>。会打开<span class="guilabel"><strong>公钥</strong></span>窗口。</p>
-<p role="presentation">会显示您和其他用户分享的公钥。如果一个用户的钥在此列表里显示,您就能可以发送一个已加密电子邮件得此用户,与确认已签署电子邮件是此用户发送给您的。</p>
-</li>
-<li class="step">
-<p role="presentation">要显示一个钥的详情,单击一个钥旁边的 <span class="guibutton"><strong>详情</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span>。会打开<span class="guilabel"><strong>公钥详情</strong></span>窗口。</p>
-<p role="presentation">您能够启用 <span class="guibutton"><strong>分享钥</strong></span> 以分享公钥。其他用户能够检视和下载您分享的钥。公钥只为组件用户可用。</p>
+<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
+<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。单击右面里的<span class="guibutton"><strong>收件人PGP钥</strong></span>。</p>
 </li>
+<li class="step"><p role="presentation">单击<span class="guibutton"><strong>上载收件人钥</strong></span>。选择一个包含公钥的文件。</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
-<p class="title">如何再 <span class="guilabel"><strong>公钥</strong></span> 窗口里上载一个收件人的公钥:</p>
-<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">单击<span class="guibutton"><strong>添加</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.upload.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span>(<span class="guilabel"><strong>PGP公钥列表</strong></span>旁边)。选择一个包含公共键的文件。</p></li></ul></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.delete">
-<p class="title">如何在<span class="guilabel"><strong>公钥</strong></span>窗口里删除一个公钥:</p>
-<div class="procedure"><ul class="procedure"><li class="step">
-<p role="presentation">单击一个公钥旁边的<span class="guibutton"><strong>删除</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
-<p role="presentation">确定您要删除公钥。</p>
-</li></ul></div>
-</div>
 <p id="ox.appsuite.user.related.guard.keys.pgppublickeys"></p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.smimepublickeys.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
new file mode 100644
index 000000000..95e12f0b0
--- /dev/null
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
@@ -0,0 +1,75 @@
+<html lang="zh_cn">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>管理收件人的S/MIME钥</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="用户向导&gt;">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="钥管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="管理自己的S/MIME钥">
+<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Guard设定">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">上一页</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">下一页</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">以<span class="phrase">Guard</span>加密数据</h1>
+<h2 class="sr-only">钥管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.keys.smimepublickeys">
+<div class="titlepage"><div><div><h3 class="title">管理收件人的S/MIME钥</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.10.2"></a><p id="ox.appsuite.user.concept.guard.keys.smimepublickeys">有以下选项:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">显示公钥</p></li>
+<li class="listitem"><p role="presentation">上载公钥</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.smimepublickeys">
+<p class="title">如何显示一个收件人的S/MIME钥:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
+<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。在右面单击<span class="guibutton"><strong>S/MIME收件人</strong></span>。</p>
+</li>
+<li class="step">
+<p role="presentation">在<span class="guibutton"><strong>搜寻凭证</strong></span>里输入一个电邮地址。单击<span class="guibutton"><strong>搜索</strong></span>。</p>
+<p role="presentation">如果找到一个凭证,将会显示凭证的数据。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.guard.keys.smimepublickeys.upload">
+<p class="title">如何上载一个收件人的公钥:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
+<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。在右面单击<span class="guibutton"><strong>S/MIME收件人</strong></span>。</p>
+</li>
+<li class="step"><p role="presentation">单击<span class="guibutton"><strong>上载收件人凭证</strong></span>。选择一个包含公钥的文件。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.keys.smimepublickeys"></p>
+<p class="title">相关主题:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的PGP钥</a></p>
+<p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">管理自己的S/MIME钥</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">密码管理</a></p>
+</li></ul>
+<p id="ox.appsuite.user.parent.guard.keys.smimepublickeys">母主题:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">钥管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
index 9f415cc5b..39ba7a9f5 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="钥管理">
 <link rel="prev" href="ox.appsuite.user.sect.guard.keys.html" title="钥管理">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="管理自己的S/MIME钥">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="管理收件人的PGP钥">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">下一页</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">下一页</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,129 +33,103 @@
 <h2 class="sr-only">钥管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yourpgpkeys">
 <div class="titlepage"><div><div><h3 class="title">管理自己的PGP钥</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.5.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">在<span class="phrase"><span class="guilabel"><strong>Guard 保安设定</strong></span></span>   页面,您能够:</p>
+<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">有以下选项:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">添加新PGP钥</p></li>
 <li class="listitem"><p role="presentation">显示自己的PGP钥,显示详情</p></li>
-<li class="listitem">
-<p role="presentation">添加新PGP钥</p>
-<p role="presentation">如果您拥有多个钥,您就能定义哪一个钥应为最新的。当前的钥用作加密数据。</p>
-</li>
-<li class="listitem">
-<p role="presentation">添加用户 ID</p>
-<p role="presentation">在添加额外用户 ID 到一个钥时,您能在多个电子邮件户口里使用钥。</p>
-</li>
-<li class="listitem"><p role="presentation">下载钥</p></li>
-<li class="listitem"><p role="presentation">删除钥</p></li>
+<li class="listitem"><p role="presentation">管理自己的PGP钥:设成当前、编辑 ID、收回、下载、删除</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys">
-<p class="title">如何使用PGP钥管理功能:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.add">
+<p class="title">如何添加一个新PGP钥:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
-<p role="presentation">您也能单击应用执行器里的<span class="guibutton"><strong>设定</strong></span>。</p>
-<p role="presentation">会打开<span class="guilabel"><strong>设定</strong></span>窗口。</p>
+<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.addkey"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
+<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。单击右面里的<span class="guibutton"><strong>您的PGP钥</strong></span>。</p>
 </li>
 <li class="step">
-<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p>
-<p role="presentation">将会显示<span class="phrase"><span class="guilabel"><strong>Guard 保安设置</strong></span></span>页面。</p>
+<p role="presentation">您可以进行以下几种选项:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">要创建一对新键,单击<span class="guibutton"><strong>创建新键</strong></span>。会打开 <span class="phrase"><span class="guilabel"><strong>创建Guard保安钥</strong></span></span>窗口。</p>
+<p role="presentation">为新键输入一个密码。确认密码。</p>
+<p role="presentation">新钥包含一个主钥和对应次钥。</p>
 </li>
-<li class="step">
-<p role="presentation">启用<span class="guibutton"><strong>显示进阶设置</strong></span>。</p>
-<p role="presentation">将显示钥管理功能。</p>
+<li class="listitem">
+<p role="presentation">要添加一个现存私钥,单击<span class="guibutton"><strong>上载私键</strong></span>。选择一个包含私钥的文件。会打开<span class="guilabel"><strong>上载私钥</strong></span>窗口。</p>
+<p role="presentation">要上载新钥,输入您的<span class="phrase">Guard</span>保安密码。为新钥输入一个新密码。</p>
+</li>
+<li class="listitem"><p role="presentation">要添加一个现存公钥,单击<span class="guibutton"><strong>上载公钥</strong></span>。选择一个包含公钥的文件。</p></li>
+</ul></p>
+<p role="presentation">新钥将会进入您的钥列表上面。新钥变成当前钥。</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.display">
-<p class="title">如何显示您自己的PGP钥或把一个PGP钥变成当前钥:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.display">
+<p class="title">如何检视您的现存PGP钥:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">单击<span class="guibutton"><strong>您的钥</strong></span>(在<span class="guilabel"><strong>钥</strong></span>下面)。</p>
-<p role="presentation" class="cap-smime">视配置而定,会打开<span class="guilabel"><strong>选择要列出的钥类型</strong></span>。选择<span class="guibutton"><strong>PGP</strong></span>。</p>
-<p role="presentation">会打开<span class="guilabel"><strong>您的钥</strong></span>窗口。</p>
-<p role="presentation"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">将显示您的PGP钥。每一个PGP钥包含一个主钥和次钥。<ul class="itemizedlist" style="list-style-type: circle; ">
+<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
+<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。单击右面里的<span class="guibutton"><strong>您的PGP钥</strong></span>。</p>
+<p role="presentation">将显示您的PGP钥。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">每一个PGP钥包含一个主钥和次钥。<ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">除了其他事物,主钥是用来为您的电子邮件签名。</p></li>
 <li class="listitem"><p role="presentation">次钥将会用作加密和解密。</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">视要求而定,<span class="phrase">Guard</span>自动使用主钥或次钥。</p></li>
 </ul></p>
 </li>
-<li class="step"><p role="presentation">如果您的钥列表包括多于一个钥,您能够定义当前的钥。为此,启用主钥旁边的<span class="guibutton"><strong>当前</strong></span>复选框。从现在起,当前钥将会用作假面。</p></li>
-<li class="step"><p role="presentation">要显示一个钥的详情,单击一个钥旁边的 <span class="guibutton"><strong>详情</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span>。会打开<span class="guilabel"><strong>钥详情</strong></span>窗口。要检视钥的签名,单击<span class="guibutton"><strong>签名</strong></span>。</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addkey">
-<p class="title">如何添加一个新PGP钥到<span class="guilabel"><strong>您的钥</strong></span>窗口里:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">单击<span class="guibutton"><strong>添加新钥</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span>(<span class="guibutton"><strong>钥列表</strong></span>旁边)会打开<span class="guilabel"><strong>添加钥</strong></span>下面)窗口。</p></li>
 <li class="step">
-<p role="presentation">您可以进行以下几种选项:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-<p role="presentation">要添加一个私键,单击<span class="guibutton"><strong>上载私键</strong></span>。选择一个包含私键的文件。会打开<span class="guilabel"><strong>上载私键</strong></span>窗口。</p>
-<p role="presentation">要上载新钥,输入您的<span class="phrase">Guard</span>保安密码。为新键输入一个新密码。</p>
-</li>
-<li class="listitem"><p role="presentation">要添加一个公共键,单击<span class="guibutton"><strong>只上载公共键</strong></span>。选择一个包含公共键的文件。</p></li>
-<li class="listitem">
-<p role="presentation">要创建一对新键,单击<span class="guibutton"><strong>创建新键</strong></span>。会打开 <span class="phrase"><span class="guilabel"><strong>创建Guard保安钥</strong></span></span>窗口。</p>
-<p role="presentation">为新键输入一个密码。确认密码。</p>
-<p role="presentation">新钥包含一个主钥和对应次钥。</p>
-</li>
-</ul></p>
-<p role="presentation">新钥将会进入您的钥列表上面。新钥变成当前钥。</p>
+<p role="presentation">要显示一个钥的详情,单击一个主钥旁边的 <span class="guibutton"><strong>管理钥</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>。会打开<span class="guilabel"><strong>钥详情</strong></span>窗口。</p>
+<p role="presentation">要检视钥的签名,单击<span class="guibutton"><strong>签名</strong></span>。</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addaccount">
-<p class="title">如何添加一个额外用户 ID 到 <span class="guilabel"><strong>您的钥</strong></span> 窗口里:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.manage">
+<p class="title">如何管理您的现存PGP钥:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">单击一个钥旁边的 <span class="guibutton"><strong>编辑ID</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addaccount.edit"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>。会打开<span class="guilabel"><strong>添加用户 ID</strong></span>窗口。</p></li>
 <li class="step">
+<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
+<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。单击右面里的<span class="guibutton"><strong>您的PGP钥</strong></span>。</p>
+<p role="presentation">将显示您的PGP钥。</p>
+</li>
+<li class="step"><p role="presentation">单击一个主钥旁边的 <span class="guibutton"><strong>管理钥</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>。使用以下功能。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">如果您的钥列表包括多于一个钥,您能够定义当前的钥。为此,单击<span class="guibutton"><strong>标记当前</strong></span>。从现在起,当前钥将会用作假面。</p></li>
+<li class="listitem">
+<p role="presentation">如果您为别的电邮户口使用钥,请单击<span class="guibutton"><strong>编辑 ID</strong></span>。会打开<span class="guilabel"><strong>添加用户 ID</strong></span>窗口。</p>
 <p role="presentation">为用户 ID 输入一个名称。输入您要为此钥使用的电子邮件。</p>
 <p role="presentation">为此钥输入您的密码。</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.download">
-<p class="title">如何在<span class="guilabel"><strong>您的钥</strong></span>窗口里下载一个钥:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">单击一个钥旁边的 <span class="guibutton"><strong>下载</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span>。</p></li>
-<li class="step">
+<li class="listitem">
+<p role="presentation">要下载一个私钥,单击<span class="guibutton"><strong>下载</strong></span>。</p>
 <p role="presentation">定义要否只下载您的私钥、公钥、或两者。</p>
 <p role="presentation"><span class="phrase"><strong>警告:</strong></span> 您的私钥将会以已加密形式下载。可是,您不应该下载您的私钥到一个公共可以访问的系统。</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.delete">
-<p class="title">如何在<span class="guilabel"><strong>您的钥</strong></span>窗口里删除一个钥:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>警告:</strong></span> 如果您删除一个私钥,您就不再能够解码以此钥加密的对象。如果您不确定,那你不应该删除钥而是收回它。一个收回的钥不再能用作加密。但您仍能够解码以此钥加密的对象。</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">单击一个钥旁边的 <span class="guibutton"><strong>删除</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。会打开<span class="guilabel"><strong>删除私钥</strong></span>窗口。</p></li>
-<li class="step"><p role="presentation">您可以进行以下几种选项:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">为了收回或删除一个私钥,请单击<span class="guibutton"><strong>删除</strong></span>。会打开<span class="guilabel"><strong>删除私钥</strong></span>窗口。备注:<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">如果您收回此钥,它将不会被使用。但您仍能够解码以此钥加密的对象。为此,收回一个钥比删除它好。</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>警告:</strong></span> 如果您删除一个私钥,您就不再能够解码以此钥加密的对象。</p></li>
+</ul> <p role="presentation">您可以进行以下几种选项:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">要收回一个私钥,单击<span class="guibutton"><strong>收回</strong></span>。</p>
-<p role="presentation">如果您收回此钥,它将不会被使用。但您仍能够解码以此钥加密的对象。为此,收回一个钥比删除它好。</p>
 <p role="presentation">为私钥输入一个密码。如有需要,选择一个原因收回钥。</p>
 <p role="presentation">单击 <span class="guibutton"><strong>收回</strong></span>。</p>
+<p role="presentation">您也能单击菜单里的<span class="guibutton"><strong>收回</strong></span>。</p>
 </li>
 <li class="listitem">
 <p role="presentation">为了删除一个私钥,单击<span class="guibutton"><strong>删除</strong></span>。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span> 如果您删除一个私钥,您就不再能够解码以此钥加密的对象。</p>
 <p role="presentation">为私钥输入一个密码。</p>
 <p role="presentation">单击<span class="guibutton"><strong>删除</strong></span>按钮。</p>
 </li>
 </ul>在删除一个主钥时,也将会删除对应的次钥</p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yourpgpkeys"></p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理公钥</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理收件人的PGP钥</a></p>
 <p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">管理自己的S/MIME钥</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">密码管理</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.keys.yourpgpkeys">母主题:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">钥管理</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yourpgpkeys">母主题:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">钥管理</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
index 8dd8869d3..fb1f4474a 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="钥管理">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="管理自己的PGP钥">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="管理公钥">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="管理收件人的PGP钥">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="管理收件人的S/MIME钥">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">下一页</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">下一页</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,46 +33,27 @@
 <h2 class="sr-only">钥管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yoursmimekeys">
 <div class="titlepage"><div><div><h3 class="title">管理自己的S/MIME钥</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.6.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">在<span class="phrase"><span class="guilabel"><strong>Guard 保安设定</strong></span></span>   页面,您能够:</p>
+<a class="indexterm" name="id-1.14.13.9.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">有以下选项:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">添加S/MIME钥</p>
 <p role="presentation">如果您拥有多个钥,您就能定义哪一个钥应为最新的。当前的钥用作加密数据。</p>
 </li>
 <li class="listitem"><p role="presentation">显示自己的S/MIME钥,显示详情</p></li>
-<li class="listitem"><p role="presentation">下载钥</p></li>
-<li class="listitem"><p role="presentation">删除钥</p></li>
+<li class="listitem"><p role="presentation">管理自己的S/MIME钥:设成当前、编辑 ID、收回、下载、删除</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys">
-<p class="title">如何使用S/MIME钥管理功能:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
-<p role="presentation">您也能单击应用执行器里的<span class="guibutton"><strong>设定</strong></span>。</p>
-<p role="presentation">会打开<span class="guilabel"><strong>设定</strong></span>窗口。</p>
-</li>
-<li class="step">
-<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p>
-<p role="presentation">将会显示<span class="phrase"><span class="guilabel"><strong>Guard 保安设置</strong></span></span>页面。</p>
-</li>
-<li class="step">
-<p role="presentation">激活<span class="guibutton"><strong>启用S/MIME</strong></span>。</p>
-<p role="presentation">启用<span class="guibutton"><strong>显示进阶设置</strong></span>。</p>
-<p role="presentation">将显示钥管理功能。</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.addkey">
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.add">
 <p class="title">如何添加一个S/MIME钥:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">单击<span class="guibutton"><strong>您的钥</strong></span>(在<span class="guibutton"><strong>钥</strong></span>下面)。会打开<span class="guilabel"><strong>选择更改的钥类型。</strong></span>窗口。</p>
-<p role="presentation">选择<span class="guibutton"><strong>启用S/MIME</strong></span>。会打开<span class="guilabel"><strong>您的证书</strong></span>窗口。</p>
+<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
+<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。在右面单击<span class="guibutton"><strong>S/MIME</strong></span>。</p>
+<p role="presentation">启用<span class="guibutton"><strong>启用S/MIME</strong></span>。</p>
 </li>
-<li class="step"><p role="presentation">单击<span class="guibutton"><strong>添加</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span>(<span class="guilabel"><strong>您的钥列表</strong></span>旁边)。会打开<span class="guilabel"><strong>上载S/MIME钥</strong></span>窗口。</p></li>
 <li class="step">
+<p role="presentation">单击<span class="guibutton"><strong>上载私人凭证</strong></span>。会打开上载<span class="guilabel"><strong>S/MIME钥</strong></span>窗口。</p>
 <p role="presentation">输入以下密码:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">要上载新钥,输入您的<span class="phrase">Guard</span>保安密码。为新键输入一个新密码。</p></li>
+<li class="listitem"><p role="presentation">您的上载新钥的<span class="phrase">Guard</span>保安密码。</p></li>
 <li class="listitem">
 <p role="presentation">加密电邮的新密码。</p>
 <p role="presentation">确认新密码。</p>
@@ -84,58 +65,61 @@
 </ol></div>
 </div>
 <div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.display">
-<p class="title">如何显示您自己的S/MIME钥或把一个S/MIME钥变成当前钥:</p>
+<p class="title">如何检视您的自己的S/MIME钥:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">单击<span class="guibutton"><strong>您的钥</strong></span>(在<span class="guilabel"><strong>钥</strong></span>下面)。会打开<span class="guilabel"><strong>选择更改的钥类型。</strong></span>窗口。</p>
-<p role="presentation">选择<span class="guibutton"><strong>启用S/MIME</strong></span>。</p>
-<p role="presentation">会打开<span class="guilabel"><strong>您的证书</strong></span>窗口。将会显示您的S/MIME钥。</p>
+<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
+<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。在右面单击<span class="guibutton"><strong>S/MIME</strong></span>。</p>
+<p role="presentation">启用<span class="guibutton"><strong>启用S/MIME</strong></span>。</p>
+</li>
+<li class="step">
+<p role="presentation">要显示一个钥的详情,单击一个钥旁边的 <span class="guibutton"><strong>管理钥</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>。会打开<span class="guilabel"><strong>钥详情</strong></span>窗口。</p>
+<p role="presentation">要检视钥的签名,单击<span class="guibutton"><strong>签名</strong></span>。</p>
 </li>
-<li class="step"><p role="presentation">如果您的钥列表包括多于一个钥,您能够定义当前的钥。为此,启用主钥旁边的<span class="guibutton"><strong>当前</strong></span>复选框。从现在起,当前钥将会用作假面。</p></li>
-<li class="step"><p role="presentation">要显示一个钥的详情,单击一个钥旁边的 <span class="guibutton"><strong>详情</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span>。会打开<span class="guilabel"><strong>钥详情</strong></span>窗口。要检视钥的签名,单击<span class="guibutton"><strong>签名</strong></span>。</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.download">
-<p class="title">如何在<span class="guilabel"><strong>您的钥</strong></span>窗口里下载一个钥:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.manage">
+<p class="title">如何管理您的现存S/MIME钥: </p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">单击一个钥旁边的 <span class="guibutton"><strong>下载</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span>。</p></li>
 <li class="step">
+<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
+<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。在右面单击<span class="guibutton"><strong>S/MIME</strong></span>。</p>
+<p role="presentation">启用<span class="guibutton"><strong>启用S/MIME</strong></span>。</p>
+</li>
+<li class="step"><p role="presentation">单击一个钥旁边的 <span class="guibutton"><strong>管理钥</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>。使用以下功能。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">如果您的钥列表包括多于一个钥,您能够定义当前的钥。为此,单击<span class="guibutton"><strong>标记当前</strong></span>。从现在起,当前钥将会用作假面。</p></li>
+<li class="listitem">
+<p role="presentation">要下载一个私钥,单击<span class="guibutton"><strong>下载</strong></span>。</p>
 <p role="presentation">定义要否只下载您的私钥、公钥、或两者。</p>
 <p role="presentation"><span class="phrase"><strong>警告:</strong></span> 您的私钥将会以已加密形式下载。可是,您不应该下载您的私钥到一个公共可以访问的系统。</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.delete">
-<p class="title">如何在<span class="guilabel"><strong>您的钥</strong></span>窗口里删除一个钥:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>警告:</strong></span> 如果您删除一个私钥,您就不再能够解码以此钥加密的对象。如果您不确定,那你不应该删除钥而是收回它。一个收回的钥不再能用作加密。但您仍能够解码以此钥加密的对象。</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">单击一个钥旁边的 <span class="guibutton"><strong>删除</strong></span> 图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。会打开<span class="guilabel"><strong>删除私钥</strong></span>窗口。</p></li>
-<li class="step"><p role="presentation">您可以进行以下几种选项:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">为了收回或删除一个私钥,请单击<span class="guibutton"><strong>删除</strong></span>。会打开<span class="guilabel"><strong>删除私钥</strong></span>窗口。备注:<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">如果您收回此钥,它将不会被使用。但您仍能够解码以此钥加密的对象。为此,收回一个钥比删除它好。</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>警告:</strong></span> 如果您删除一个私钥,您就不再能够解码以此钥加密的对象。</p></li>
+</ul> <p role="presentation">您可以进行以下几种选项:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">要收回一个私钥,单击<span class="guibutton"><strong>收回</strong></span>。</p>
-<p role="presentation">如果您收回此钥,它将不会被使用。但您仍能够解码以此钥加密的对象。为此,收回一个钥比删除它好。</p>
 <p role="presentation">为私钥输入一个密码。如有需要,选择一个原因收回钥。</p>
 <p role="presentation">单击 <span class="guibutton"><strong>收回</strong></span>。</p>
+<p role="presentation">您也能单击菜单里的<span class="guibutton"><strong>收回</strong></span>。</p>
 </li>
 <li class="listitem">
 <p role="presentation">为了删除一个私钥,单击<span class="guibutton"><strong>删除</strong></span>。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span> 如果您删除一个私钥,您就不再能够解码以此钥加密的对象。</p>
 <p role="presentation">为私钥输入一个密码。</p>
 <p role="presentation">单击<span class="guibutton"><strong>删除</strong></span>按钮。</p>
 </li>
 </ul></p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yoursmimekeys"></p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的PGP钥</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理公钥</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理收件人的PGP钥</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">密码管理</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.keys.yoursmimekeys">母主题:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">钥管理</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yoursmimekeys">母主题:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">钥管理</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.logout.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.logout.html
index ca7fb10a3..7286ce91b 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.logout.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.logout.html
@@ -38,7 +38,7 @@
 <p class="title">如何从<span class="phrase">Guard</span>注销:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">单击在菜单条里的<span class="guibutton"><strong>我的户口</strong></span>图标。</p></li>
-<li class="step"><p role="presentation">单击<span class="phrase"><span class="guibutton"><strong>注销 Guard</strong></span></span>。</p></li>
+<li class="step"><p role="presentation">单击 <span class="phrase"><span class="guibutton"><strong>注销 Guard</strong></span></span>.</p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.parent.guard.logout">母主题:<a class="xref" href="ox.appsuite.user.chap.guard.html"><i>以<span class="phrase">Guard</span>加密数据</i></a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.change.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.change.html
new file mode 100644
index 000000000..ba12cd6d6
--- /dev/null
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.change.html
@@ -0,0 +1,65 @@
+<html lang="zh_cn">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>更改密码</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="用户向导&gt;">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="密码管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="密码管理">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.reset.html" title="重设密码">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">上一页</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.reset.html">下一页</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">以<span class="phrase">Guard</span>加密数据</h1>
+<h2 class="sr-only">密码管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.change">
+<div class="titlepage"><div><div><h3 class="title">更改密码</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.6.2"></a><a class="indexterm" name="id-1.14.12.6.3"></a><p role="presentation" class="cap-smime">视配置而定,您也能够使用S/MIME加密而不是PGP。对于 PGP 与 S/MIME,将会使用个别密码。</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.change">
+<p class="title">如何更改<span class="phrase">Guard</span>密码:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.change"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
+<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。单击<span class="guibutton"><strong>密码管理</strong></span><span class="cap-smime">或在右面点击<span class="guibutton"><strong>密码管理(S/MIME)</strong></span></span>。</p>
+</li>
+<li class="step">
+<p role="presentation">在 <span class="guibutton"><strong>密码</strong></span> 输入字段,输入您之前用作加密您数据的密码。</p>
+<p role="presentation">在 <span class="guibutton"><strong>新密码</strong></span> 输入字段,输入您从此要用作加密您数据的密码。</p>
+<p role="presentation">在<span class="guibutton"><strong>确认新密码</strong></span>字段中输入一个新密码。</p>
+</li>
+<li class="step"><p role="presentation">单击<span class="guibutton"><strong>更改密码</strong></span>。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.change"></p>
+<p class="title">相关主题:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">重设密码</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">移除密码重设功能</a></p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">钥管理</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.password.change">母主题:<a class="xref" href="ox.appsuite.user.sect.guard.password.html">密码管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.deleterecovery.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.deleterecovery.html
new file mode 100644
index 000000000..0fd01104b
--- /dev/null
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.deleterecovery.html
@@ -0,0 +1,64 @@
+<html lang="zh_cn">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>移除密码重设功能</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="用户向导&gt;">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="密码管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.reset.html" title="重设密码">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="钥管理">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.reset.html">上一页</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">下一页</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">以<span class="phrase">Guard</span>加密数据</h1>
+<h2 class="sr-only">密码管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.deleterecovery">
+<div class="titlepage"><div><div><h3 class="title">移除密码重设功能</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.8.2"></a><p id="ox.appsuite.user.concept.guard.password.deleterecovery">要需要时重设您的密码,您的密码必须以已加密版本保存在服务器上。如果您不要保存您的密码再服务器上,您能够移除复原密码的功能。</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
+<p class="title">如何移除重设密码的功能:</p>
+<div class="taskprerequisites">
+          <p><span class="phrase"><strong>警告:</strong></span> 如果您移除重设密码的功能,您以后就不能重设您的密码。如果您之后忘记您的密码,将不再可能加密您的已加密数据。</p>
+        </div>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.remove"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
+<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。在右面单击<span class="guibutton"><strong>进阶</strong></span>。</p>
+</li>
+<li class="step"><p role="presentation">在<span class="guibutton"><strong>重设选项</strong></span>下,单击<span class="guibutton"><strong>删除密码恢复</strong></span>。会打开<span class="guilabel"><strong>删除恢复</strong></span>窗口。</p></li>
+<li class="step"><p role="presentation">单击<span class="guibutton"><strong>删除</strong></span>按钮。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.deleterecovery"></p>
+<p class="title">相关主题:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">更改密码</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">重设密码</a></p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">钥管理</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.password.deleterecovery">母主题:<a class="xref" href="ox.appsuite.user.sect.guard.password.html">密码管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.html
index 92e22e833..402b7f518 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="以Guard加密数据">
 <link rel="prev" href="ox.appsuite.user.sect.guard.logout.html" title="从Guard注销">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="钥管理">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.change.html" title="更改密码">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,102 +25,26 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.logout.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">下一页</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.change.html">下一页</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">以<span class="phrase">Guard</span>加密数据</h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.password">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">密码管理</h2></div></div></div>
-<a class="indexterm" name="id-1.14.12.2"></a><a class="indexterm" name="id-1.14.12.3"></a><a class="indexterm" name="id-1.14.12.4"></a><a class="indexterm" name="id-1.14.12.5"></a><a class="indexterm" name="id-1.14.12.6"></a><p id="ox.appsuite.user.concept.guard.password">有以下选项:</p>
+<a class="indexterm" name="id-1.14.12.2"></a><p id="ox.appsuite.user.concept.guard.password">有以下选项:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">更改<span class="phrase">Guard</span>保安密码</p></li>
-<li class="listitem"><p role="presentation">在丢失您的<span class="phrase">Guard</span>保安密码时,您能到请求一个临时<span class="phrase">Guard</span>保安密码,以重设<span class="phrase">Guard</span>保安密码。</p></li>
-<li class="listitem"><p role="presentation">定义一个电子邮件地址以重设密码。</p></li>
-<li class="listitem"><p role="presentation">要需要时重设您的密码,您的密码必须以已加密版本保存在服务器上。如果您不要保存您的密码再服务器上,您能够移除复原密码的功能。</p></li>
-<li class="listitem cap-smime" id="id-1.14.12.7.1.5"><p role="presentation">视配置而定,您也能够使用S/MIME加密而不是PGP。如是者,将会为PGP与S/MIME分离密码。</p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">更改密码</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">重设密码</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">移除密码重设功能</a></p></li>
 </ul>
 <p>备注:视配置而定,有些功能可能不可用。</p>
-<div class="task help-hide-inline" id="ox.appsuite.user.task.guard.password">
-<p class="title">如何打开密码管理功能:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
-<p role="presentation">您也能单击应用执行器里的<span class="guibutton"><strong>设定</strong></span>。</p>
-<p role="presentation">会打开<span class="guilabel"><strong>设定</strong></span>窗口。</p>
-</li>
-<li class="step">
-<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p>
-<p role="presentation">将会显示<span class="phrase"><span class="guilabel"><strong>Guard 保安设置</strong></span></span>页面。</p>
-<p role="presentation">将显示密码管理功能。</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.change">
-<p class="title">如何更改<span class="phrase">Guard</span>密码:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">单击<span class="guibutton"><strong>更改密码</strong></span>。</p>
-<p role="presentation" class="cap-smime">视配置而定,会打开<span class="guilabel"><strong>选择要列出的钥类型</strong></span>。视您要重设密码的加密类型,请选择<span class="guibutton"><strong>PGP</strong></span>或<span class="guibutton"><strong>S/MIME</strong></span>。会打开<span class="guilabel"><strong>重设密码</strong></span>窗口。</p>
-</li>
-<li class="step">
-<p role="presentation">在 <span class="phrase"><span class="guibutton"><strong>输入当前Guard保安密码</strong></span></span>字段里,输入您直到现在用作加密您数据的密码。</p>
-<p role="presentation">在 <span class="phrase"><span class="guibutton"><strong>输入新Guard保安密码</strong></span></span>字段里,输入您从现在起用作加密您数据的密码。</p>
-<p role="presentation">在<span class="phrase"><span class="guibutton"><strong>核实新的Guard保安密码</strong></span></span>字段里,再输入一次密码以确认。</p>
-</li>
-<li class="step"><p role="presentation">单击<span class="guibutton"><strong>更改</strong></span>。</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.reset">
-<p class="title">如何更重设<span class="phrase">Guard</span>密码:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">单击<span class="guibutton"><strong>重设密码</strong></span>。</p>
-<p role="presentation" class="cap-smime">视配置而定,会打开<span class="guilabel"><strong>选择要列出的钥类型</strong></span>。视您要重设密码的加密类型,请选择<span class="guibutton"><strong>PGP</strong></span>或<span class="guibutton"><strong>S/MIME</strong></span>。会打开<span class="guilabel"><strong>重设密码</strong></span>窗口。</p>
-<p role="presentation">单击<span class="guibutton"><strong>重设</strong></span>。</p>
-</li>
-<li class="step">
-<p role="presentation">将会发送一个新密码到您的备用电子邮件地址。</p>
-<p role="presentation">如果没有输入一个备用电子邮件地址,新密码将会发送到您个主要电子邮件地址。</p>
-<p role="presentation">此新密码现在就是您的<span class="phrase">Guard</span>保安密码。您应该立刻 <a class="link" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.task.guard.settings">更改</a> 此密码。</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.secondarymail">
-<p class="title">如何更改您重设密码的备用电子邮件地址:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">单击<span class="guibutton"><strong>设定电子邮件以重设</strong></span>。</p>
-<p role="presentation" class="cap-smime">视配置而定,会打开<span class="guilabel"><strong>选择要列出的钥类型</strong></span>。视您要重设密码的加密类型,请选择<span class="guibutton"><strong>PGP</strong></span>或<span class="guibutton"><strong>S/MIME</strong></span>。会打开<span class="guilabel"><strong>次要电子邮件地址</strong></span>窗口。</p>
-</li>
-<li class="step">
-<p role="presentation">在 <span class="phrase"><span class="guibutton"><strong>输入当前Guard保安密码</strong></span></span>字段里,输入您直到现在用作加密您数据的密码。</p>
-<p role="presentation">在 <span class="guibutton"><strong>输入新备用电子邮件</strong></span> 输入字段里,输入电子邮件地址用作接收一个重设您<span class="phrase">Guard</span>保安密码的临时密码。</p>
-<p role="presentation">在<span class="guibutton"><strong>核实电子邮件</strong></span>里输入电子邮件地址。</p>
-<p role="presentation">单击<span class="guibutton"><strong>更改电子邮件</strong></span>。</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
-<p class="title">如何移除重设密码的功能:</p>
-<div class="taskprerequisites">
-        <p><span class="phrase"><strong>警告:</strong></span> 如果您移除重设密码的功能,您以后就不能重设您的密码。如果您之后忘记您的密码,将不再可能加密您的已加密数据。</p>
-      </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">启用<span class="guibutton"><strong>显示进阶设置</strong></span>。</p>
-<p role="presentation">单击<span class="guibutton"><strong>删除密码恢复</strong></span>。会打开 <span class="guilabel"><strong>删除恢复</strong></span> 窗口。</p>
-</li>
-<li class="step"><p role="presentation">单击<span class="guibutton"><strong>删除</strong></span>按钮。</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.guard.password"></p>
 <p class="title">相关主题:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的PGP钥</a></p>
-<p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">管理自己的S/MIME钥</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理公钥</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">钥管理</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>设定</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.guard.password">母主题:<a class="xref" href="ox.appsuite.user.chap.guard.html"><i>以<span class="phrase">Guard</span>加密数据</i></a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.reset.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.reset.html
new file mode 100644
index 000000000..70b6a091e
--- /dev/null
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.password.reset.html
@@ -0,0 +1,81 @@
+<html lang="zh_cn">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>重设密码</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="用户向导&gt;">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="密码管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.change.html" title="更改密码">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="移除密码重设功能">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.change.html">上一页</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">下一页</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">以<span class="phrase">Guard</span>加密数据</h1>
+<h2 class="sr-only">密码管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.reset">
+<div class="titlepage"><div><div><h3 class="title">重设密码</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.7.2"></a><a class="indexterm" name="id-1.14.12.7.3"></a><p id="ox.appsuite.user.concept.guard.password.reset">有以下选项:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">在丢失您的<span class="phrase">Guard</span>密码时,您能到请求一个临时 <span class="phrase">Guard</span>密码,以重设<span class="phrase">Guard</span>密码。</p></li>
+<li class="listitem"><p role="presentation">您能够定义一个电子邮件地址以重设密码。</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.password.reset">
+<p class="title">如何更重设<span class="phrase">Guard</span>密码:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.reset"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
+<p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。单击<span class="guibutton"><strong>密码管理</strong></span><span class="cap-smime">或在右面点击<span class="guibutton"><strong>密码管理(S/MIME)</strong></span></span>。</p>
+</li>
+<li class="step">
+<p role="presentation">要设置接收临时密码的副电子邮件地址,请点击<span class="guibutton"><strong>设置重置的电子邮件地址</strong></span>。会打开 <span class="guilabel"><strong>备用电子邮件</strong></span> 窗口。</p>
+<p role="presentation">输入您当前密码。输入您要用作重设密码的电邮地址。</p>
+</li>
+<li class="step">
+<p role="presentation">单击<span class="guibutton"><strong>重设密码</strong></span>。会打开 <span class="guilabel"><strong>重设密码</strong></span> 窗口。</p>
+<p role="presentation">单击<span class="guibutton"><strong>重设</strong></span>。</p>
+</li>
+</ol></div>
+<div class="taskrelated">
+          <p>结果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">将会发送一个新密码到您的备用电子邮件地址。</p>
+<p role="presentation">如果没有输入一个备用电子邮件地址,新密码将会发送到您个主要电子邮件地址。</p>
+</li>
+<li class="listitem"><p role="presentation">此新密码现在就是您的<span class="phrase">Guard</span>保安密码。您应该立刻 更改 此密码。</p></li>
+</ul>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.reset"></p>
+<p class="title">相关主题:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">更改密码</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">移除密码重设功能</a></p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">钥管理</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.password.reset">母主题:<a class="xref" href="ox.appsuite.user.sect.guard.password.html">密码管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.settings.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.settings.html
index e2daa3262..0fd0eaa4e 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.settings.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.settings.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="以Guard加密数据">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="管理公钥">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="管理收件人的S/MIME钥">
 <link rel="next" href="ox.appsuite.user.index.html" title="索引">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.index.html">下一页</a></li>
@@ -39,71 +39,123 @@
 <li class="step">
 <p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
 <p role="presentation">您也能单击应用执行器里的<span class="guibutton"><strong>设定</strong></span>。</p>
-<p role="presentation">会打开<span class="guilabel"><strong>设定</strong></span>窗口。</p>
+<p role="presentation">会打开<span class="guilabel"><strong>设置</strong></span>窗口。</p>
 </li>
 <li class="step"><p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>将会显示<span class="phrase"><span class="guilabel"><strong>Guard 保安设置</strong></span></span>页面。</p>
-      </div>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings">以下设置可用:</p>
+<p id="ox.appsuite.user.reference.guard.settings">视配置而定,以下设定可能不可用:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.default"><span class="phrase">Guard</span>默认设定</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.pgppasswords">密码管理(PGP)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.smimepasswords">密码管理(S/MIME)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yourpgpkeys">您的PGP钥</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientpgpkeys">收件人PGP钥</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yoursmime">S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientsmime">S/MIME收件人</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.advanced">进阶</a></p></li>
+</ul>
+<p>也请参阅:<a class="xref" href="ox.appsuite.user.sect.settings.search.html">搜寻设置</a></p>
 <p id="ox.appsuite.user.reference.guard.settings.default"></p>
-<h3 class="title">默认设定</h3>
+<h3 class="title">
+<span class="phrase">Guard</span>默认设定</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.encrypt"><b>在编写电子邮件时默认加密发送. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>定义一个新电子邮件是否默认加密。</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.sign"><b>默认添加签署到外送邮件. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>定义一个新电子邮件是否默认加密。</p></li>
-<li class="listitem cap-smime" id="id-1.14.14.7.2.1.3">
-<p id="ox.appsuite.user.task.guard.settings.default.smime"><b>默认使用S/MIME作签署与加密. </b><a class="indexterm" name="id-1.14.14.7.2.1.3.1.2"></a></p>
-<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p role="presentation">定义 S/MIME 要否默认用于签署与加密。</p></li></ul>
-</li>
 <li class="listitem">
-<p id="ox.appsuite.user.task.guard.settings.default.inline"><b>默认使为新电子邮件用直列 PGP. </b><a class="indexterm" name="id-1.14.14.7.2.1.4.1.2"></a>备注:此选项只于<span class="guibutton"><strong>进阶设定</strong></span>复选框为启用时可用。</p>
+<p id="ox.appsuite.user.reference.guard.settings.default.create"><b>邀请选项. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">定义直列 PGP 要否默认用于加密。</p></li>
-<li class="listitem"><p role="presentation">只有在收件人的电子邮件客户端不支持 PGP 时使用那些设置。有了 PGP/直列,收件人还是能够解密消息。</p></li>
-<li class="listitem"><p role="presentation">如果您使用此设置,您就不能以 HTML 格式发送。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.encrypt"><b>在编写电子邮件时默认加密发送. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.1.1.2"></a>定义一个新电子邮件是否默认加密。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.sign"><b>默认添加签署到外送邮件. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.2.1.2"></a>定义一个新电子邮件是否默认加密。</p></li>
+<li class="listitem cap-smime" id="id-1.14.14.7.2.1.1.1.3.1.3">
+<p id="ox.appsuite.user.task.guard.settings.default.create.smime"><b>默认使用S/MIME作签署与加密. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.3.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: square; "><li class="listitem"><p role="presentation">定义 S/MIME 要否默认用于签署与加密。</p></li></ul>
+</li>
 </ul>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>默认记着密码. </b><a class="indexterm" name="id-1.14.14.7.2.1.5.1.2"></a>为<span class="phrase">Guard</span>定义默认时间范围以记住密码。您能于被问及<span class="phrase">Guard</span>密码时更改此默认值。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>默认记着密码. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>为<span class="phrase">Guard</span>定义默认时间范围以记住密码。您能于被问及<span class="phrase">Guard</span>密码时更改此默认值。</p></li>
 </ul>
-<p id="ox.appsuite.user.reference.guard.settings.password"></p>
-<h3 class="title">密码管理</h3>
+<p id="ox.appsuite.user.reference.guard.settings.pgppasswords"></p>
+<h3 class="title">密码管理(PGP)</h3>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">包括用作更改或重设密码的功能。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">包括用作更改或重设PGP密码的功能。</p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">请参阅 <a class="xref" href="ox.appsuite.user.sect.guard.password.html">密码管理</a></p></li>
 </ul>
-<div id="ox.appsuite.user.reference.guard.settings.smime" class="cap-smime">
-<p id="ox.appsuite.user.reference.guard.settings.smime"></p>
+<div id="ox.appsuite.user.reference.guard.settings.smimepasswords" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.smimepasswords"></p>
+<h3 class="title">密码管理(S/MIME)</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">包括用作更改或重设S/MIME密码的功能。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">请参阅 <a class="xref" href="ox.appsuite.user.sect.guard.password.html">密码管理</a></p></li>
+</ul>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.yourpgpkeys"></p>
+<h3 class="title">您的PGP钥</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">包含管理您PGP钥的功能。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">请参阅 <a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的PGP钥</a></p></li>
+</ul>
+<p id="ox.appsuite.user.reference.guard.settings.recipientpgpkeys"></p>
+<h3 class="title">收件人PGP钥</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">包含管理来自收件人PGP钥的功能。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">请参阅 <a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理收件人的PGP钥</a></p></li>
+</ul>
+<div id="ox.appsuite.user.reference.guard.settings.yoursmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.yoursmime"></p>
 <h3 class="title">S/MIME</h3>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.smime.enable"><b>启用S/MIME. </b><a class="indexterm" name="id-1.14.14.9.2.1.1.1.2"></a>定义您能否发送与接收带有S/MIME加密的电邮。</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">包含管理S/MIME类型加密的功能。</p>
+<p role="presentation">请参阅 <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">钥管理</a></p>
+</li></ul>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings.extended"></p>
+<div id="ox.appsuite.user.reference.guard.settings.recipientsmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.recipientsmime"></p>
+<h3 class="title">S/MIME收件人</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">包含显示与添加S/MIME类型收件人凭证的功能。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">请参阅 <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">钥管理</a></p></li>
+</ul>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.advanced"></p>
 <h3 class="title">进阶</h3>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<p id="ox.appsuite.user.reference.guard.settings.extended.advanced"><b>进阶设定. </b><a class="indexterm" name="id-1.14.14.10.2.1.1.1.2"></a>如果启用<span class="guibutton"><strong>显示进阶设置</strong></span>,以下设置和功能将会可用。</p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
+<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>电子邮件快取</strong></span></p>
-<p role="presentation">定义一个已解密电子邮件,于显示别的电子邮件或更改到别的应用,要否保留在浏览器快取里。</p>
-<p role="presentation">要从浏览器快取移除已解密电子邮件,启用<span class="guibutton"><strong>不要保留电子邮件解密</strong></span>。</p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.email"><b>显示撰写邮件的进阶设置. </b></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<a class="indexterm" name="id-1.14.14.14.2.1.1.1.2.1.1.1"></a><p role="presentation">如果此选项已启用,您就能于发送已加密电邮时使用更多选项。</p>
+<p role="presentation">请参阅 <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">发送已加密电子邮件</a></p>
+</li></ul>
 </li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>钥</strong></span>部分。</p>
-<p role="presentation">管理自己的钥、公钥、或Autocrypt钥。</p>
-<p role="presentation">请参阅 <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">钥管理</a></p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.inline"><b>默认使为新电子邮件用直列 PGP. </b><a class="indexterm" name="id-1.14.14.14.2.1.2.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">定义直列 PGP 要否默认用于加密。</p></li>
+<li class="listitem"><p role="presentation">只有在收件人的电子邮件客户端不支持 PGP 时使用那些设置。有了 PGP/直列,收件人还是能够解密消息。</p></li>
+<li class="listitem"><p role="presentation">如果您使用此设置,您就不能以 HTML 格式发送。</p></li>
+</ul>
 </li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Autocrypt</strong></span>部分</p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.autocrypt"><b>Autocrypt设定. </b><a class="indexterm" name="id-1.14.14.14.2.1.3.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
 <p role="presentation">为外来电子邮件配置Autocrypt的使用。允许您传送Autocrypt钥到其他客户端。</p>
 <p role="presentation">请参阅 <a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">加密带有Autocrypt的电子邮件交谈</a></p>
+</li></ul>
 </li>
 <li class="listitem">
-<p role="presentation">于发送已加密电子邮件时有额外选项。</p>
-<p role="presentation">请参阅 <a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">发送已加密电子邮件</a></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.cache"><b>电子邮件快取. </b><a class="indexterm" name="id-1.14.14.14.2.1.4.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation">定义一个已解密电子邮件,于显示别的电子邮件或更改到别的应用,要否保留在浏览器快取里。</p>
+<p role="presentation">要从浏览器快取移除已解密电子邮件,启用<span class="guibutton"><strong>不要保留电子邮件解密</strong></span>。</p>
+</li></ul>
 </li>
-</ul>
+<li class="listitem">
+<p id="ox.appsuite.user.task.guard.settings.advanced.reset"><b>重设选项. </b><a class="indexterm" name="id-1.14.14.14.2.1.5.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation"><span class="guibutton"><strong>删除密码恢复</strong></span>。删除恢复丢失密码的功能。</p>
+<p role="presentation"><span class="phrase"><strong>警告:</strong></span> 如果您移除重设密码的功能,您以后就不能重设您的密码。如果您之后忘记您的密码,将不再可能加密您的已加密数据。</p>
+<p role="presentation">请参阅 <a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">移除密码重设功能</a></p>
 </li></ul>
+</li>
+</ul>
 <p id="ox.appsuite.user.parent.guard.settings">母主题:<a class="xref" href="ox.appsuite.user.chap.guard.html"><i>以<span class="phrase">Guard</span>加密数据</i></a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.setup.html b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.setup.html
index c98d0d79f..7e3f708ba 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.guard.setup.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.guard.setup.html
@@ -56,7 +56,7 @@
 <li class="step">
 <p role="presentation">在菜单条里单击<span class="guibutton"><strong>设定</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.setup.setting"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。单击<span class="guibutton"><strong>所有设定</strong></span>。</p>
 <p role="presentation">您也能单击应用执行器里的<span class="guibutton"><strong>设定</strong></span>。</p>
-<p role="presentation">会打开<span class="guilabel"><strong>设定</strong></span>窗口。</p>
+<p role="presentation">会打开<span class="guilabel"><strong>设置</strong></span>窗口。</p>
 </li>
 <li class="step">
 <p role="presentation">在左面单击<span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.settings.notificationarea.html b/help/l10n/zh_CN/ox.appsuite.user.sect.settings.notificationarea.html
index 920aa2bca..d12ba91d9 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.settings.notificationarea.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.settings.notificationarea.html
@@ -64,7 +64,7 @@
 <p role="presentation" class="feat-io-ox-core-managedResources">于接收已管理资源的预定请求时,您能够使用以下功能:<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">要在资源日历里检视预定请求,请单击日期。</p></li>
 <li class="listitem"><p role="presentation">要接受或拒绝预定请求,单击对应的按钮。</p></li>
-</ul></p>
+</ul> </p>
 <p role="presentation">如果有过期任务,您就能够使用以下功能:<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">要在弹出窗口里显示详细,单击通知。</p></li>
 <li class="listitem"><p role="presentation">要编辑任务,请使用弹出窗口里的功能。</p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.settings.notifications.html b/help/l10n/zh_CN/ox.appsuite.user.sect.settings.notifications.html
index caf83643a..fd8fba71f 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.settings.notifications.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.settings.notifications.html
@@ -90,7 +90,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.changes"><b>在一个您有参与的约会被创建、更改、或删除时接收通知。. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.1.1.2"></a>一个您参与的约会重新创建、更改、或删除。</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>在参与者接受或拒绝时,以约会创建者身份接收通知。. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>一个参与者接受或拒绝一个您创建的约会。</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>在参与者接受或拒绝时,以约会参与者身份接收通知。. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>一个参与者接受或拒绝一个您参与的约会。</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>在约会被接受或拒绝后,自动删除邀请电子邮件. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>定义一个约会邀请的电子邮件通知,要否在答应或拒绝后将会被自动删除。请参阅 <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">回应任务邀请</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>在约会接受或拒绝后,自动删除邀请电子邮件. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>定义一个约会邀请的电子邮件通知,要否在答应或拒绝后将会被自动删除。请参阅 <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">回应任务邀请</a></p></li>
 </ul>
 </li>
 </ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.settings.search.html b/help/l10n/zh_CN/ox.appsuite.user.sect.settings.search.html
index 07caf78a2..45b972e36 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.settings.search.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.settings.search.html
@@ -65,6 +65,7 @@
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">日历设定</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">地址簿设定</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">云盘</span>设定</a></p>
+<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>设定</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.settings.search">母主题:<a class="xref" href="ox.appsuite.user.chap.settings.html"><i>自定义设定</i></a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.add.create.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.add.create.html
index 872f8e6c6..b5b3b2d29 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.add.create.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.add.create.html
@@ -57,7 +57,7 @@
 <li class="listitem"><p role="presentation">如果不要显示主题给其他用户,打开<span class="guibutton"><strong>私人</strong></span>。私人任务会标记<span class="guibutton"><strong>私人</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.add.create.private"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span>。</p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.10.5.5.1.1.1.2.4">
 <p role="presentation">视配置而定,您能够分派一个类别到任务。为此,单击<span class="guibutton"><strong>添加类别</strong></span>(在<span class="guibutton"><strong>类别</strong></span>旁边)。选择一个现存类别或创建一个新的。</p>
-<p role="presentation">要删除一个类别,请单击类别旁边的 <span class="guibutton"><strong>删除类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.add.create.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+<p role="presentation">为了删除一个类别,请单击类别旁边的 <span class="guibutton"><strong>移除类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.add.create.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
 </li>
 <li class="listitem"><p role="presentation">为了添加像发单信息的详细信息,单击<span class="guibutton"><strong>显示详情</strong></span>。输入所需数据。</p></li>
 </ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.detailview.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.detailview.html
index 15469dc08..a68dbb113 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.detailview.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.detailview.html
@@ -79,14 +79,11 @@
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任务</span>列表视图</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.create.html">编辑窗口</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">检视任务</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">检视或保存任务附件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">拨接任务参与者</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任务</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">在光环视图里显示联系人</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.gui.detailview">母主题:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">任务</span>元件</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.foldertree.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.foldertree.html
index aa899b72f..ceb2674e0 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.foldertree.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.foldertree.html
@@ -54,6 +54,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">检视任务</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">添加任务列表</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任务</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">管理带文件夹的数据</a></p>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.list.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.list.html
index b56d64f57..fcc5d45b4 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.list.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.list.html
@@ -51,17 +51,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.list.html">列表视图</a></p></li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.settingsmenu.html"><span class="phrase">任务</span>设定菜单</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.detailview.html"><span class="phrase">任务</span>详细视图</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">检视任务</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">检视或保存任务附件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任务</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.list">母主题:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">任务</span>元件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.settingsmenu.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
index 5143adfa6..19c738ab3 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
@@ -48,10 +48,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.menubar.html">菜单条</a></p></li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任务</span>列表视图</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">订阅公共和共享任务列表</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">订阅公共和共享任务列表</a></p></li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.settingsmenu">母主题:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">任务</span>元件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.toolbar.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.toolbar.html
index b06339f49..5a3339cf6 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.toolbar.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.gui.toolbar.html
@@ -52,13 +52,7 @@
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">编辑任务</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">更改任务的截止日期</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">将任务标记为已完成任务</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">将任务移至另一文件夹</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">更改任务确认</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">汇出 任务</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.print.html">打印任务</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.delete.html">删除任务</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任务</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.toolbar">母主题:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">任务</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.categories.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.categories.html
new file mode 100644
index 000000000..9434449b2
--- /dev/null
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.categories.html
@@ -0,0 +1,85 @@
+<html lang="zh_cn">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>对任务使用类别</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="用户向导&gt;">
+<link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="管理任务">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="更改任务的截止日期">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="将任务移至另一文件夹">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">上一页</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">下一页</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">任务</span></h1>
+<h2 class="sr-only">管理任务</h2>
+<div class="sect2" id="ox.appsuite.user.sect.tasks.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">对任务使用类别</h3></div></div></div>
+<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.categories">要独立于文件夹组织任务,您能够使用类别。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">您能够以类别标记任务。</p></li>
+<li class="listitem"><p role="presentation">您能够显示所有已经标记一个指定类别的任务。</p></li>
+</ul>
+<p>您能够创建、编辑、或删除自己的类别,请看<a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a>。</p>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories">
+<p class="title">如何用类别标记任务:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">选择一个任务。在工具条里单击<span class="guibutton"><strong>编辑联系人</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.mark.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>。</p>
+<p role="presentation">会打开任务编辑窗口。</p>
+</li>
+<li class="step">
+<p role="presentation">为此,单击<span class="guibutton"><strong>添加类别</strong></span>(在<span class="guibutton"><strong>类别</strong></span>旁边)。选择一个类别。</p>
+<p role="presentation">为了从任务删除一个类别,请单击类别旁边的 <span class="guibutton"><strong>移除类别</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories.view">
+<p class="title">如何显示已经标记一个指定类别的任务:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">选择一个已经标记类别的任务。</p></li>
+<li class="step"><p role="presentation">单击详细视图里的类别。</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>结果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">列表视图会显示所有已经标记此类别的任务。</p></li>
+<li class="listitem"><p role="presentation">要显示之前的列表,请在搜寻字段里单击<span class="guibutton"><strong>取消搜寻</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p></li>
+</ul>
+          <p>提示: 您还能使用搜寻选项搜寻一个类别去使用搜寻功能。</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.tasks.manage.categories"></p>
+<p class="title">相关主题:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">搜索任务</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">默认使为新电子邮件用直列 PGP</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">对约会使用类别</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">对联系人使用类别</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.tasks.manage.categories">母主题:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任务</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.changeduedate.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.changeduedate.html
index 5e72dd0fd..41cdd8232 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.changeduedate.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.changeduedate.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="管理任务">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="将任务标记为已完成任务">
-<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="将任务移至另一文件夹">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="对任务使用类别">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">下一页</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">下一页</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -43,7 +43,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changeduedate"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任务</span>列表视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.changestatus.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.changestatus.html
index ee5e35e3c..2cf588c5e 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.changestatus.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.changestatus.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理任务</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.changestatus">
 <div class="titlepage"><div><div><h3 class="title">更改任务确认</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.10.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">如果您是一个任务参与者,您就能够稍后为此任务更改您的确认状态。您能够添加一个可见于其他任务参与者的批注。</p>
+<a class="indexterm" name="id-1.10.15.11.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">如果您是一个任务参与者,您就能够稍后为此任务更改您的确认状态。您能够添加一个可见于其他任务参与者的批注。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.changestatus">
 <p class="title">如何更改您的确认:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,7 +44,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changestatus"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任务</span>列表视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.delete.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.delete.html
index ce708d6c6..1948c0354 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.delete.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理任务</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">删除任务</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>警告:</strong></span> <span class="phrase"><strong>无</strong></span>法恢复已删除的任务。</p>
+<a class="indexterm" name="id-1.10.15.15.2"></a><a class="indexterm" name="id-1.10.15.15.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>警告:</strong></span> <span class="phrase"><strong>无</strong></span>法恢复已删除的任务。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.delete">
 <p class="title">如何删除任务:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,7 +44,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.delete"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任务</span>列表视图</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.manage.delete">母主题:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任务</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.export.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.export.html
index 19bcec47f..8888c2396 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.export.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理任务</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.export">
 <div class="titlepage"><div><div><h3 class="title">汇出 任务</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">您能导出 iCal 格式里的任务。您能够使用此格式与其他日历应用程序交换任务。您能够从一个文件夹导出单一或所有任务。</p>
+<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><a class="indexterm" name="id-1.10.15.13.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">您能以 iCal 格式里导出任务。您能够使用此格式与其他日历应用程序交换任务。您能够从一个文件夹导出单一或所有任务。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.export.selected">
 <p class="title">如何导出单一任务:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -42,7 +42,7 @@
 <li class="step"><p role="presentation">单击<span class="guibutton"><strong>汇出</strong></span>。</p></li>
 </ol></div>
 <div class="taskrelated">
-          <p>结果:已导出带有任务的 iCAL 文件将会在下载文件夹里创建。</p>
+          <p>结果:已导出任务的 iCAL 文件将会在下载文件夹里创造。</p>
         </div>
 </div>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.tasks.manage.export.folder">
@@ -53,17 +53,21 @@
 <li class="step"><p role="presentation">单击<span class="guibutton"><strong>汇出</strong></span>。</p></li>
 </ol></div>
 <div class="taskrelated">
-          <p>结果:已导出带有任务的 iCAL 文件将会在下载文件夹里创建。</p>
+          <p>结果:已导出任务的 iCAL 文件将会在下载文件夹里创造。</p>
         </div>
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.export"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html"><span class="phrase">任务</span>文件夹视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任务</span>列表视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">导入任务</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.10.15.12.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下载个人数据</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.10.15.13.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下载个人数据</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.manage.export">母主题:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任务</a></p>
 </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.html
index 6b5ed72c9..4c1d4bc18 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.html
@@ -36,6 +36,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">将任务标记为已完成任务</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">更改任务的截止日期</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">对任务使用类别</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">将任务移至另一文件夹</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">更改任务确认</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">导入任务</a></p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.import.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.import.html
index 759a133fb..d5be0f79c 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.import.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理任务</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.import">
 <div class="titlepage"><div><div><h3 class="title">导入任务</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.11.2"></a><a class="indexterm" name="id-1.10.15.11.3"></a><a class="indexterm" name="id-1.10.15.11.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">您能从文件以 iCal 格式导入任务。</p>
+<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">您能从文件以 iCal 格式导入任务。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.import">
 <p class="title">如何从 iCal 文件导入任务:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -50,6 +50,9 @@
         </div>
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.import"></p>
+<p class="title">用户界面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html"><span class="phrase">任务</span>文件夹视图</a></p></li></ul>
+<p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">汇出 任务</a></p></li>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.markasdone.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.markasdone.html
index dba3204e0..dceb5238d 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.markasdone.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.markasdone.html
@@ -46,7 +46,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.markasdone"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任务</span>列表视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.move.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.move.html
index 6d7172ca2..731cd09ed 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.move.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.move.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="用户向导&gt;">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="管理任务">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="更改任务的截止日期">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="对任务使用类别">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.changestatus.html" title="更改任务确认">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律通告">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">上一页</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">上一页</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始页</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目录</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">下一页</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理任务</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.move">
 <div class="titlepage"><div><div><h3 class="title">将任务移至另一文件夹</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">您能将任务移至别的文件夹。</p>
+<a class="indexterm" name="id-1.10.15.10.2"></a><a class="indexterm" name="id-1.10.15.10.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">您能将任务移至别的文件夹。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.move">
 <p class="title">如何将任务移至别的文件夹:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,7 +46,11 @@
 <p id="ox.appsuite.user.tip.tasks.manage.move">提示:您也能从文件夹视图拖动对象到一个文件夹,以移动选定的对象。</p>
 <p id="ox.appsuite.user.related.tasks.manage.move"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html"><span class="phrase">任务</span>文件夹视图</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任务</span>列表视图</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">添加个人任务列表</a></p></li></ul>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.print.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.print.html
index ccd5040ae..844605ce5 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.print.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理任务</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.print">
 <div class="titlepage"><div><div><h3 class="title">打印任务</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">你能打印一个或多个任务的数据。</p>
+<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">你能打印一个或多个任务的数据。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.print.data">
 <p class="title">如何打印任务数据:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -45,7 +45,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.print"></p>
 <p class="title">用户界面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任务</span>工具条</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任务</span>列表视图</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.manage.print">母主题:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任务</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.search.html b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.search.html
index 3d0499b00..29e3b0d14 100644
--- a/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.search.html
+++ b/help/l10n/zh_CN/ox.appsuite.user.sect.tasks.search.html
@@ -74,14 +74,14 @@
 <li class="listitem"><p role="presentation">您能够在搜寻字段里单击<span class="guibutton"><strong>更多搜寻选项</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.search.options.addfilter"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>以添加过滤器和开始一个新搜寻。</p></li>
 <li class="listitem"><p role="presentation">您能够在过滤器旁边单击<span class="guibutton"><strong>移除过滤器</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.search.options.removefilter"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>以移除一个过滤器和开始一个新搜寻。</p></li>
 </ul>
-        <p>为了结束搜寻,单击在输入字段里的<span class="guibutton"><strong>取消搜寻</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.search.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+        <p>为了结束搜寻,单击在搜寻字段里的<span class="guibutton"><strong>取消搜寻</strong></span>图标<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.search.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
       </div>
 </div>
 <p id="ox.appsuite.user.related.tasks.search"></p>
 <p class="title">相关主题:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">检视任务</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理类别</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">对任务使用类别</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.search">母主题:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任务</a></p>
 </div>
diff --git a/help/l10n/zh_TW/bk01-toc.html b/help/l10n/zh_TW/bk01-toc.html
index 884d2078a..efda4cded 100644
--- a/help/l10n/zh_TW/bk01-toc.html
+++ b/help/l10n/zh_TW/bk01-toc.html
@@ -124,7 +124,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.new.html">新增郵件按鈕</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">電子郵件</span>資料夾畫面</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html"><span class="phrase">電子郵件</span>分頁列</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">收件匣分類列</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.popup.html"><span class="phrase">電子郵件</span>彈出視窗</a></li>
@@ -134,8 +134,8 @@
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.view.html">檢視電子郵件</a></li>
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.attachments.html">檢視或儲存電子郵件附件</a></li>
 <li class="sect1 cap-webmail">
-<a href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a><ul>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></li>
+<a href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a><ul>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">選擇寄件地址</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.replyto.html">設定「回覆至」地址</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">新增附件</a></li>
@@ -164,6 +164,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.movecopy.html">移動或複製郵件</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.mark.html">將郵件標示為已讀或未讀</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.collectaddress.html">收集地址</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">為新郵件預設使用行內 PGP</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.label.html">分類郵件</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.source.html">顯示電子郵件原始內容</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.draft.html">使用電子郵件草稿</a></li>
@@ -175,6 +176,9 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.print.html">列印電子郵件</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.archive.html">封存郵件</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.delete.html">刪除電子郵件</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.recover.html">還原電子郵件</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.deleteforever.html">刪除電子郵件</a></li>
+<li class="sect2 cap-dumpster"><a href="ox.appsuite.user.sect.email.manage.undelete.html">還原永久刪除的電子郵件</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理電子郵件信件匣</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.unifiedmail.html">使用統一郵件</a></li>
 </ul>
@@ -223,7 +227,7 @@
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.attachments.html">檢視或儲存約會附件</a></li>
 <li class="sect1 cap-calendar">
-<a href="ox.appsuite.user.sect.calendar.add.html">創建約會</a><ul>
+<a href="ox.appsuite.user.sect.calendar.add.html">建立約會</a><ul>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.create.html">建立新約會</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.datepicker.html">使用日期選取器</a></li>
 <li class="sect2 cap-calendar cap-switchboard"><a href="ox.appsuite.user.sect.calendar.add.call.html">排程語音/視訊會議</a></li>
@@ -258,6 +262,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changereminder.html">更改約會提醒</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">更改主辦人</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.timezones.html">管理最愛時區</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">使用約會分類</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.colors.html">使用日曆色彩</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.move.html">將約會移至另一行事曆</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.import.html">匯入約會</a></li>
@@ -340,6 +345,7 @@
 <a href="ox.appsuite.user.sect.contacts.manage.html">管理聯絡人</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.contacts.manage.sendmail.html">在通訊錄中傳送郵件</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">邀請聯絡人參與約會</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">使用聯絡人分類</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.movecopy.html">移動或複製聯絡人</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">作為 vCard 發送聯絡人</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.import.html">匯入聯絡人</a></li>
@@ -388,6 +394,7 @@
 <a href="ox.appsuite.user.sect.tasks.manage.html">管理任務</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.markasdone.html">將任務標記為已完成</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">修改任務的到期日</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">使用任務分類</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.move.html">將任務移至另一文件夾</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changestatus.html">修改任務確認</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.import.html">匯入任務</a></li>
@@ -554,15 +561,22 @@
 </ul>
 </li>
 <li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.logout.html">從 <span class="phrase">Guard</span> 登出</a></li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.password.html">密碼管理</a></li>
+<li class="sect1 cap-guard">
+<a href="ox.appsuite.user.sect.guard.password.html">密碼管理</a><ul>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.change.html">更改密碼</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.reset.html">重設密碼</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.password.deleterecovery.html">移除密碼重設功能</a></li>
+</ul>
+</li>
 <li class="sect1 cap-guard">
 <a href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a><ul>
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的 PGP 金鑰</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理收件者的 PGP 金鑰</a></li>
 <li class="sect2 cap-smime"><a href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">管理自己的 S/MIME 金鑰</a></li>
-<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理公鑰</a></li>
+<li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">管理收件者的 S/MIME 金鑰</a></li>
 </ul>
 </li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> 設定</a></li>
+<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>設定</a></li>
 </ul>
 </li>
 <li class="index"><a href="ox.appsuite.user.index.html">索引</a></li>
diff --git a/help/l10n/zh_TW/index.html b/help/l10n/zh_TW/index.html
index c602bca2d..8786c0f5f 100644
--- a/help/l10n/zh_TW/index.html
+++ b/help/l10n/zh_TW/index.html
@@ -34,7 +34,7 @@
 </h3></div></div>
 <div><p class="copyright">版權 ©   OX Software GmbH </p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">法律聲明</a></div>
-<div><p class="pubdate">星期二, 14. 十一月 20238.19.0 版</p></div>
+<div><p class="pubdate">星期四, 21. 十二月 20238.20.0 版</p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">說明主題概覽</h2>
@@ -67,6 +67,13 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">管理帳號</a></p></li>
 </ul>
 </li>
+<li class="listitem" id="ox.appsuite.user.startpage.toc.keyboard" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.chap.keyboard.html"><i>鍵盤輸入</i></a></p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.keyboard.navigation.html">使用鍵盤導航</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.keyboard.shortkeys.html">使用快速鍵</a></p></li>
+</ul>
+</li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.portal" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.chap.portal.html"><i><span class="phrase">入口</span></i></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -80,16 +87,16 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">電子郵件</span>元件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">檢視電子郵件</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.5.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">使用 AI 整合功能</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">撥打給寄件者或其他收件者</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.6.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">使用 AI 整合功能</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">撥打給寄件者或其他收件者</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">新增電子郵件信件匣</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">使用電子郵件過濾器</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">搜尋電子郵件</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.5.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">代理收發信件</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">代理收發信件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">新增電子郵件帳號</a></p></li>
-<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.5.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p></li>
+<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-calendar" id="ox.appsuite.user.startpage.toc.calendar">
@@ -97,19 +104,19 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">行事曆</span>元件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">查看約會</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">回覆約會邀請</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">編輯約會</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">撥打給約會參與者。</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">撥打給約會參與者。</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.html">新增行事曆</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理約會</a></p></li>
-<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.6.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">使用資源行事曆</a></p></li>
+<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.7.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">使用資源行事曆</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">搜尋約會</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">以代理人身分建立、編輯或管理約會</a></p></li>
-<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">使用群組</a></p></li>
-<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.6.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">使用資源</a></p></li>
-<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.6.1.15"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">使用受管理的資源</a></p></li>
-<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.6.1.16"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">日曆設置</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.7.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">以代理人身分建立、編輯或管理約會</a></p></li>
+<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.7.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">使用群組</a></p></li>
+<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">使用資源</a></p></li>
+<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.7.1.15"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">使用受管理的資源</a></p></li>
+<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.7.1.16"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">日曆設置</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-contacts" id="ox.appsuite.user.startpage.toc.contacts">
@@ -118,16 +125,16 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">通訊錄</span> 元件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">顯示通訊錄聯絡人</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">自動從通訊錄新增聯絡人或資源</a></p></li>
-<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">自動從通訊錄新增聯絡人或資源</a></p></li>
+<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.8.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">自動從通訊錄新增聯絡人或資源</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">新增聯絡人</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.html">新增通訊組清單</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">編輯聯絡人或通訊組清單</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">撥打給聯絡人</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.8.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">撥打給聯絡人</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">新增通訊錄</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.managesubscribed.html">重新整理或管理訂閱的通訊錄</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理聯絡人</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">搜尋聯絡人</a></p></li>
-<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">通訊錄設定</a></p></li>
+<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.8.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">通訊錄設定</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-tasks" id="ox.appsuite.user.startpage.toc.tasks">
@@ -154,18 +161,18 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">管理檔案與 <span class="phrase">雲端空間</span>資料夾</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.search.html">搜尋檔案與資料夾</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">新增儲存空間帳號</a></p></li>
-<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.9.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">雲端空間</span>設定</a></p></li>
+<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.10.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">雲端空間</span>設定</a></p></li>
 </ul>
 </li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.dataorganisation" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>資料管理與分享</i></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">使用資料夾管理資料</a></p></li>
-<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.10.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">分享資料</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.10.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">管理代理人</a></p></li>
+<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.11.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">分享資料</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.11.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">管理代理人</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">管理帳號</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.10.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.10.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下載個人資料</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.11.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.11.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下載個人資料</a></p></li>
 </ul>
 </li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.security" style="list-style-type: none">
@@ -174,7 +181,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">自動登出</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.emaillinkedimages.html">郵件中的外部圖片</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.sessions.html">顯示或登出使用中的客戶端</a></p></li>
-<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.11.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">多因素驗證</a></p></li>
+<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.12.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">多因素驗證</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-guard" id="ox.appsuite.user.startpage.toc.guard">
@@ -188,7 +195,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.logout.html">從 <span class="phrase">Guard</span> 登出</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> 設定</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>設定</a></p></li>
 </ul>
 </li>
 </ul>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.chap.calendar.html b/help/l10n/zh_TW/ox.appsuite.user.chap.calendar.html
index 3bdc3827c..3b6f46dc5 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.chap.calendar.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.chap.calendar.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="index.html" title="使用者指南&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="電子郵件設定">
+<link rel="prev" href="ox.appsuite.user.sect.email.mailfilter.apply.html" title="對現有郵件套用規則。">
 <link rel="next" href="ox.appsuite.user.sect.calendar.gui.html" title="行事曆元件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.mailfilter.apply.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.gui.html">下一頁</a></li>
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">行事曆</span>元件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">查看約會</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.attachments.html">檢視或儲存約會附件</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">回覆約會邀請</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">編輯約會</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.8.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">撥打給約會參與者。</a></p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/zh_TW/ox.appsuite.user.chap.dataorganisation.html
index eb25805c1..15c14660f 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.chap.dataorganisation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="index.html" title="使用者指南&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="在 Windows 設定 WebDAV">
+<link rel="prev" href="ox.appsuite.user.sect.drive.settings.html" title="雲端空間設定">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.folder.html" title="使用資料夾管理資料">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.settings.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.folder.html">下一頁</a></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.chap.drive.html b/help/l10n/zh_TW/ox.appsuite.user.chap.drive.html
index 10c75cd53..0488a07e7 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.chap.drive.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="index.html" title="使用者指南&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.search.html" title="搜尋任務">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.delete.html" title="刪除任務">
 <link rel="next" href="ox.appsuite.user.sect.drive.gui.html" title="雲端空間元件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.search.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.delete.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.drive.gui.html">下一頁</a></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.chap.email.html b/help/l10n/zh_TW/ox.appsuite.user.chap.email.html
index 117d4d943..2d7435ccb 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.chap.email.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.chap.email.html
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">電子郵件</span>元件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">檢視電子郵件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">檢視或儲存電子郵件附件</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">使用 AI 整合功能</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.7.7.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">撥打給寄件者或其他收件者</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">新增電子郵件信件匣</a></p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.chap.guard.html b/help/l10n/zh_TW/ox.appsuite.user.chap.guard.html
index ca30576b6..0726692c3 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.chap.guard.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="index.html" title="使用者指南&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="管理驗證方式">
+<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="自動登出">
 <link rel="next" href="ox.appsuite.user.sect.guard.setup.html" title="設定 Guard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.autologout.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.setup.html">下一頁</a></li>
@@ -48,7 +48,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.logout.html">從 <span class="phrase">Guard</span> 登出</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> 設定</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>設定</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.guard">可在 <a class="xref" href="ox.appsuite.user.chap.security.html"><i>資料安全性</i></a> 找到更多與安全性相關的資訊。</p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.chap.security.html b/help/l10n/zh_TW/ox.appsuite.user.chap.security.html
index ad54286c0..f1a4ee631 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.chap.security.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.chap.security.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="index.html" title="使用者指南&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="檢視、編輯、刪除帳號">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="下載個人資料">
 <link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="顯示或登出使用中的客戶端">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">下一頁</a></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.chap.tasks.html b/help/l10n/zh_TW/ox.appsuite.user.chap.tasks.html
index 7463711d5..52582240c 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.chap.tasks.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.chap.tasks.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="index.html" title="使用者指南&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="通訊錄設定">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.delete.html" title="刪除聯絡人">
 <link rel="next" href="ox.appsuite.user.sect.tasks.gui.html" title="任務元件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.settings.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.delete.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.gui.html">下一頁</a></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.index.html b/help/l10n/zh_TW/ox.appsuite.user.index.html
index 4e8f6b2f3..c31292349 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.index.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="index.html" title="使用者指南&gt;">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="Guard 設定">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="管理收件者的 S/MIME 金鑰">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -21,7 +21,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.settings.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 </ul></div>
@@ -88,6 +88,8 @@
 <dt class="cap-tasks">任務, <a class="indexterm" href="ox.appsuite.user.chap.tasks.html">任務</a>
 </dt>
 <dd><dl>
+<dt class="feat-io-ox-core-categories">使用分類, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">使用任務分類</a>
+</dt>
 <dt class="cap-tasks">修改到期日, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">修改任務的到期日</a>
 </dt>
 <dt class="cap-tasks">修改確認, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">修改任務確認</a>
@@ -219,7 +221,7 @@
 <dd><dl>
 <dt class="cap-contacts">聯絡人作為 vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">作為 vCard 發送聯絡人</a>
 </dt>
-<dt class="cap-webmail">電子郵件, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a>
+<dt class="cap-webmail">電子郵件, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a>
 </dt>
 </dl></dd>
 <dt class="cap-portal">入口, <a class="indexterm" href="ox.appsuite.user.chap.portal.html">入口</a>
@@ -299,8 +301,18 @@
 <dd><dl><dt class="cap-webmail">使用收件匣分頁, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">使用收件匣分類</a>
 </dt></dl></dd>
 <dt class="feat-io-ox-core-categories">分類</dt>
-<dd><dl><dt class="feat-io-ox-core-categories">管理, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="feat-io-ox-core-categories">任務使用, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">使用任務分類</a>
+</dt>
+<dt class="feat-io-ox-core-categories">管理, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a>
+</dt>
+<dt class="feat-io-ox-core-categories">約會使用, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">使用約會分類</a>
+</dt>
+<dt class="feat-io-ox-core-categories">聯絡人使用, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">使用聯絡人分類</a>
+</dt>
+<dt class="feat-io-ox-core-categories">郵件使用, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">為新郵件預設使用行內 PGP</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">列印</dt>
 <dd><dl>
 <dt class="cap-tasks">任務, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.print.html">列印任務</a>
@@ -334,7 +346,7 @@
 </dt>
 <dt class="">資料夾, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.delete.html">刪除文件夾</a>
 </dt>
-<dt class="cap-webmail">電子郵件, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">刪除電子郵件</a>
+<dt class="cap-webmail">電子郵件, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">刪除電子郵件</a>, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">刪除電子郵件</a>
 </dt>
 </dl></dd>
 <dt class="cap-guard">加密</dt>
@@ -381,9 +393,9 @@
 </dl></dd>
 <dt class="cap-webmail">匯入</dt>
 <dd><dl>
-<dt class="cap-contacts">CSV 格式的聯絡人, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">匯入聯絡人</a>
+<dt class="cap-contacts">CSV 格式的聯繫人, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">匯入聯絡人</a>
 </dt>
-<dt class="cap-contacts">vCard 格式的聯絡人, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">匯入聯絡人</a>
+<dt class="cap-contacts">vCard 格式的聯繫人, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">匯入聯絡人</a>
 </dt>
 <dt class="cap-tasks">任務, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">匯入任務</a>
 </dt>
@@ -486,9 +498,9 @@
 </dt>
 <dt class="">密碼</dt>
 <dd><dl>
-<dt class="cap-guard">Guard 更改密碼, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a>
+<dt class="cap-guard">Guard 更改密碼, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">更改密碼</a>
 </dt>
-<dt class="cap-guard">Guard 重設密碼, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a>
+<dt class="cap-guard">Guard 重設密碼, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">重設密碼</a>
 </dt>
 <dt class="">使用應用程式密碼, <a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">使用應用程式密碼</a>
 </dt>
@@ -617,7 +629,7 @@
 </dt>
 <dt class="cap-infostore">雲端空間資料夾, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.html">雲端空間:新增資料夾</a>, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.personal.html">雲端空間:建立資料夾</a>
 </dt>
-<dt class="cap-webmail">電子郵件, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a>
+<dt class="cap-webmail">電子郵件, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a>
 </dt>
 </dl></dd>
 <dt class="cap-infostore">新增儲存空間帳號, <a class="indexterm" href="ox.appsuite.user.sect.drive.accounts.html">新增儲存空間帳號</a>
@@ -651,7 +663,7 @@
 </dt>
 <dt class="cap-calendar">工作時間, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">日曆設置</a>
 </dt>
-<dt class="cap-calendar">顯示拒絕的約會, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">日曆設置</a>
+<dt class="cap-calendar">顯示被拒絕的約會, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">日曆設置</a>
 </dt>
 </dl></dd>
 <dt class="cap-calendar">日期選取器, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">日期選取器</a>
@@ -799,6 +811,8 @@
 </dt>
 <dt class="">使用倒數計時, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">自訂通知</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">對約會使用倒數計時</a>
 </dt>
+<dt class="feat-io-ox-core-categories">使用分類, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">使用約會分類</a>
+</dt>
 <dt class="cap-calendar">使用排程畫面, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">使用排程畫面</a>
 </dt>
 <dt class="cap-calendar">使用日曆色彩, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">使用日曆色彩</a>
@@ -914,6 +928,8 @@
 <dd><dl>
 <dt class="cap-contacts">作為 vCard 發送, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">作為 vCard 發送聯絡人</a>
 </dt>
+<dt class="feat-io-ox-core-categories">使用分類, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">使用聯絡人分類</a>
+</dt>
 <dt class="cap-webmail">傳送郵件, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">在通訊錄中傳送郵件</a>
 </dt>
 <dt class="cap-contacts">儲存附件, <a class="indexterm" href="ox.appsuite.user.sect.contacts.attachments.html">檢視或保存聯絡人附件</a>
@@ -988,6 +1004,8 @@
 <dt class="cap-calendar">行事曆, <a class="indexterm" href="ox.appsuite.user.chap.calendar.html">行事曆</a>
 </dt>
 <dd><dl>
+<dt class="feat-io-ox-core-categories">使用分類, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">使用約會分類</a>
+</dt>
 <dt class="cap-calendar">使用約會排程, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">使用排程畫面</a>
 </dt>
 <dt class="cap-calendar">使用行事曆色彩, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">使用日曆色彩</a>
@@ -1103,16 +1121,16 @@
 </dt>
 <dt class="cap-contacts">通訊錄, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">訂閱外部通訊錄</a>
 </dt>
-<dt class="cap-contacts">重新整理通訊錄, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.managesubscribed.html">重新整理或管理訂閱的通訊錄</a>
+<dt class="cap-share_links cap-share_mail_attachments">郵件資料夾, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">訂閱共享或個人電子郵件信件匣</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">電子郵件信件匣, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">訂閱共享或個人電子郵件信件匣</a>
+<dt class="cap-contacts">重新整理通訊錄, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.managesubscribed.html">重新整理或管理訂閱的通訊錄</a>
 </dt>
 </dl></dd>
 <dt class="cap-portal">訂閱 RSS 資訊來源, <a class="indexterm" href="ox.appsuite.user.sect.portal.customize.add.html">新增入口小工具</a>
 </dt>
 <dt class="">設定</dt>
 <dd><dl>
-<dt class="cap-guard">Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+<dt class="cap-guard">Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard設定</a>
 </dt>
 <dt class="cap-dataexport">下載個人資料, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下載個人資料</a>
 </dt>
@@ -1141,7 +1159,9 @@
 </dt>
 <dt class="cap-multifactor">設定驗證方式, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.settings.html">設定驗證方式</a>
 </dt>
-<dt class="">詳細畫面, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.detailview.html">詳細畫面。</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">如何在詳細畫面中顯示聯絡人</a>
+<dt class="">詳細畫面, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.detailview.html">詳細畫面。</a>
+</dt>
+<dt class="cap-webmail cap-calendar cap-tasks">詳細視圖, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">如何在詳細畫面中顯示聯絡人</a>
 </dt>
 <dt class="">詳細資訊畫面,參考彈出視窗, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.popup.html">彈出視窗</a>
 </dt>
@@ -1168,14 +1188,14 @@
 </dt>
 <dt class="cap-infostore">新增至我的最愛, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.favorite.html">將 雲端空間資料夾新增為我的最愛</a>
 </dt>
+<dt class="">更名, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">重命名文件夾</a>
+</dt>
 <dt class="">權限, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.permissions.html">權限的用途是什麼?</a>
 </dt>
 <dt class="">移動, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.move.html">移動文件夾</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">訂閱電子郵件信件匣, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">訂閱共享或個人電子郵件信件匣</a>
 </dt>
-<dt class="">重命名, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.rename.html">重命名文件夾</a>
-</dt>
 <dt class="">開啟, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">在資料夾結構中瀏覽</a>
 </dt>
 <dt class="">隱藏, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.hide.html">隱藏資料夾</a>
@@ -1326,6 +1346,13 @@
 <dt class="cap-webmail">電子郵件, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a>
 </dt>
 </dl></dd>
+<dt class="cap-webmail">還原</dt>
+<dd><dl>
+<dt class="cap-dumpster">永久刪除的郵件, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">還原永久刪除的電子郵件</a>
+</dt>
+<dt class="cap-webmail">電子郵件, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">還原電子郵件</a>
+</dt>
+</dl></dd>
 <dt class="cap-webmail">郵件</dt>
 <dd><dl>
 <dt class="cap-portal">新增至入口, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.addportal.html">新增郵件到入口</a>
@@ -1456,14 +1483,12 @@
 </dt>
 </dl></dd>
 <dt class="cap-infostore">雲端空間 settings</dt>
+<dd><dl><dt class="cap-infostore">版本紀錄, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">雲端空間設定</a>
+</dt></dl></dd>
+<dt class="cap-infostore">雲端空間設定</dt>
 <dd><dl>
 <dt class="cap-infostore">圖片簡報, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">雲端空間設定</a>
 </dt>
-<dt class="cap-infostore">版本紀錄, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">雲端空間設定</a>
-</dt>
-</dl></dd>
-<dt class="cap-infostore">雲端空間設定</dt>
-<dd><dl>
 <dt class="cap-infostore">新增檔案, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">雲端空間設定</a>
 </dt>
 <dt class="cap-infostore">顯示隱藏檔案與資料夾, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">雲端空間設定</a>
@@ -1476,21 +1501,23 @@
 </dt>
 <dt class="cap-deputy">以代理身分管理, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">代理收發信件</a>
 </dt>
-<dt class="cap-infostore">以連結傳送附件, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">以連結傳送附件</a>
-</dt>
 <dt class="feat-io-ox-core-openai">使用 AI 功能回覆郵件, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">使用 AI 功能回覆郵件</a>
 </dt>
 <dt class="feat-io-ox-core-openai">使用 AI 整合功能, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">使用 AI 整合功能</a>
 </dt>
+<dt class="feat-io-ox-core-categories">使用分類, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">為新郵件預設使用行內 PGP</a>
+</dt>
 <dt class="feat-io-ox-core-templates">使用範本, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">使用範本</a>
 </dt>
 <dt class="cap-webmail">使用簽名, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">使用簽名檔</a>
 </dt>
 <dt class="cap-webmail">使用草稿, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">使用電子郵件草稿</a>
 </dt>
+<dt class="cap-webmail">信件匣畫面, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">電子郵件資料夾畫面</a>
+</dt>
 <dt class="cap-webmail">停用或啟用功能性郵件帳號, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">停用或啟用功能性郵件帳號</a>
 </dt>
-<dt class="cap-webmail">傳送, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a>
+<dt class="cap-webmail">傳送, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a>
 </dt>
 <dt class="cap-webmail">傳送假期通知, <a class="indexterm" href="ox.appsuite.user.sect.email.send.vacationnotice.html">自動傳送假期通知</a>
 </dt>
@@ -1504,8 +1531,6 @@
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">分享,檢視分享, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">分享資料</a>
 </dt>
-<dt class="cap-webmail">分頁列, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">電子郵件分頁列</a>
-</dt>
 <dt class="cap-webmail">分類, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">分類郵件</a>
 </dt>
 <dt class="cap-webmail">列印, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">列印電子郵件</a>
@@ -1528,8 +1553,6 @@
 </dt>
 <dt class="cap-webmail">封存, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">封存郵件</a>
 </dt>
-<dt class="cap-webmail">將信件匣標示為已讀, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">將郵件標示為已讀或未讀</a>
-</dt>
 <dt class="cap-webmail">工具列, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.toolbar.html">電子郵件工具列</a>
 </dt>
 <dt class="cap-tasks">建立提醒, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.reminder.html">建立郵件提醒</a>
@@ -1546,6 +1569,8 @@
 </dt>
 <dt class="cap-webmail">收件匣分類, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">使用收件匣分類</a>
 </dt>
+<dt class="cap-webmail">收件匣分類列, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">收件匣分類列</a>
+</dt>
 <dt class="cap-webmail">收集到的地址, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">收集地址</a>
 </dt>
 <dt class="cap-webmail">新增信件匣, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">新增電子郵件信件匣</a>
@@ -1564,10 +1589,14 @@
 </dt>
 <dt class="cap-webmail">檢視附件, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">檢視或儲存電子郵件附件</a>
 </dt>
+<dt class="cap-webmail">永久刪除, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">刪除電子郵件</a>
+</dt>
 <dt class="cap-webmail">清單畫面, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.list.html">電子郵件清單畫面</a>
 </dt>
 <dt class="cap-webmail">清理資料夾, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理電子郵件信件匣</a>
 </dt>
+<dt class="cap-infostore">發送附件鏈結, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">以連結傳送附件</a>
+</dt>
 <dt class="cap-calendar">發送電子郵件給參與者, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attendees.html">發送電子郵件給參與者</a>
 </dt>
 <dt class="cap-webmail">移動, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">移動或複製郵件</a>
@@ -1592,8 +1621,6 @@
 </dt>
 <dt class="cap-webmail">詳細畫面, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.detailview.html">電子郵件詳細畫面</a>
 </dt>
-<dt class="cap-webmail">資料夾畫面, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">電子郵件資料夾畫面</a>
-</dt>
 <dt class="cap-webmail">轉寄, <a class="indexterm" href="ox.appsuite.user.sect.email.send.forward.html">轉發電子郵件</a>
 </dt>
 <dt class="cap-guard">轉移 Autocrypt 金鑰, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">轉移 Autocrypt 金鑰到其他客戶端</a>
@@ -1602,6 +1629,10 @@
 </dt>
 <dt class="cap-webmail">過濾器, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">使用電子郵件過濾器</a>
 </dt>
+<dt class="cap-webmail">還原, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">還原電子郵件</a>
+</dt>
+<dt class="cap-dumpster">還原永久刪除的郵件, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">還原永久刪除的電子郵件</a>
+</dt>
 <dt class="cap-guard">閱讀加密郵件, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">閱讀加密郵件</a>
 </dt>
 <dt class="cap-webmail">顯示, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">檢視電子郵件</a>
@@ -1661,6 +1692,8 @@
 </dt>
 <dt class="cap-webmail">預設字體樣式, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a>
 </dt>
+<dt class="cap-webmail">顯示分類, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a>
+</dt>
 <dt class="cap-webmail">顯示包含所有已標示訊息的信件匣, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a>
 </dt>
 <dt class="cap-webmail">顯示包含所有未讀訊息的信件匣, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a>
@@ -1805,7 +1838,7 @@
 <dd><dl>
 <dt class="cap-guard">下載加密檔案, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.download.html">下載加密檔案</a>
 </dt>
-<dt class="cap-guard">使用 Autocrypt 傳送加密郵件, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.html">使用 Autocrypt 加密郵件通訊</a>
+<dt class="cap-guard">使用 Autocrypt 傳送加密郵件, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.html">使用 Autocrypt 加密郵件通訊</a>, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">匯入 Autocrypt 金鑰</a>
 </dt>
 <dt class="cap-guard">傳送加密郵件, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">傳送加密郵件</a>
 </dt>
@@ -1815,8 +1848,6 @@
 </dt>
 <dt class="cap-guard">加密來信, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">根據過濾器規則加密來信</a>
 </dt>
-<dt class="cap-guard">匯入 Autocrypt 金鑰, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">匯入 Autocrypt 金鑰</a>
-</dt>
 <dt class="cap-guard">密碼管理, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a>
 </dt>
 <dt class="cap-guard">將選擇的文件儲存為加密格式, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.saveencrypted.html">以加密格式儲存選擇的文件。</a>
@@ -1825,13 +1856,17 @@
 </dt>
 <dt class="cap-guard">建立新加密檔案, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.upload.html">透過加密方式安全地上傳檔案或資料夾</a>
 </dt>
-<dt class="cap-guard">更改密碼, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a>
+<dt class="cap-guard">更改密碼, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.change.html">更改密碼</a>
 </dt>
 <dt class="cap-guard">檔案加密, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.html">加密或解密檔案</a>, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.encrypt.html">加密檔案</a>
 </dt>
 <dt class="cap-guard">登出, <a class="indexterm" href="ox.appsuite.user.sect.guard.logout.html">從 Guard 登出</a>
 </dt>
-<dt class="cap-guard">管理公鑰, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理公鑰</a>
+<dt class="cap-guard">移除密碼重設功能, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">移除密碼重設功能</a>
+</dt>
+<dt class="cap-guard">管理收件者的 PGP 金鑰, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理收件者的 PGP 金鑰</a>
+</dt>
+<dt class="cap-guard">管理收件者的 S/MIME 金鑰, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">管理收件者的 S/MIME 金鑰</a>
 </dt>
 <dt class="cap-guard">管理自己的 PGP 金鑰, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的 PGP 金鑰</a>
 </dt>
@@ -1839,13 +1874,13 @@
 </dt>
 <dt class="cap-guard">解密檔案, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.decrypt.html">解密檔案</a>
 </dt>
-<dt class="cap-guard">設定, <a class="indexterm" href="ox.appsuite.user.sect.guard.setup.html">設定 Guard</a>, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+<dt class="cap-guard">設定, <a class="indexterm" href="ox.appsuite.user.sect.guard.setup.html">設定 Guard</a>, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard設定</a>
 </dt>
 <dt class="cap-guard">轉移 Autocrypt 金鑰到其他客戶端, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">轉移 Autocrypt 金鑰到其他客戶端</a>
 </dt>
 <dt class="cap-guard">郵件加密, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.html">加密郵件通訊</a>
 </dt>
-<dt class="cap-guard">重設密碼, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a>
+<dt class="cap-guard">重設密碼, <a class="indexterm" href="ox.appsuite.user.sect.guard.password.reset.html">重設密碼</a>
 </dt>
 <dt class="cap-guard">金鑰管理, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a>
 </dt>
@@ -1862,22 +1897,29 @@
 </dl></dd>
 <dt class="cap-guard">Guard 安全性設定</dt>
 <dd><dl>
-<dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+<dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard設定</a>
+</dt>
+<dt class="cap-guard">Autocrypt 選項, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard設定</a>
+</dt>
+<dt class="cap-guard">郵件快取設定, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard設定</a>
 </dt>
-<dt class="cap-guard">進階設定, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+<dt class="cap-guard">重設選項, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard設定</a>
+</dt>
+<dt class="cap-guard">顯示撰寫郵件時的進階選項, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard設定</a>
 </dt>
 </dl></dd>
+<dt class="cap-guard">Guard 設定</dt>
+<dd><dl><dt class="cap-guard">撰寫選項, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard設定</a>
+</dt></dl></dd>
 <dt class="cap-guard">Guard安全性設定</dt>
 <dd><dl>
-<dt class="cap-guard">S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
-</dt>
-<dt class="cap-guard">撰寫郵件時預設在寄出郵件時加密, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+<dt class="cap-guard">撰寫郵件時預設在寄出郵件時加密, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard設定</a>
 </dt>
-<dt class="cap-guard">為新郵件預設使用行內 PGP, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+<dt class="cap-guard">為新郵件預設使用行內 PGP, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard設定</a>
 </dt>
-<dt class="cap-guard">記住密碼預設值, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+<dt class="cap-guard">記住密碼預設值, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard設定</a>
 </dt>
-<dt class="cap-guard">預設在外寄郵件中加入簽章, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+<dt class="cap-guard">預設在外寄郵件中加入簽章, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard設定</a>
 </dt>
 </dl></dd>
 </dl>
@@ -1937,7 +1979,7 @@
 <h3>S</h3>
 <dl>
 <dt class="cap-guard">Security</dt>
-<dd><dl><dt class="cap-guard">Guard 設定, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard 設定</a>
+<dd><dl><dt class="cap-guard">Guard 設定, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard設定</a>
 </dt></dl></dd>
 </dl>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.about.glossary.html b/help/l10n/zh_TW/ox.appsuite.user.sect.about.glossary.html
index 9d1066312..bfae9b1e9 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.about.glossary.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.about.glossary.html
@@ -69,8 +69,8 @@
 </dd>
 <dt class="feat-io-ox-core-categories" id="ox.appsuite.user.reference.about.glossary.categories"><span class="glossterm">分類</span></dt>
 <dd class="glossdef feat-io-ox-core-categories">
-<p role="presentation">可用來分類約會、聯絡人、任務的分類。透過這個方式,可以簡單找出相關目的的物件。視設定而定,會預先設定好某些分類。您可自行設定分類。</p>
-<p role="presentation">註:無法對郵件設定這些分類。若需分類郵件,可使用收件匣分頁。</p>
+<p role="presentation">您可以在不同應用程式中,使用分類來管理郵件、約會、聯絡人,無須只能使用資料夾功能。此功能讓使用者能更簡單地就能找到邏輯上相關的物件,例如特定專案或客戶的所有約會、聯絡人。視設定而定,會預先設定好某些分類。您可自行設定分類。</p>
+<p role="presentation">註:對於電子郵件來說,您也可以使用收件匣標籤。</p>
 <p role="presentation">相關主題:<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a></p></li></ul></p>
 </dd>
 <dt id="ox.appsuite.user.reference.about.glossary.participant"><span class="glossterm">參與者</span></dt>
@@ -132,11 +132,11 @@
 <p role="presentation">包含所有使用者的地址資料。視設定而定,每位使用者可以編輯位於此通訊錄中的個人資料。</p>
 <p role="presentation">視設定而定,此通訊錄可以有不同名稱,例如<span class="guilabel"><strong>內部使用者</strong></span>或<span class="guilabel"><strong>全域通訊錄</strong></span>。</p>
 </dd>
-<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">收件匣分頁</span></dt>
+<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">收件匣分類</span></dt>
 <dd class="glossdef cap-webmail">
 <p role="presentation">收件匣分頁功能讓您可以輕鬆整理<span class="guilabel"><strong>收件匣</strong></span>當中的信件。透過分頁,收到的郵件將會根據寄件者的不同儲存於 <span class="guilabel"><strong>收件匣</strong></span>。視設定而定,會預先設定好某些收件匣分頁。可依照您的需求設定其他收件匣分頁。</p>
 <p role="presentation">僅能對<span class="guilabel"><strong>收件匣</strong></span>設定收件匣分頁。若您需要其他儲存選項,請使用資料夾畫面來建立信件匣。</p>
-<p role="presentation" class="feat-io-ox-core-categories">註:此處的收件匣分頁僅對電子郵件有效。視設定而定,您可以使用不同分類來顯示約會、聯絡人與任務。</p>
+<p role="presentation" class="feat-io-ox-core-categories">註:此處的收件匣分類僅對電子郵件有效。視設定而定,您可以使用不同分類來顯示郵件、約會、聯絡人與任務。</p>
 <p role="presentation">相關主題:<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">使用收件匣分類</a></p></li></ul></p>
 </dd>
 <dt id="ox.appsuite.user.reference.about.glossary.object"><span class="glossterm">物件</span></dt>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.alarms.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.alarms.html
index c7d1b7892..c401767dd 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.alarms.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.alarms.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.display.html" title="設定約會的顯示方式">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.participants.html" title="添加參與者或資源">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.alarms">
 <div class="titlepage"><div><div><h3 class="title">使用約會提醒</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.12.2"></a><p id="ox.appsuite.user.concept.calendar.add.alarms">建立或編輯約會時,您可以設定要在約會到期時收到提醒。要這樣做,您可以使用下列一或多個通知:</p>
@@ -59,7 +59,7 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">更改約會提醒</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.alarms">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.alarms">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.attachments.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.attachments.html
index 50471b9b3..1a5e9a7b1 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.attachments.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.attachments.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.participants.html" title="添加參與者或資源">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="使用排程畫面">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attachments">
 <div class="titlepage"><div><div><h3 class="title">新增附件</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.14.2"></a><a class="indexterm" name="id-1.8.10.14.3"></a><p id="ox.appsuite.user.concept.calendar.add.attachments">是設定而定,您可以將儲存在電腦或 <span class="phrase">雲端空間</span>應用程式中的檔案附加到信件中。</p>
@@ -53,7 +53,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">建立新約會</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">編輯約會</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.attachments">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attachments">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.attendees.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.attendees.html
index 63f1ea319..5a78cfd28 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.attendees.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.followup.html" title="建立後續約會">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="邀請郵件收件者參與約會">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attendees">
 <div class="titlepage"><div><div><h3 class="title">邀請參與者到新約會</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.17.2"></a><p id="ox.appsuite.user.concept.calendar.add.attendees">若約會有多個參與者,您可以一次邀請這些參與者至新約會。</p>
@@ -65,7 +65,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">解決衝突</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.attendees">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attendees">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.call.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.call.html
index f9d67d01a..e22b3961b 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.call.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.call.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="使用日期選取器">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.serial.html" title="設定重複發生的約會">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.call">
 <div class="titlepage"><div><div><h3 class="title">排程語音/視訊會議</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.9.2"></a><a class="indexterm" name="id-1.8.10.9.3"></a><a class="indexterm" name="id-1.8.10.9.4"></a><a class="indexterm" name="id-1.8.10.9.5"></a><a class="indexterm" name="id-1.8.10.9.6"></a><p id="ox.appsuite.user.precondition.calendar.add.call">先備需求:您必須設定一組語音或視訊會議服務商的帳號。</p>
@@ -66,7 +66,7 @@
 <p role="presentation" class="feat-jitsi"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.jitsi">Jitsi 會議</a></p>
 <p role="presentation" class="feat-zoom"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.zoom">Zoom 會議</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.call">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.call">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.conflicthandling.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.conflicthandling.html
index 2beb382df..5f00a3ded 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.conflicthandling.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.conflicthandling.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="從 iCal 附件建立約會">
 <link rel="next" href="ox.appsuite.user.sect.calendar.invitation.html" title="回覆約會邀請">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.conflicthandling">
 <div class="titlepage"><div><div><h3 class="title">解決衝突</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.20.2"></a><p id="ox.appsuite.user.concept.calendar.add.conflicthandling">如果出現以下情形,將會發生約會衝突:</p>
@@ -67,7 +67,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">使用排程畫面</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">建立後續約會</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.create.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.create.html
index 7558314a3..9a6465f46 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.create.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.create.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="使用日期選取器">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.create">
 <div class="titlepage"><div><div><h3 class="title">建立新約會</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.7.2"></a><a class="indexterm" name="id-1.8.10.7.3"></a><div class="task" id="ox.appsuite.user.task.calendar.add.create">
@@ -111,7 +111,7 @@
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">編輯約會</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.create">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.create">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.datepicker.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.datepicker.html
index 613ef23f6..9b8786271 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.datepicker.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.datepicker.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.create.html" title="建立新約會">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.call.html" title="排程語音/視訊會議">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.datepicker">
 <div class="titlepage"><div><div><h3 class="title">使用日期選取器</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.8.2"></a><p id="ox.appsuite.user.concept.calendar.add.datepicker">日期選取器讓你可以選擇日期來輸入到日期欄位中。</p>
@@ -82,7 +82,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">編輯任務</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.datepicker">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.datepicker">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.display.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.display.html
index 5af7fedfc..7046ca5db 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.display.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.display.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.serial.html" title="設定重複發生的約會">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="使用約會提醒">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.display">
 <div class="titlepage"><div><div><h3 class="title">設定約會的顯示方式</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.11.2"></a><p id="ox.appsuite.user.concept.calendar.add.display">有下列選項:</p>
@@ -70,7 +70,7 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">約會如何顯示於行事曆畫面?</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.display">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.display">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.followup.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.followup.html
index 8af7496b2..16696f5ab 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.followup.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.followup.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="使用排程畫面">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="邀請參與者到新約會">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.followup">
 <div class="titlepage"><div><div><h3 class="title">建立後續約會</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.16.2"></a><a class="indexterm" name="id-1.8.10.16.3"></a><p id="ox.appsuite.user.concept.calendar.add.followup">您可以為目前約會建立後續約會。將預先填寫目前約會資料至後續約會中。</p>
@@ -62,7 +62,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">解決衝突</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.followup">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.followup">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.html
index dd630869c..f8cef41ca 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.html
@@ -1,7 +1,7 @@
 <html lang="zh_tw">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>創建約會</title>
+<title>建立約會</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.add">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">創建約會</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">建立約會</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.calendar.add">了解如何建立約會,以及自訂約會內容的相關功能:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">建立新約會</a></p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.icalattachment.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.icalattachment.html
index a57e4fe3f..0621a9487 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.icalattachment.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.icalattachment.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="邀請郵件收件者參與約會">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="解決衝突">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.icalattachment">
 <div class="titlepage"><div><div><h3 class="title">從 iCal 附件建立約會</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.19.2"></a><a class="indexterm" name="id-1.8.10.19.3"></a><p id="ox.appsuite.user.concept.calendar.add.icalattachment">您可以從電子郵件的 iCal 附件建立約會。iCal 附件可通過檔案的副檔名為 .ics 識別。</p>
@@ -47,7 +47,7 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">建立新約會</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">解決衝突</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.icalattachment">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.icalattachment">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.participants.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.participants.html
index e54411f6b..89b931ef2 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.participants.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.participants.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="使用約會提醒">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="新增附件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.participants">
 <div class="titlepage"><div><div><h3 class="title">添加參與者或資源</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.13.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.participants">
@@ -62,6 +62,7 @@
 <li class="listitem"><p role="presentation">若外部參與者接受約會,將會收到電子郵件。</p></li>
 </ul>
           <p role="presentation" class="feat-io-ox-core-managedResources">註:新增受管理的資源時,預約代理人會收到該資源的借用請求。當預約代理人接受或拒絕您對資源的借用請求時,將收到通知。</p>
+          
         </div>
 </div>
 <p id="ox.appsuite.user.tip.calendar.add.participants">秘訣:要尋找所有人都空閒的約會與資源,您可以 使用<a class="link" href="ox.appsuite.user.sect.calendar.add.scheduling.html">排程畫面</a>。</p>
@@ -77,7 +78,7 @@
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">自動從通訊錄新增聯絡人或資源</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">自動從通訊錄新增聯絡人或資源</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.participants">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.participants">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.recipients.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.recipients.html
index 70bc1d9c1..76d961136 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.recipients.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.recipients.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="邀請參與者到新約會">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="從 iCal 附件建立約會">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.recipients">
 <div class="titlepage"><div><div><h3 class="title">邀請郵件收件者參與約會</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.18.2"></a><p id="ox.appsuite.user.concept.calendar.add.recipients">您可以將寄出或收到的郵件中當中的所有收件者,新增至新約會。</p>
@@ -57,7 +57,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">解決衝突</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.recipients">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.recipients">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.scheduling.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.scheduling.html
index baa4d997b..e45088960 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.scheduling.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.scheduling.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="新增附件">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.followup.html" title="建立後續約會">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.scheduling">
 <div class="titlepage"><div><div><h3 class="title">使用排程畫面</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.15.2"></a><a class="indexterm" name="id-1.8.10.15.3"></a><a class="indexterm" name="id-1.8.10.15.4"></a><a class="indexterm" name="id-1.8.10.15.5"></a><p id="ox.appsuite.user.concept.calendar.add.scheduling">與多個參與者排定約會並使用多個資源時,排程畫面將顯示每個您想要新增為參與者的使用者,以及使用到的資源的空閒與忙碌時間。</p>
@@ -91,7 +91,7 @@
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy">對他人顯示空閒/忙碌資訊</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.scheduling">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.scheduling">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.serial.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.serial.html
index b55e6b030..283747bb5 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.serial.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.add.serial.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.call.html" title="排程語音/視訊會議">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.display.html" title="設定約會的顯示方式">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
-<h2 class="sr-only">創建約會</h2>
+<h2 class="sr-only">建立約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.serial">
 <div class="titlepage"><div><div><h3 class="title">設定重複發生的約會</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.10.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.serial">
@@ -103,7 +103,7 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.serial.html">建立重複發生任務</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.serial">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.serial">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.attachments.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.attachments.html
index 43c09b895..426adb536 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.attachments.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="行事曆">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.view.appointments.html" title="約會如何顯示於行事曆畫面?">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="創建約會">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="建立約會">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.deputy.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.deputy.html
index 09641a031..c2c2290bb 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.deputy.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.deputy.html
@@ -58,7 +58,7 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理約會</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.create.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.create.html
index 58249d15a..973d3ad2b 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.create.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.create.html
@@ -103,7 +103,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">行事曆</span>詳細畫面</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">建立新約會</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 <p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">以代理人身分建立、編輯或管理約會</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">編輯約會</a></p>
 </li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.detailview.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.detailview.html
index f138eab47..51d85c973 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.detailview.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.detailview.html
@@ -97,10 +97,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">如何在詳細畫面中顯示聯絡人</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">撥打給約會參與者。</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">更改約會狀態</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">更改約會提醒</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理約會</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.detailview">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">行事曆</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.foldertree.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.foldertree.html
index 847a44cab..b520c1a69 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.foldertree.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.foldertree.html
@@ -60,7 +60,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">查看約會</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">新增個人行事曆</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">使用日曆色彩</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理約會</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.add.html">新增資源行事曆到資源行事曆群組</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.edit.html">編輯資源行事曆</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">使用資源行事曆建立約會</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.list.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.list.html
index 9020d2f58..2e5f66638 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.list.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.list.html
@@ -49,11 +49,11 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">行事曆</span>詳細畫面</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">於不同畫面中顯示約會</a></p>
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.view.html">顯示資源行事曆</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理約會</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.list">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">行事曆</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.new.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.new.html
index 130af4960..6a31e2f5f 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.new.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.new.html
@@ -47,10 +47,7 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">建立新約會</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">使用排程畫面</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">訂閱 Google 行事曆</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">訂閱公開與共享行事曆</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.popup.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.popup.html
index e8244f8fe..cf13b4db3 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.popup.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.popup.html
@@ -111,15 +111,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">編輯約會</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">建立後續約會</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">更改約會狀態</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">更改約會提醒</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">更改主辦人</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">將約會移至另一行事曆</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">導出約會</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">列印約會</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">刪除約會</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理約會</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">發送電子郵件給參與者</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.popup">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">行事曆</span>元件</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.toolbar.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.toolbar.html
index c8c8838dc..1180750b7 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.toolbar.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.gui.toolbar.html
@@ -71,14 +71,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">編輯約會</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">更改約會提醒</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">更改主辦人</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">將約會移至另一行事曆</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">導出約會</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">列印約會</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.delete.html">刪除約會</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理約會</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.gui.toolbar">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.gui.html"><span class="phrase">行事曆</span>元件</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.categories.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.categories.html
new file mode 100644
index 000000000..cfe6e04b9
--- /dev/null
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.categories.html
@@ -0,0 +1,88 @@
+<html lang="zh_tw">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>使用約會分類</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="使用者指南&gt;">
+<link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="管理約會">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="管理最愛時區">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="使用日曆色彩">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">前一頁</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">下一頁</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">行事曆</span></h1>
+<h2 class="sr-only">管理約會</h2>
+<div class="sect2" id="ox.appsuite.user.sect.calendar.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">使用約會分類</h3></div></div></div>
+<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><a class="indexterm" name="id-1.8.15.11.4"></a><p id="ox.appsuite.user.concept.calendar.manage.categories">您可以透過分類,而不使用行事曆來管理約會。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">您可以幫約會標示分類。</p></li>
+<li class="listitem"><p role="presentation">您可以一次顯示同一分類中的所有約會。</p></li>
+</ul>
+<p>您可以建立、編輯、刪除自己的分類,請參考 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a>。</p>
+<div class="task" id="ox.appsuite.user.task.calendar.manage.categories">
+<p class="title">如何用分類標記聯絡人:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">視所選的畫面而定,有下列可能:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">在行事曆畫面中點擊約會。點下彈出視窗中的<span class="guibutton"><strong>編輯約會</strong></span>圖示 <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>。</p></li>
+<li class="listitem"><p role="presentation">在清單畫面中選擇一個約會。點擊工具列中的<span class="guibutton"><strong>編輯約會</strong></span>圖示。<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>。</p></li>
+</ul></p>
+<p role="presentation">將開啟約會編輯視窗。</p>
+</li>
+<li class="step">
+<p role="presentation">要這樣做,點擊<span class="guibutton"><strong>分類</strong></span>旁的<span class="guibutton"><strong>新增分類</strong></span>。選擇分類。</p>
+<p role="presentation">要移除約會的分類,點擊分類旁的<span class="guibutton"><strong>移除分類</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.calendar.categories.view">
+<p class="title">如何顯示標記了特定分類的約會:</p>
+<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">視所選的畫面而定,有下列可能:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">在行事曆畫面中,點擊有標記分類的約會。在彈出視窗中點選分類。</p></li>
+<li class="listitem"><p role="presentation">在清單畫面中,點擊有標記分類的約會。點擊詳細畫面中的分類。</p></li>
+</ul></p></li></ul></div>
+<div class="taskrelated">
+          <p>結果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">清單畫面會顯示所有標記了此分類的約會。</p></li>
+<li class="listitem"><p role="presentation">要顯示先前的畫面,請點擊搜尋欄位中的<span class="guibutton"><strong>取消搜尋</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p></li>
+</ul>
+          <p>秘訣:您也可以使用搜尋功能,來搜尋分類。</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.calendar.manage.categories"></p>
+<p class="title">相關主題:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">搜尋約會</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">為新郵件預設使用行內 PGP</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">使用聯絡人分類</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">使用任務分類</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.calendar.manage.categories">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理約會</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.changeorganizer.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
index 02a6eecc6..6bafb9cc0 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
@@ -59,8 +59,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changeorganizer"></p>
 <p class="title">使用者介面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">行事曆</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">行事曆</span>清單畫面</a></p>
 </li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.changereminder.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.changereminder.html
index 171645046..7f27b9aef 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.changereminder.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.changereminder.html
@@ -55,9 +55,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.changereminder"></p>
 <p class="title">使用者介面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">行事曆</span>工具列</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">行事曆</span>詳細畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">行事曆</span>清單畫面</a></p>
 </li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.changestatus.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.changestatus.html
index 8bbf9bfdd..592fcbba1 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.changestatus.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.changestatus.html
@@ -59,6 +59,7 @@
 <p class="title">使用者介面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">行事曆</span>清單畫面</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.detailview.html"><span class="phrase">行事曆</span>詳細畫面</a></p>
 </li></ul>
 <p> </p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.colors.html
index 4fb6e6cad..0548d00a3 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.colors.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.colors.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="管理約會">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="管理最愛時區">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="使用約會分類">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.move.html" title="將約會移至另一行事曆">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.move.html">下一頁</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.colors">
 <div class="titlepage"><div><div><h3 class="title">使用日曆色彩</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">您可以定義行事曆色彩。預設情況下,行事曆中的所有約會將會以該顏色顯示。若您在建立或編輯約會時指派顏色,約會將以該色彩顯示,而非行事曆的色彩。</p>
+<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">您可以定義行事曆色彩。預設情況下,行事曆中的所有約會將會以該顏色顯示。若您在建立或編輯約會時指派顏色,約會將以該色彩顯示,而非行事曆的色彩。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.colors">
 <p class="title">如何選擇行事曆色彩:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -42,10 +42,13 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.calendar.manage.colors"></p>
+<p class="title">使用者介面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">行事曆</span>資料夾畫面</a></p></li></ul>
+<p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">約會如何顯示於行事曆畫面?</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">行事曆</span>資料夾畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">約會如何顯示於行事曆畫面?</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.colors">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理約會</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.delete.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.delete.html
index f7aaf8781..f76da304d 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.delete.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">刪除約會</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>警告:</strong></span><span class="phrase"><strong>無法</strong></span>恢復刪除的約會。視設定而定,若您是約會的主辦者,只能刪除您的私人行事曆中的約會。</p>
+<a class="indexterm" name="id-1.8.15.17.2"></a><a class="indexterm" name="id-1.8.15.17.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>警告:</strong></span><span class="phrase"><strong>無法</strong></span>恢復刪除的約會。視設定而定,若您是約會的主辦者,只能刪除您的私人行事曆中的約會。</p>
 <p id="ox.appsuite.user.concept.calendar.manage.delete">若您有權限刪除項目,可以刪除行事曆當中的約會。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.delete">
 <p class="title">如何刪除約會:</p>
@@ -67,8 +67,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.delete"></p>
 <p class="title">使用者介面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">行事曆</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">行事曆</span>清單畫面</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.delete">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理約會</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.export.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.export.html
index 4db8de78c..6a247b269 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.export.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.export">
 <div class="titlepage"><div><div><h3 class="title">導出約會</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">您可以使用 iCal 格式匯出約會。您可以與其他行事曆應用程式,以此格式交換約會。您可以從行事曆匯出單一約會或所有約會。</p>
+<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">您可以使用 iCal 格式匯出約會。您可以與其他行事曆應用程式,以此格式交換約會。您可以從行事曆匯出單一約會或所有約會。</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.manage.export.selected">
 <p class="title">如何匯出單一約會:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -60,14 +60,16 @@
 <p id="ox.appsuite.user.related.calendar.manage.export"></p>
 <p class="title">使用者介面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">行事曆</span>資料夾畫面</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">行事曆</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">行事曆</span>清單畫面</a></p>
 </li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">匯入約會</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.8.15.14.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下載個人資料</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.8.15.15.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下載個人資料</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.manage.export">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理約會</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.html
index 2fa60d381..8b2c84d98 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.html
@@ -38,6 +38,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">更改約會提醒</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">更改主辦人</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">管理最愛時區</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">使用約會分類</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">使用日曆色彩</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">將約會移至另一行事曆</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">匯入約會</a></p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.import.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.import.html
index b70ce60d5..2b15d0a54 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.import.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.import">
 <div class="titlepage"><div><div><h3 class="title">匯入約會</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><a class="indexterm" name="id-1.8.15.13.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">您可以匯入 iCal 格式的約會。</p>
+<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">您可以匯入 iCal 格式的約會。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.import">
 <p class="title">如何從 iCal 檔案匯入約會:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,10 +51,13 @@
         </div>
 </div>
 <p id="ox.appsuite.user.related.calendar.manage.import"></p>
+<p class="title">使用者介面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">行事曆</span>資料夾畫面</a></p></li></ul>
+<p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">導出約會</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">自檔案匯入行事曆</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.import">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理約會</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.move.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.move.html
index c67f43575..41ee40750 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.move.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.move.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.move">
 <div class="titlepage"><div><div><h3 class="title">將約會移至另一行事曆</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">您可以移動單一約會到其他行事曆,但不可移動約會系列。</p>
+<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">您可以移動單一約會到其他行事曆,但不可移動約會系列。</p>
 <p>先備條件:您必須有權限能在該行事曆中建立物件。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.move">
 <p class="title">如何將約會移動到其他行事曆:</p>
@@ -52,8 +52,9 @@
 <p id="ox.appsuite.user.related.calendar.manage.move"></p>
 <p class="title">使用者介面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">行事曆</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">行事曆</span>清單畫面</a></p>
 </li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.print.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.print.html
index 804f1b792..adfa5da18 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.print.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.print">
 <div class="titlepage"><div><div><h3 class="title">列印約會</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><a class="indexterm" name="id-1.8.15.15.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">要列印日曆與約會,您可以:</p>
+<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><a class="indexterm" name="id-1.8.15.16.4"></a><a class="indexterm" name="id-1.8.15.16.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">要列印日曆與約會,您可以:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">列印含約會的日曆表</p></li>
 <li class="listitem"><p role="presentation">打印約會數據</p></li>
@@ -82,9 +82,11 @@
 <p id="ox.appsuite.user.related.calendar.manage.print"></p>
 <p class="title">使用者介面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html"><span class="phrase">行事曆</span>設定選單</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">行事曆</span>資料夾畫面</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">行事曆</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.list.html"><span class="phrase">行事曆</span>清單畫面</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.print">父主題:<a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">管理約會</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.timezones.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.timezones.html
index cd1485489..1c8278fed 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.timezones.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.manage.timezones.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="管理約會">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="更改主辦人">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="使用日曆色彩">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="使用約會分類">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">下一頁</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">下一頁</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.search.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.search.html
index 2e60fa8e6..fd69188e2 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.search.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.search.html
@@ -80,7 +80,7 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">於不同畫面中顯示約會</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">使用約會分類</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.search">父主題:<a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">行事曆</span></i></a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.settings.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.settings.html
index abb51bf1b..c9648862d 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.settings.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.settings.html
@@ -116,7 +116,7 @@
 <p><a class="indexterm" name="id-1.8.22.11.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>顯示生日行事曆. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>定義是否要在資料夾畫面顯示生日行事曆。</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>顯示已過期約會的提醒. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>設定是否要顯示過去約會的提醒。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>顯示過去約會的提醒. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>設定是否要顯示過去約會的提醒。</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.calendar.settings.advanced.emailchanges"><b>自動將收到的約會變動郵件加入到行事曆中. </b><a class="indexterm" name="id-1.8.22.11.3.1.3.1.2"></a>設定當收到來自外部聯絡人的約會邀請函時,自動加入到行事曆中。</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.appointments.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.appointments.html
index ca279d0a6..b863b5812 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.appointments.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.appointments.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">查看約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.appointments">
 <div class="titlepage"><div><div><h3 class="title">約會如何顯示於行事曆畫面?</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.9.2"></a><a class="indexterm" name="id-1.8.8.9.3"></a><a class="indexterm" name="id-1.8.8.9.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">下列約會屬性用來決定約會在行事曆畫面中的顯示方式:</p>
+<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><a class="indexterm" name="id-1.8.8.8.4"></a><p id="ox.appsuite.user.concept.calendar.view.appointments.color">下列約會屬性用來決定約會在行事曆畫面中的顯示方式:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">約會色彩</p>
@@ -62,7 +62,7 @@
 <p role="presentation">您拒絕的約會將以灰色顯示。主旨前方將有<span class="guibutton"><strong>拒絕</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.declined"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>圖示。主旨將畫上刪除線。</p>
 <p role="presentation">在行事曆設定中,您可以設定是否要顯示被拒絕的約會。</p>
 </li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.6.2.1.6"><p role="presentation">被所有其他參與者拒絕參加的約會,將有<span class="guibutton"><strong>所有人都拒絕</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>的圖示。</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.6.2.1.6"><p role="presentation">被所有其他參與者拒絕參加的約會,將有<span class="guibutton"><strong>所有人都拒絕</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>的圖示。</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.view.appointments.private"></p>
 <h4 class="title">私人約會顯示</h4>
@@ -89,7 +89,7 @@
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.secret"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span>秘密約會</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.unconfirmed"><object type="image/svg+xml" data="../../images/question-circle.svg" height="15"></object></span>未確認的約會</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.rejected"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span>拒絕的約會</p></li>
-<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.9.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>所有其他參與者都拒絕參加的約會</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span>所有其他參與者都拒絕參加的約會</p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.view.appointments"></p>
 <p class="title">相關主題:</p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.html
index 5788ccfb1..f0ff81d03 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.html
@@ -38,9 +38,6 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.timezones.html">顯示多個時區</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">約會如何顯示於行事曆畫面?</a></p></li>
 </ul>
-<p id="ox.appsuite.user.related.calendar.view"></p>
-<p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.foldertree.html"><span class="phrase">行事曆</span>資料夾畫面</a></p></li></ul>
 <p id="ox.appsuite.user.parent.calendar.view">父主題:<a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">行事曆</span></i></a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.timezones.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.timezones.html
index 23ce584ee..23b5fe7ae 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.timezones.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.timezones.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">查看約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.timezones">
 <div class="titlepage"><div><div><h3 class="title">顯示多個時區</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.8.2"></a><a class="indexterm" name="id-1.8.8.8.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">除預設時區外,您可以顯示加入為最愛的時區。您可以在基礎設定中變更預設時區。</p>
+<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">除預設時區外,您可以顯示加入為最愛的時區。您可以在基礎設定中變更預設時區。</p>
 <div class="task" id="ox.appsuite.user.task.calendar.timezones">
 <p class="title">如何在行事曆畫面中顯示多個時區:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.views.html b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.views.html
index 4738e6f4b..d1a9788d5 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.views.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.calendar.view.views.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">查看約會</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.views">
 <div class="titlepage"><div><div><h3 class="title">於不同畫面中顯示約會</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><a class="indexterm" name="id-1.8.8.7.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">了解如何顯示單一或多個行事曆中約會的多個方式:</p>
+<a class="indexterm" name="id-1.8.8.6.2"></a><a class="indexterm" name="id-1.8.8.6.3"></a><a class="indexterm" name="id-1.8.8.6.4"></a><p id="ox.appsuite.user.orientation.calendar.view.addressbook">了解如何顯示單一或多個行事曆中約會的多個方式:</p>
 <div class="task" id="ox.appsuite.user.task.calendar.view.views">
 <p class="title">如何檢視約會:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.create.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.create.html
index fc1086d43..bfa408466 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.create.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.create.html
@@ -80,13 +80,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">編輯視窗</a></p></li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">通訊錄</span>詳細畫面</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">新增聯絡人</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">新增聯絡人</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">編輯聯絡人或通訊組清單</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.create">父主題:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">通訊錄</span> 元件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.detailview.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.detailview.html
index 0fd324d1a..1fde1f0cc 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.detailview.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.detailview.html
@@ -89,15 +89,11 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">通訊錄</span>清單畫面</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.create.html">聯絡人編輯視窗</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">顯示通訊錄聯絡人</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.attachments.html">檢視或保存聯絡人附件</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">撥打給聯絡人</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理聯絡人</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理聯絡人</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.detailview">父主題:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">通訊錄</span> 元件</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.foldertree.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.foldertree.html
index 2869e34b5..c39a61091 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.foldertree.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.foldertree.html
@@ -57,6 +57,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">顯示通訊錄聯絡人</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">新增通訊錄</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理聯絡人</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">使用資料夾管理資料</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.list.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.list.html
index e34d45f23..e72f6d76c 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.list.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.list.html
@@ -61,11 +61,8 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.settingsmenu.html"><span class="phrase">通訊錄</span>設定選單</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">通訊錄</span>詳細畫面</a></p>
-</li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">顯示通訊錄聯絡人</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理聯絡人</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.gui.list">父主題:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">通訊錄</span> 元件</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.new.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.new.html
index bdf974651..0da8ceec7 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.new.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.new.html
@@ -47,7 +47,7 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">新增聯絡人</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">新增聯絡人</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">建立新通訊組清單</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">訂閱外部通訊錄</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">訂閱公開與共享通訊錄</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.toolbar.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.toolbar.html
index 1311ded5b..9da105976 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.toolbar.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.gui.toolbar.html
@@ -56,13 +56,7 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">編輯聯絡人或通訊組清單</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">在通訊錄中傳送郵件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">邀請聯絡人參與約會</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">移動或複製聯絡人</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">作為 vCard 發送聯絡人</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">導出聯絡人</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.print.html">列印聯絡人</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.delete.html">刪除聯絡人</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理聯絡人</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.contacts.gui.toolbar">父主題:<a class="xref" href="ox.appsuite.user.sect.contacts.gui.html"><span class="phrase">通訊錄</span> 元件</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.categories.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.categories.html
new file mode 100644
index 000000000..ecd00ec84
--- /dev/null
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.categories.html
@@ -0,0 +1,85 @@
+<html lang="zh_tw">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>使用聯絡人分類</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="使用者指南&gt;">
+<link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="管理聯絡人">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="邀請聯絡人參與約會">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="移動或複製聯絡人">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">前一頁</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">下一頁</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">通訊錄</span></h1>
+<h2 class="sr-only">管理聯絡人</h2>
+<div class="sect2" id="ox.appsuite.user.sect.contacts.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">使用聯絡人分類</h3></div></div></div>
+<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><p id="ox.appsuite.user.concept.contacts.manage.categories">您可以透過分類,而不使用資料夾來管理聯絡人。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">您可以使用分類標記聯絡人。</p></li>
+<li class="listitem"><p role="presentation">您可以顯示標記了特定分類的所有聯絡人。</p></li>
+</ul>
+<p>您可以建立、編輯、刪除自己的分類,請參考 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a>。</p>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories">
+<p class="title">如何用分類標記聯絡人:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">選擇聯絡人。點擊工具列中的<span class="guibutton"><strong>編輯聯絡人</strong></span>圖示。<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>。</p>
+<p role="presentation">將開啟聯絡人編輯視窗。</p>
+</li>
+<li class="step">
+<p role="presentation">要這樣做,點擊<span class="guibutton"><strong>分類</strong></span>旁的<span class="guibutton"><strong>新增分類</strong></span>。選擇分類。</p>
+<p role="presentation">要移除聯絡人的分類,點擊分類旁的<span class="guibutton"><strong>移除分類</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories.view">
+<p class="title">如何顯示標記了特定分類的聯絡人:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">選擇標記了特定分類的聯絡人。</p></li>
+<li class="step"><p role="presentation">點擊詳細畫面中的分類。</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>結果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">清單畫面會顯示所有標記了此分類的聯絡人。</p></li>
+<li class="listitem"><p role="presentation">要顯示先前的清單,請點擊搜尋欄位中的<span class="guibutton"><strong>取消搜尋</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p></li>
+</ul>
+          <p>秘訣:您也可以使用搜尋功能,來搜尋分類。</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.contacts.manage.categories"></p>
+<p class="title">相關主題:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">搜尋聯絡人</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">為新郵件預設使用行內 PGP</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">使用約會分類</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">使用任務分類</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.contacts.manage.categories">父主題:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理聯絡人</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.delete.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.delete.html
index a14cdd3bf..f26bcb4d0 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.delete.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理聯絡人</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">刪除聯絡人</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>警告:</strong></span><span class="phrase"><strong>無法</strong></span>恢復已刪除的聯絡人。</p>
+<a class="indexterm" name="id-1.9.17.15.2"></a><a class="indexterm" name="id-1.9.17.15.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>警告:</strong></span><span class="phrase"><strong>無法</strong></span>恢復已刪除的聯絡人。</p>
 <p id="ox.appsuite.user.concept.contacts.manage.delete">若您有權限刪除這本通訊錄當中的項目,可以刪除聯絡人或通訊組清單。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">您不能從<span class="guibutton"><strong>所有使用者</strong></span>通訊錄刪除聯絡人。</p></li>
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.delete"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">通訊錄</span>清單畫面</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.delete">父主題:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理聯絡人</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.export.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.export.html
index 9457fa1b2..44132ad19 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.export.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理聯絡人</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.export">
 <div class="titlepage"><div><div><h3 class="title">導出聯絡人</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">您可以用下列格式匯出聯絡人或通訊組清單:</p>
+<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><a class="indexterm" name="id-1.9.17.13.4"></a><a class="indexterm" name="id-1.9.17.13.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">您可以用下列格式匯出聯絡人或通訊組清單:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">vCard。您可以與其他郵件應用程式,以此格式交換聯絡人。</p></li>
 <li class="listitem"><p role="presentation">CSV 您可以使用此格式將聯絡人匯出為試算表格式。</p></li>
@@ -71,7 +71,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.export"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html"><span class="phrase">通訊錄</span>資料夾畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">通訊錄</span>清單畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -79,7 +83,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">作為 vCard 發送聯絡人</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">匯入聯絡人</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.9.17.12.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下載個人資料</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.9.17.13.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下載個人資料</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.export">父主題:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理聯絡人</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.html
index 8db2a73ab..ca5b8a71c 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.html
@@ -36,6 +36,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem cap-webmail" id="id-1.9.17.4.1.1"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">在通訊錄中傳送郵件</a></p></li>
 <li class="listitem cap-calendar" id="id-1.9.17.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">邀請聯絡人參與約會</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">使用聯絡人分類</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">移動或複製聯絡人</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">作為 vCard 發送聯絡人</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">匯入聯絡人</a></p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.import.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.import.html
index 0d96589ea..34680c50b 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.import.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理聯絡人</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.import">
 <div class="titlepage"><div><div><h3 class="title">匯入聯絡人</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><a class="indexterm" name="id-1.9.17.11.5"></a><a class="indexterm" name="id-1.9.17.11.6"></a><a class="indexterm" name="id-1.9.17.11.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">您可以匯入下列格式的聯絡人檔案:</p>
+<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><a class="indexterm" name="id-1.9.17.12.6"></a><a class="indexterm" name="id-1.9.17.12.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">您可以匯入下列格式的聯絡人檔案:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">vCard。註:</p>
@@ -67,6 +67,9 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.import"></p>
+<p class="title">使用者介面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html"><span class="phrase">通訊錄</span>資料夾畫面</a></p></li></ul>
+<p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">導出聯絡人</a></p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.inviteappointment.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
index ae280229a..7c91fb7c4 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="管理聯絡人">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.manage.sendmail.html" title="在通訊錄中傳送郵件">
-<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="移動或複製聯絡人">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="使用聯絡人分類">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">下一頁</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">下一頁</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -48,7 +48,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.inviteappointment"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">通訊錄</span>清單畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">通訊錄</span>詳細畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">建立新約會</a></p></li></ul>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.movecopy.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.movecopy.html
index ce734149f..4e678ca6e 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.movecopy.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.movecopy.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="管理聯絡人">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="邀請聯絡人參與約會">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="使用聯絡人分類">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html" title="作為 vCard 發送聯絡人">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">下一頁</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理聯絡人</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.movecopy">
 <div class="titlepage"><div><div><h3 class="title">移動或複製聯絡人</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><a class="indexterm" name="id-1.9.17.9.4"></a><a class="indexterm" name="id-1.9.17.9.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">您可以移動或複製聯絡人或通訊組清單到另一本通訊錄。</p>
+<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><a class="indexterm" name="id-1.9.17.10.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">您可以移動或複製聯絡人或通訊組清單到另一本通訊錄。</p>
 <p id="ox.appsuite.user.hints.contacts.manage.movecopy">註:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">您不能移動或複製聯絡人或通訊組清單到<span class="guibutton"><strong>所有使用者</strong></span>通訊錄。</p></li>
@@ -56,7 +56,10 @@
 <p id="ox.appsuite.user.tip.contacts.manage.movecopy">提示:您還可以拖曳選擇的物件,來移動至通訊錄。</p>
 <p id="ox.appsuite.user.related.contacts.manage.movecopy"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">通訊錄</span>清單畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.personal.html">新增個人通訊錄</a></p></li></ul>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.print.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.print.html
index 51b302227..6350a3834 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.print.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理聯絡人</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.print">
 <div class="titlepage"><div><div><h3 class="title">列印聯絡人</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">您可以列印單一聯絡人或多位聯絡人的資料。您可以選擇不同的列印版面。</p>
+<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">您可以列印單一聯絡人或多位聯絡人的資料。您可以選擇不同的列印版面。</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.print.list">
 <p class="title">如何列印聯絡人的資料:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -48,7 +48,11 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.print"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.foldertree.html"><span class="phrase">通訊錄</span>資料夾畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">通訊錄</span>清單畫面</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.print">父主題:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理聯絡人</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.sendmail.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.sendmail.html
index 71181e310..be9f4c086 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.sendmail.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.sendmail.html
@@ -48,10 +48,14 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendmail"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">通訊錄</span>清單畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.detailview.html"><span class="phrase">通訊錄</span>詳細畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p></li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendmail">父主題:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理聯絡人</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.sendvcard.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.sendvcard.html
index c7939327a..02d9e2dae 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.sendvcard.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.manage.sendvcard.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理聯絡人</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.sendvcard">
 <div class="titlepage"><div><div><h3 class="title">作為 vCard 發送聯絡人</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">您可以將聯絡人或通訊組清單作為 vCard 附件透過郵件傳送。</p>
+<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">您可以將聯絡人或通訊組清單作為 vCard 附件透過郵件傳送。</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.sendvcard">
 <p class="title">如何將聯絡人作為 vCard 附件發送聯絡人:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,12 +44,15 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.sendvcard"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.toolbar.html"><span class="phrase">通訊錄</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.list.html"><span class="phrase">通訊錄</span>清單畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.export.html">導出聯絡人</a></p></li>
-<li class="listitem cap-webmail" id="id-1.9.17.10.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p></li>
+<li class="listitem cap-webmail" id="id-1.9.17.11.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendvcard">父主題:<a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">管理聯絡人</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.search.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.search.html
index 8c31b24eb..2d136c627 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.search.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.search.html
@@ -81,7 +81,7 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">顯示通訊錄聯絡人</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">使用聯絡人分類</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.search">父主題:<a class="xref" href="ox.appsuite.user.chap.contacts.html"><i><span class="phrase">通訊錄</span></i></a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.useaddressbook.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.useaddressbook.html
index 7042d8187..e3797ba2f 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.useaddressbook.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.useaddressbook.html
@@ -65,7 +65,7 @@
 <p> </p>
 <p class="title">進階操作:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">添加參與者或資源</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">使用排程畫面</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">建立受管理的資源</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.useaddressdirectory.html b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.useaddressdirectory.html
index 8a5e11491..67ee06562 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.useaddressdirectory.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.contacts.useaddressdirectory.html
@@ -72,7 +72,7 @@
 <p id="ox.appsuite.user.related.contacts.useaddressdirectory"></p>
 <p class="title">進階操作:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">添加參與者或資源</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">使用排程畫面</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">建立受管理的資源</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.dataorganisation.categories.html b/help/l10n/zh_TW/ox.appsuite.user.sect.dataorganisation.categories.html
index 6aadd3bf2..7b355bf49 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.dataorganisation.categories.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.dataorganisation.categories.html
@@ -32,15 +32,15 @@
   <h1 class="sr-only">資料管理與分享</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.categories">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">管理分類</h2></div></div></div>
-<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">了解如何管理讓您可用來分類約會、聯絡人與任務的<a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">分類</a>。分類有下列屬性:</p>
+<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">了解如何管理能夠維護郵件、約會、聯絡人的<a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">分類功能</a>,無須只能使用資料夾功能。例如您可以使用自己的分類來分配特定專案或聯絡人。分類有下列屬性:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">分類包含名稱與色彩。</p></li>
 <li class="listitem"><p role="presentation">搜尋物件時,可使用分類作為搜尋詞彙。</p></li>
 <li class="listitem"><p role="presentation">視設定而定,會預先設定好某些分類。無法編輯或刪除這些分類。</p></li>
 <li class="listitem"><p role="presentation">您可以建立、編輯、刪除自己的分類。</p></li>
-<li class="listitem"><p role="presentation">您可以為約會、聯絡人與任務指派分類或多個分類,並在隻後刪除。</p></li>
+<li class="listitem"><p role="presentation">您可以為電子郵件、約會、聯絡人與任務指派分類或多個分類,並在之後刪除。</p></li>
 </ul>
-<p>註:無法對郵件設定這些分類。若需分類郵件,可使用收件匣分頁。請參考 <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">使用收件匣分類</a>。</p>
+<p>註:對於電子郵件來說,您也可以使用收件匣標籤。可將特定收件匣分類指派給郵件。分類視寄件者而定,請參考 <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">使用收件匣分類</a>。</p>
 <p id="ox.appsuite.user.concept.dataorganisation.categories">有下列選項:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">建立自己的分類</p></li>
@@ -51,9 +51,15 @@
 <p class="title">如何管理您的分類:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step help-hide-inline">
+<p role="presentation">點擊選單列右邊的<span class="guibutton"><strong>設定</strong></span>圖示 <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。將開啟<span class="guilabel"><strong>設定</strong></span>視窗。</p>
+<p role="presentation">點擊左方窗格的<span class="guibutton"><strong>基礎設定</strong></span>。點擊<span class="guibutton"><strong>進階設定</strong></span>下方的<span class="guibutton"><strong>管理代理人</strong></span>。</p>
+<p role="presentation">您也可以使用下列一種方式:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">選擇一封郵件。點下工具列中的<span class="guibutton"><strong>新增分類</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>。選擇<span class="guibutton"><strong>管理分類</strong></span>。</p></li>
+<li class="listitem">
 <p role="presentation">建立或編輯約會、聯絡人或任務,來開啟約會、聯絡人或任務的編輯視窗。</p>
 <p role="presentation">要這樣做,點擊<span class="guibutton"><strong>分類</strong></span>旁的<span class="guibutton"><strong>新增分類</strong></span>。選擇<span class="guibutton"><strong>管理分類</strong></span>。</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">您也可以使用<span class="guibutton"><strong>進階選項</strong></span>下方的一般選項,當中的<span class="guibutton"><strong>管理分類</strong></span>按鈕。</p></li></ul>
+</li>
+</ul></p>
 <p role="presentation"><span class="guilabel"><strong>管理分類</strong></span>視窗將開啟。</p>
 </li>
 <li class="step">
@@ -68,21 +74,12 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">建立新約會</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">新增聯絡人</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">建立新任務</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">編輯約會</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">編輯聯絡人或通訊組清單</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">編輯任務</a></p>
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">為新郵件預設使用行內 PGP</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">使用約會分類</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">使用聯絡人分類</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">使用任務分類</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">調整一般設定</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">搜尋約會</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">搜尋聯絡人</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">搜尋任務</a></p>
-</li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.categories">父主題:<a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>資料管理與分享</i></a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.dataorganisation.sharing.share.html b/help/l10n/zh_TW/ox.appsuite.user.sect.dataorganisation.sharing.share.html
index bb7735ddc..58f358181 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.dataorganisation.sharing.share.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.dataorganisation.sharing.share.html
@@ -48,7 +48,7 @@
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">日曆</p>
+<p role="presentation">行事曆</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>我的行事曆</strong></span>當中的資料夾可以讀取或編輯權限分享給內部使用者。</p></li>
 <li class="listitem"><p role="presentation">無法分享<span class="guibutton"><strong>我的行事曆</strong></span>資料夾。</p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.content.html b/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.content.html
index d1dd0e1ab..fdc01a3d1 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.content.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.content.html
@@ -71,6 +71,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">檢視 <span class="phrase">雲端空間</span>資料夾內容</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">顯示檔案內容</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">管理檔案與 <span class="phrase">雲端空間</span>資料夾</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">使用資料夾管理資料</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">分享資料</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.foldertree.html b/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.foldertree.html
index eb673246a..ee81f3113 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.foldertree.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.foldertree.html
@@ -68,6 +68,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">雲端空間</span>:建立資料夾</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">訂閱公開與共享 <span class="phrase">雲端空間</span>資料夾</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">管理檔案與 <span class="phrase">雲端空間</span>資料夾</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">使用資料夾管理資料</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">分享資料</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.toolbar.html b/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.toolbar.html
index 29d998f6b..aa6884399 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.toolbar.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.toolbar.html
@@ -68,20 +68,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">檢視 <span class="phrase">雲端空間</span>資料夾內容</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">顯示檔案內容</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.send.html">將檔案作為郵件附件傳送</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">編輯檔案名稱</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">建立或編輯描述</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.move.html">移動檔案與 <span class="phrase">雲端空間</span>資料夾</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.copy.html">複製檔案</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">另存檔案為 PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">將檔案印成 PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.addportal.html">新增檔案到入口</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.favorite.html">將 <span class="phrase">雲端空間</span>資料夾新增為我的最愛</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.delete.html">刪除檔案或 <span class="phrase">雲端空間</span>資料夾</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.lock.html">鎖定或解鎖檔案</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">處理版本</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">管理檔案與 <span class="phrase">雲端空間</span>資料夾</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">加密或解密檔案</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.toolbar">父主題:<a class="xref" href="ox.appsuite.user.sect.drive.gui.html"><span class="phrase">雲端空間</span>元件</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.viewer.html b/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.viewer.html
index 3305a750d..00e1002af 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.viewer.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.drive.gui.viewer.html
@@ -87,13 +87,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">顯示檔案內容</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">進行簡報</a></p>
 </li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.rename.html">編輯檔案名稱</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">建立或編輯描述</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">另存檔案為 PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">將檔案印成 PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">處理版本</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">管理檔案與 <span class="phrase">雲端空間</span>資料夾</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">分享資料</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.viewer">父主題:<a class="xref" href="ox.appsuite.user.sect.drive.gui.html"><span class="phrase">雲端空間</span>元件</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.attachments.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.attachments.html
index 6d21b38e8..550387905 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.attachments.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.view.html" title="檢視電子郵件">
-<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
+<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.deputy.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.deputy.html
index e6fd2e80d..713793c1f 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.deputy.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.deputy.html
@@ -86,7 +86,7 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.create.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.create.html
index b454ac986..7ef6a821b 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.create.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.create.html
@@ -56,7 +56,7 @@
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>副本</strong></span>、<span class="guibutton"><strong>密件副本</strong></span> 按鈕。開啟<span class="guibutton"><strong>副本</strong></span>或<span class="guibutton"><strong>密件副本</strong></span>輸入欄位。</p></li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>回信到</strong></span>按鈕。開啟<span class="guibutton"><strong>回信到</strong></span>輸入欄位。</p>
+<p role="presentation"><span class="guibutton"><strong>回覆</strong></span>按鈕。開啟<span class="guibutton"><strong>回信到</strong></span>輸入欄位。</p>
 <p role="presentation">回覆給您的郵件,將傳送到此欄位中設定的電子郵件地址。</p>
 </li>
 <li class="listitem">
@@ -77,6 +77,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>傳送</strong></span>。傳送郵件給輸入的收件者。</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.13.5.1.5"><p role="presentation"><span class="guibutton"><strong>之後再寄</strong></span>。開啟可讓您決定什麼時候要寄出郵件的選單。</p></li>
 <li class="listitem">
 <p role="presentation">按鈕列</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -108,17 +109,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">編輯視窗</a></p></li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">回覆電子郵件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">轉發電子郵件</a></p>
-<p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">在撰寫郵件時使用 AI 功能</a></p>
-<p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">代理收發信件</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 <p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">傳送加密郵件</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.email.gui.create">父主題:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">電子郵件</span>元件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.detailview.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.detailview.html
index 05af6ecc1..fa3ce9b88 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.detailview.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.detailview.html
@@ -57,6 +57,7 @@
 <li class="listitem">
 <p role="presentation">視設定而定,有下列功能可用:</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>設定分類</strong></span> 圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>。開啟用來管理分類的選單。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>指定色彩</strong></span> 圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>。開啟選單讓您在郵件中加入彩色標籤。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>標示</strong></span> 圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>。標示電子郵件。</p></li>
 </ul>
@@ -74,6 +75,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation">在<span class="guibutton"><strong>寄件匣</strong></span>選擇含有附件連結的信件時,附件資訊將顯示於信件頂端。</p></li>
+<li class="listitem"><p role="presentation">視設定而定:若可用,將顯示指定的分類。</p></li>
 <li class="listitem">
 <p role="presentation">郵件內文</p>
 <p role="presentation">引用自先前郵件的文字將標示於行上方。</p>
@@ -87,15 +89,11 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html"><span class="phrase">電子郵件</span>彈出視窗</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">電子郵件編輯視窗</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">檢視電子郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">回覆電子郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">檢視或儲存電子郵件附件</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.detailview">父主題:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">電子郵件</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.foldertree.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.foldertree.html
index a4b5a0e74..6cbc13920 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.foldertree.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.foldertree.html
@@ -49,7 +49,9 @@
 </ul>
 <p>視設定而定,可能有更多信件匣可用。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">未讀郵件、被標記的郵件的信件匣。</p></li>
+<li class="listitem"><p role="presentation">包含所有已標示訊息的信件匣</p></li>
+<li class="listitem"><p role="presentation">包含未讀訊息的信件匣</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.7.5.2.3"><p role="presentation">包含排定稍後再寄的訊息的資料夾</p></li>
 <li class="listitem"><p role="presentation">您訂閱的共享與公開電子郵件信件匣。</p></li>
 <li class="listitem"><p role="presentation">由管理員指派給您的功能性郵件帳號信件匣。</p></li>
 </ul>
@@ -62,10 +64,10 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">檢視電子郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">新增電子郵件信件匣</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">停用或啟用功能性郵件帳號</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">停用或啟用功能性郵件帳號</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">使用資料夾管理資料</a></p>
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">分享資料</a></p>
 </li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.html
index 222045ea3..3efb80bf9 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.html
@@ -39,7 +39,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">新增郵件按鈕</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">電子郵件</span>資料夾畫面</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html"><span class="phrase">電子郵件</span>分頁列</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">收件匣分類列</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html"><span class="phrase">電子郵件</span>彈出視窗</a></p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.list.html
index 900416941..5548e9be2 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.list.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.list.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="電子郵件元件">
-<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="電子郵件分頁列">
+<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="收件匣分類列">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.detailview.html" title="電子郵件詳細畫面">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -47,6 +47,7 @@
 <li class="listitem"><p role="presentation">將為每封郵件顯示下列資訊:寄件人、主旨、接收日期。未讀的郵件將有<span class="guibutton"><strong>未讀</strong></span>圖示 <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span>。</p></li>
 <li class="listitem"><p role="presentation">寄件者姓名的提示將顯示電子郵件地址。</p></li>
 <li class="listitem"><p role="presentation">若可用,將顯示更多資訊:附件圖示、色彩標籤、旗標、<a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">討論串</a>中的郵件數量、優先權。</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.10.5.1.7"><p role="presentation">若可用,將顯示指定的分類。在電子郵件設定中,可以設定是否要在清單畫面顯示分類。</p></li>
 <li class="listitem"><p role="presentation">加密郵件將有已加密 <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.encrypted"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span> 的標示。</p></li>
 <li class="listitem">
 <p role="presentation">若假期通知已開啟,將在清單畫面上方顯示通知。</p>
@@ -64,12 +65,9 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html"><span class="phrase">電子郵件</span>設定選單</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
-</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">檢視電子郵件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.list">父主題:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">電子郵件</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.new.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.new.html
index 961b981d0..6cecdad76 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.new.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.new.html
@@ -47,7 +47,7 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">新增電子郵件帳號</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">檢視或儲存電子郵件附件</a></p>
 </li></ul>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.popup.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.popup.html
index ac4a44e1f..fb1c75722 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.popup.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.popup.html
@@ -63,8 +63,7 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">撥打給寄件者或其他收件者</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.7.8.12.5.2.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">撥打給寄件者或其他收件者</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">如何在詳細畫面中顯示聯絡人</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.popup">父主題:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">電子郵件</span>元件</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.settingsmenu.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.settingsmenu.html
index ff10d7215..167f11d95 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.settingsmenu.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.settingsmenu.html
@@ -54,7 +54,6 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">新增電子郵件帳號</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">檢視或儲存電子郵件附件</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.tabs.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.tabs.html
index 45963256c..f89b4ff98 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.tabs.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.tabs.html
@@ -1,7 +1,7 @@
 <html lang="zh_tw">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>電子郵件分頁列</title>
+<title>收件匣分類列</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
@@ -33,22 +33,18 @@
 <h2 class="sr-only">
 <span class="phrase">電子郵件</span>元件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.tabs">
-<div class="titlepage"><div><div><h3 class="title">
-<span class="phrase">電子郵件</span>分頁列</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">收件匣分類列</h3></div></div></div>
 <a class="indexterm" name="id-1.7.8.9.2"></a><p id="ox.appsuite.user.concept.email.gui.tabs">以預先定義的收件匣分頁顯示<span class="guibutton"><strong>收件匣</strong></span>中的郵件。此功能讓您可依照寄件者將收到的郵件分配到不同的分頁。</p>
 <p id="ox.appsuite.user.reference.email.gui.tabs"></p>
 <p class="title">註:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">視設定而定,可能無法使用收件匣分頁功能。</p></li>
-<li class="listitem"><p role="presentation">若可以使用收件匣分頁功能,您可以顯示或隱藏收件匣分頁列。要這樣做,點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>收件匣分類</strong></span>。</p></li>
+<li class="listitem"><p role="presentation">若可以使用收件匣分類功能,您可以顯示或隱藏收件匣分類列。要這樣做,點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>收件匣分類</strong></span>。</p></li>
 <li class="listitem"><p role="presentation">會預先設定好收件匣分頁的數量、名稱與順序。視設定而定,可更名或停用某些收件匣分頁。</p></li>
 </ul>
 <p id="ox.appsuite.user.related.email.gui.tabs"></p>
 <p class="title">相關主題:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">使用收件匣分類</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">使用收件匣分類</a></p></li></ul>
 <p id="ox.appsuite.user.reference.email.gui.tabs.parent">父主題:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">電子郵件</span>元件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.toolbar.html
index 16e3a9c65..c4838ee33 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.toolbar.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.gui.toolbar.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="電子郵件元件">
 <link rel="prev" href="ox.appsuite.user.sect.email.gui.foldertree.html" title="電子郵件資料夾畫面">
-<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="電子郵件分頁列">
+<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="收件匣分類列">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -43,7 +43,8 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>封存</strong></span> 圖示 <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.archive"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span>。封存您選擇的郵件。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>回覆</strong></span>、<span class="guibutton"><strong>轉寄</strong></span>所選郵件的圖示:<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">視設定而定:<span class="guibutton"><strong>AI 整合</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>。開啟包含 AI 郵件輔助撰寫功能的選單。</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>設定分類</strong></span> 圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>。開啟可讓您將郵件移動到分類中的選單。此圖示僅在顯示收件匣分頁列時可用。</p></li>
+<li class="listitem"><p role="presentation">視設定而定:<span class="guibutton"><strong>設定收件匣分類</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.inboxcategories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>。開啟可讓您將郵件移動到分類中的選單。此圖示僅在顯示收件匣分頁列時可用。</p></li>
+<li class="listitem"><p role="presentation">視設定而定:<span class="guibutton"><strong>設定分類</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>。開啟用來管理分類的選單。</p></li>
 <li class="listitem"><p role="presentation">視設定而定:<span class="guibutton"><strong>設定顏色</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>。開啟選單讓您在郵件中加入彩色標籤。</p></li>
 <li class="listitem"><p role="presentation">視設定而定:<span class="guibutton"><strong>標示</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>。標示電子郵件。</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>移動</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.moveto"><object type="image/svg+xml" data="../../images/folder-symlink.svg" height="15"></object></span>。將選擇的郵件移動至另一個資料夾。</p></li>
@@ -55,25 +56,12 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html"><span class="phrase">電子郵件</span>分頁列</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">回覆電子郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">轉發電子郵件</a></p>
 </li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">使用 AI 功能回覆郵件</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">移動或複製郵件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">將郵件標示為已讀或未讀</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">分類郵件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">顯示電子郵件原始內容</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">使用電子郵件草稿</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">建立郵件提醒</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">新增郵件到入口</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">保存電子郵件</a></p>
-<p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">將郵件匯出為 PDF。</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">列印電子郵件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">刪除電子郵件</a></p>
-</li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">使用 AI 功能回覆郵件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.gui.toolbar">父主題:<a class="xref" href="ox.appsuite.user.sect.email.gui.html"><span class="phrase">電子郵件</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.addportal.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.addportal.html
index b300ca03f..33bc08cc2 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.addportal.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.addportal.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.addportal">
 <div class="titlepage"><div><div><h3 class="title">新增郵件到入口</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.15.2"></a><a class="indexterm" name="id-1.7.15.15.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">您可以將郵件作為小工具新增至入口。</p>
+<a class="indexterm" name="id-1.7.15.16.2"></a><a class="indexterm" name="id-1.7.15.16.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">您可以將郵件作為小工具新增至入口。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.addportal">
 <p class="title">如何新增郵件至入口:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,7 +46,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.addportal"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.add.html">新增入口小工具</a></p></li></ul>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.archive.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.archive.html
index bd0fd54a3..51c727575 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.archive.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.archive.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.archive">
 <div class="titlepage"><div><div><h3 class="title">封存郵件</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.20.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">封存郵件時,郵件將被移動至 <span class="guibutton"><strong>封存</strong></span> 信件匣。<span class="guibutton"><strong>封存</strong></span> 信件匣會為每年的封存郵件建立子資料夾。封存的郵件將依照接收到的年份儲存於這些信件匣。您第一次使用此功能時將自動為您建立 <span class="guibutton"><strong>封存</strong></span> 資料夾。有下列選項:</p>
+<a class="indexterm" name="id-1.7.15.21.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">封存郵件時,郵件將被移動至 <span class="guibutton"><strong>封存</strong></span> 信件匣。<span class="guibutton"><strong>封存</strong></span> 信件匣會為每年的封存郵件建立子資料夾。封存的郵件將依照接收到的年份儲存於這些信件匣。您第一次使用此功能時將自動為您建立 <span class="guibutton"><strong>封存</strong></span> 資料夾。有下列選項:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">封存信件匣中超過 90 天的郵件</p></li>
 <li class="listitem"><p role="presentation">封存單一郵件</p></li>
@@ -57,6 +57,13 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.archive"></p>
+<p class="title">使用者介面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">電子郵件</span>資料夾畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
+</li></ul>
+<p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">列印電子郵件</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.archive">父主題:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.categories.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.categories.html
new file mode 100644
index 000000000..7ef3f72ba
--- /dev/null
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.categories.html
@@ -0,0 +1,90 @@
+<html lang="zh_tw">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>為新郵件預設使用行內 PGP</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="使用者指南&gt;">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理電子郵件">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="收集地址">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="分類郵件">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">前一頁</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">下一頁</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
+<h2 class="sr-only">管理電子郵件</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">為新郵件預設使用行內 PGP</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.categories">您可以透過分類,而不使用信件匣來管理郵件。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">您可以用分類標寄郵件。</p></li>
+<li class="listitem"><p role="presentation">您可以一次顯示同一分類中的所有郵件。</p></li>
+</ul>
+<p>您可以建立、編輯、刪除自己的分類,請參考 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a>。</p>
+<p id="ox.appsuite.user.tip.email.manage.categories">除了分類之外,您還可以使用收件匣分類。您可以使用收件匣分類來管理與寄件者有關的郵件,可參考 <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">使用收件匣分類</a>。</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.mark">
+<p class="title">如何用分類標記郵件:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">選擇一封或多封郵件。</p></li>
+<li class="step">
+<p role="presentation">點下工具列中的<span class="guibutton"><strong>設定分類</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.mark.add"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span>。選擇分類。</p>
+<p role="presentation">要移除郵件的分類,請點擊該分類。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories.view">
+<p class="title">如何顯示標記了特定分類的郵件:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">選擇標記了特定分類的郵件。</p></li>
+<li class="step"><p role="presentation">點擊詳細畫面中的分類。</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>結果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">清單畫面會顯示所有標記了此分類的郵件。</p></li>
+<li class="listitem"><p role="presentation">將顯示每一封信所在的信件匣。</p></li>
+<li class="listitem"><p role="presentation">要顯示先前的清單,請點擊搜尋欄位中的<span class="guibutton"><strong>取消搜尋</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p></li>
+</ul>
+          <p>秘訣:您也可以使用搜尋功能,來搜尋分類。</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.categories"></p>
+<p class="title">使用者介面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
+</li></ul>
+<p> </p>
+<p class="title">相關主題:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">搜尋電子郵件</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">使用約會分類</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">使用聯絡人分類</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">使用任務分類</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.categories">父主題:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.collectaddress.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.collectaddress.html
index a8946dc28..9b9762dfd 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.collectaddress.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.collectaddress.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.mark.html" title="將郵件標示為已讀或未讀">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="分類郵件">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="為新郵件預設使用行內 PGP">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.mark.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">下一頁</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.categories.html">下一頁</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -35,7 +35,7 @@
 <div class="titlepage"><div><div><h3 class="title">收集地址</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.10.2"></a><a class="indexterm" name="id-1.7.15.10.3"></a><p id="ox.appsuite.user.concept.email.manage.collectaddress">有下列選項:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">在電子郵件設定中啟用此功能,以自動在傳送或讀取郵件時收集新的電子郵件地址:</p></li>
+<li class="listitem"><p role="presentation">在進階電子郵件設定中開啟此功能,即可自動在傳送或讀取郵件時收集新的電子郵件地址。</p></li>
 <li class="listitem"><p role="presentation">手動新增電子郵件地址到通訊錄</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.collectaddress">
@@ -51,7 +51,7 @@
           <p>註:此功能僅適用於某些聯絡人。</p>
         </div>
 </div>
-<p role="presentation" class="cap-contacts"><p class="title">相關主題:</p><ul class="itemizedlist" style="list-style-type: none; ">
+<p role="presentation" class="cap-contacts"><p class="title">使用者介面:</p><ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p></li></ul> <p class="title">相關主題:</p><ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">新增聯絡人</a></p></li>
 </ul></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.delete.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.delete.html
index 0f462a0a3..ee6f23cdc 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.delete.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.delete.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.archive.html" title="封存郵件">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="清理電子郵件信件匣">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.recover.html" title="還原電子郵件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.archive.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">下一頁</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.recover.html">下一頁</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,20 +33,20 @@
 <h2 class="sr-only">管理電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">刪除電子郵件</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.21.2"></a><a class="indexterm" name="id-1.7.15.21.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">有下列選項:</p>
+<a class="indexterm" name="id-1.7.15.22.2"></a><a class="indexterm" name="id-1.7.15.22.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">有下列選項:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">設定刪除郵件時要將郵件移動至「垃圾桶」,或是永久刪除。</p>
-<p role="presentation">移動至「垃圾桶」信件匣的郵件可以復原。</p>
+<p role="presentation">You can define whether emails are moved to the Trash or permanently removed when deleted. </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">移動至「垃圾桶」信件匣的郵件可以復原。</p></li>
+<li class="listitem"><p role="presentation"><span class="cap-dumpster">永久刪除的郵件,可於刪除後 14 天內還原。超過此時間後:</span>將<span class="phrase"><strong>無法</strong></span>再還原永久刪除的郵件。</p></li>
+</ul>
 </li>
-<li class="listitem"><p role="presentation">刪除一封郵件或整個郵件會話。</p></li>
-<li class="listitem"><p role="presentation">刪除電子郵件資料夾中的所有郵件.</p></li>
-<li class="listitem"><p role="presentation">復原垃圾桶中的電子郵件。</p></li>
-<li class="listitem"><p role="presentation">從垃圾筒永久刪除郵件。</p></li>
-<li class="listitem"><p role="presentation">清空垃圾桶,永久刪除垃圾桶中的電子郵件。</p></li>
+<li class="listitem"><p role="presentation">您可以刪除單一郵件或整個討論串。</p></li>
+<li class="listitem"><p role="presentation">您可以刪除信件匣中的所有郵件。</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.delete.setting">
-<p class="title">如何設定刪除郵件時要將郵件移動至「垃圾桶」,或是永久刪除。</p>
+<p class="title">如何設定刪除郵件時要將郵件移動至「垃圾桶」,或是永久刪除:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.setting"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
@@ -60,21 +60,21 @@
 <li class="listitem"><p role="presentation">若要將郵件移動至垃圾桶,取消勾選<span class="guibutton"><strong>永久移除刪除的郵件</strong></span>。</p></li>
 <li class="listitem">
 <p role="presentation">若要直接永久刪除郵件,勾選<span class="guibutton"><strong>永久移除刪除的郵件</strong></span>。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span><span class="phrase"><strong>無法</strong></span> 恢復已刪除的檔案。</p>
+<p role="presentation"><span class="phrase"><strong>警告:</strong></span>視設定而定,可能<span class="phrase"><strong>無法</strong></span>還原已刪除的郵件。</p>
 </li>
 </ul></p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.delete">
-<p class="title">如何刪除電子郵件</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.single">
+<p class="title">如何刪除單一郵件:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">選擇一封或多封郵件。</p></li>
 <li class="step">
-<p role="presentation">點下工具列中的<span class="guibutton"><strong>刪除</strong></span>圖示 <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
+<p role="presentation">點下工具列中的<span class="guibutton"><strong>刪除</strong></span>圖示 <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
 <p role="presentation">或:<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">按下鍵盤上的 [Del] 或 [Backspace] 鍵。</p></li>
 <li class="listitem"><p role="presentation">在郵件的右鍵選單點擊<span class="guibutton"><strong>刪除</strong></span>。</p></li>
-<li class="listitem"><p role="presentation">若您選擇單一郵件,使用詳細畫面中的<span class="guibutton"><strong>刪除</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p></li>
+<li class="listitem"><p role="presentation">若您選擇單一郵件,使用詳細畫面中的<span class="guibutton"><strong>刪除</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p></li>
 </ul></p>
 </li>
 </ol></div>
@@ -82,7 +82,7 @@
           <p>結果:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">若未勾選<a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>永久移除刪除的郵件</strong></span></a>選項:</p>
+<p role="presentation">若未勾選<span class="guibutton"><strong>永久移除刪除的郵件</strong></span>選項:</p>
 <p role="presentation">郵件將被移動至「垃圾桶」信件匣。</p>
 </li>
 <li class="listitem">
@@ -92,17 +92,17 @@
 </ul>  
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptyfolder">
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.emptyfolder">
 <p class="title">如何刪除資料夾中的所有郵件:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">在資料夾畫面中選擇您想要刪除的資料夾。</p></li>
 <li class="step">
 <p role="presentation">使用以下方式之一:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">點擊資料夾名稱旁的<span class="guibutton"><strong>操作</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
-<li class="listitem"><p role="presentation">點下清單上方的<span class="guibutton"><strong>更多操作</strong></span> 圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
+<li class="listitem"><p role="presentation">點擊資料夾名稱旁的<span class="guibutton"><strong>操作</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
+<li class="listitem"><p role="presentation">點下清單上方的<span class="guibutton"><strong>更多操作</strong></span> 圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
 </ul></p>
 <p role="presentation">點擊<span class="guibutton"><strong>刪除所有訊息</strong></span>按鈕。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span>若勾選了<a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>永久移除刪除的郵件</strong></span></a>選項,將無法還原刪除的郵件。</p>
+<p role="presentation"><span class="phrase"><strong>警告:</strong></span>若勾選了<span class="guibutton"><strong>永久移除刪除的郵件</strong></span>選項,視設定而定將<span class="phrase"><strong>無法</strong></span>還原刪除的郵件。</p>
 </li>
 <li class="step"><p role="presentation">確認您想要刪除該信件匣當中的內容。</p></li>
 </ol></div>
@@ -110,7 +110,7 @@
           <p>結果:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">若未勾選<a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>永久移除刪除的郵件</strong></span></a>選項:</p>
+<p role="presentation">若未勾選<span class="guibutton"><strong>永久移除刪除的郵件</strong></span>選項:</p>
 <p role="presentation">郵件將被移動至「垃圾桶」信件匣。</p>
 </li>
 <li class="listitem">
@@ -120,60 +120,22 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
-<p class="title">如何恢復已刪除的電子郵件:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">在資料夾畫面中選擇<span class="guibutton"><strong>垃圾桶</strong></span>。</p></li>
-<li class="step"><p role="presentation">選擇一封或多封郵件。</p></li>
-<li class="step"><p role="presentation">在郵件的右鍵選單點擊<span class="guibutton"><strong>移動</strong></span>。</p></li>
-<li class="step"><p role="presentation">在 <span class="guilabel"><strong>移動</strong></span> 視窗中選擇資料夾。點擊<span class="guibutton"><strong>移動</strong></span> 按鈕。</p></li>
-</ol></div>
-<div class="taskrelated">
-          <p>或:</p>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">要還原垃圾桶中的所有郵件,點擊清單上方的<span class="guibutton"><strong>更多選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。單擊 <span class="guibutton"><strong>移動所有訊息</strong></span> 按鈕。</p></li>
-<li class="listitem"><p role="presentation">若您選擇單一郵件,也可以使用詳細畫面中的<span class="guibutton"><strong>更多操作</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。點擊 <span class="guibutton"><strong>移動</strong></span>。</p></li>
-</ul>
-        </div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever">
-<p class="title">如何永久刪除電子郵件:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>警告:</strong></span><span class="phrase"><strong>無法</strong></span> 恢復已刪除的檔案。</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">在資料夾畫面中選擇<span class="guibutton"><strong>垃圾桶</strong></span>。</p></li>
-<li class="step"><p role="presentation">選擇一封或多封郵件。</p></li>
-<li class="step">
-<p role="presentation">點下工具列中的<span class="guibutton"><strong>刪除</strong></span>圖示 <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
-<p role="presentation">若您選擇單一郵件,也可以使用詳細畫面中的<span class="guibutton"><strong>刪除</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
-</li>
-<li class="step"><p role="presentation">確認您想要永久刪除選擇的郵件。</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptytrash">
-<p class="title">如何永久刪除垃圾桶中的內容:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>警告:</strong></span><span class="phrase"><strong>無法</strong></span> 恢復已刪除的檔案。</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">在資料夾畫面中選擇<span class="guibutton"><strong>垃圾桶</strong></span>。</p></li>
-<li class="step">
-<p role="presentation">使用以下方式之一:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">點擊<span class="guibutton"><strong>垃圾桶</strong></span>旁的<span class="guibutton"><strong>更多操作</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
-<li class="listitem"><p role="presentation">點下清單上方的<span class="guibutton"><strong>更多操作</strong></span> 圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
-</ul></p>
-<p role="presentation">點擊<span class="guibutton"><strong>清空信件匣</strong></span>。</p>
-</li>
-<li class="step"><p role="presentation">確認您想要刪除該信件匣當中的內容。</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.email.manage.delete"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">電子郵件</span>資料夾畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理電子郵件信件匣</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">還原電子郵件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">刪除電子郵件</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.22.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">還原永久刪除的電子郵件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理電子郵件信件匣</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.email.manage.delete">父主題:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.deleteforever.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.deleteforever.html
new file mode 100644
index 000000000..8fbee1d22
--- /dev/null
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.deleteforever.html
@@ -0,0 +1,87 @@
+<html lang="zh_tw">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>刪除電子郵件</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="使用者指南&gt;">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理電子郵件">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.recover.html" title="還原電子郵件">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.undelete.html" title="還原永久刪除的電子郵件">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.recover.html">前一頁</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.undelete.html">下一頁</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
+<h2 class="sr-only">管理電子郵件</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.deleteforever">
+<div class="titlepage"><div><div><h3 class="title">刪除電子郵件</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.24.2"></a><a class="indexterm" name="id-1.7.15.24.3"></a><p id="ox.appsuite.user.concept.email.manage.deleteforever">有下列選項:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">從垃圾筒永久刪除單一郵件。</p></li>
+<li class="listitem"><p role="presentation">清空垃圾桶,永久刪除垃圾桶中的電子郵件。</p></li>
+</ul>
+<p id="ox.appsuite.user.hint.email.manage.deleteforever.html"><span class="cap-dumpster">永久刪除的郵件,可於刪除後 14 天內還原。超過此時間後:</span>將<span class="phrase"><strong>無法</strong></span>再還原永久刪除的郵件。</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.single">
+<p class="title">如何永久刪除單一郵件:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">在資料夾畫面中選擇<span class="guibutton"><strong>垃圾桶</strong></span>。</p></li>
+<li class="step"><p role="presentation">選擇一封或多封郵件。</p></li>
+<li class="step">
+<p role="presentation">點下工具列中的<span class="guibutton"><strong>刪除</strong></span>圖示 <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
+<p role="presentation">若您選擇單一郵件,也可以使用詳細畫面中的<span class="guibutton"><strong>刪除</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
+</li>
+<li class="step"><p role="presentation">確認您想要永久刪除選擇的郵件。</p></li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.emptytrash">
+<p class="title">如何永久刪除垃圾桶中的所有郵件:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">在資料夾畫面中選擇<span class="guibutton"><strong>垃圾桶</strong></span>。</p></li>
+<li class="step">
+<p role="presentation">使用以下方式之一:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">點擊<span class="guibutton"><strong>垃圾桶</strong></span>旁的<span class="guibutton"><strong>更多操作</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
+<li class="listitem"><p role="presentation">點下清單上方的<span class="guibutton"><strong>更多操作</strong></span> 圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
+</ul></p>
+<p role="presentation">點擊<span class="guibutton"><strong>清空信件匣</strong></span>。</p>
+</li>
+<li class="step"><p role="presentation">確認您想要刪除該信件匣當中的內容。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.deleteforever"></p>
+<p class="title">使用者介面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">電子郵件</span>資料夾畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
+</li></ul>
+<p> </p>
+<p class="title">相關主題:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">刪除電子郵件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">還原電子郵件</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.24.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">還原永久刪除的電子郵件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理電子郵件信件匣</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.deleteforever">父主題:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.draft.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.draft.html
index 41384d60a..f552eaaf9 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.draft.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.draft.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.draft">
 <div class="titlepage"><div><div><h3 class="title">使用電子郵件草稿</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">撰寫郵件時,將自動定時儲存草稿。有下列選項:</p>
+<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">撰寫郵件時,將自動定時儲存草稿。有下列選項:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">編輯或傳送郵件草稿。</p></li>
 <li class="listitem"><p role="presentation">編輯或傳送郵件草稿副本。</p></li>
@@ -64,11 +64,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.draft"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">電子郵件</span>資料夾畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">使用範本</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.manage.draft">父主題:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.expungefolder.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.expungefolder.html
index e9c73d494..bd219384b 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.expungefolder.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.expungefolder.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理電子郵件">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="刪除電子郵件">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.undelete.html" title="還原永久刪除的電子郵件">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.unifiedmail.html" title="使用統一郵件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.undelete.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">下一頁</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.expungefolder">
 <div class="titlepage"><div><div><h3 class="title">清理電子郵件信件匣</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.22.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">視設定而定,您在 Apple Mail、MS Outlook 或 Mozilla Thunderbird 等郵件客戶端當中刪除的電子郵件可能只會在您登出客戶端後才會被清除。在被清除之前,這些郵件只會在 Groupware 中被顯示為已刪除,但尚未真的被刪除。刪除這些郵件來清理電子郵件信件匣。</p>
+<a class="indexterm" name="id-1.7.15.26.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">視設定而定,您在 Apple Mail、MS Outlook 或 Mozilla Thunderbird 等郵件客戶端當中刪除的電子郵件可能只會在您登出客戶端後才會被清除。在被清除之前,這些郵件只會在 Groupware 中被顯示為已刪除,但尚未真的被刪除。刪除這些郵件來清理電子郵件信件匣。</p>
 <p id="ox.appsuite.user.hint.email.manage.expungefolder">註:視設定而定,可能無法對未顯示的郵件使用此功能。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.expunge">
 <p class="title">如何清理電子郵件信件匣:</p>
@@ -43,6 +43,9 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.expungefolder"></p>
+<p class="title">使用者介面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">電子郵件</span>資料夾畫面</a></p></li></ul>
+<p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">刪除電子郵件</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.expungefolder">父主題:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.html
index 0bcb003fc..c08f6a964 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.html
@@ -38,17 +38,21 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">移動或複製郵件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">將郵件標示為已讀或未讀</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">收集地址</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">為新郵件預設使用行內 PGP</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">分類郵件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">顯示電子郵件原始內容</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">使用電子郵件草稿</a></p></li>
-<li class="listitem cap-tasks" id="id-1.7.15.4.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">建立郵件提醒</a></p></li>
+<li class="listitem cap-tasks" id="id-1.7.15.4.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">建立郵件提醒</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">新增郵件到入口</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">保存電子郵件</a></p></li>
-<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">將郵件匯出為 PDF。</a></p></li>
+<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">將郵件匯出為 PDF。</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">匯入郵件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">列印電子郵件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">封存郵件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">刪除電子郵件</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">還原電子郵件</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">刪除電子郵件</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.4.1.19"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">還原永久刪除的電子郵件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理電子郵件信件匣</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">使用統一郵件</a></p></li>
 </ul>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.import.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.import.html
index daa6fdeae..45900e3c4 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.import.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.import">
 <div class="titlepage"><div><div><h3 class="title">匯入郵件</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><p id="ox.appsuite.user.concept.email.manage.import">您可以匯入 EML 格式的電子郵件。</p>
+<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.import">您可以匯入 EML 格式的電子郵件。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.import">
 <p class="title">如何匯入電子郵件:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -42,6 +42,12 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.import"></p>
+<p class="title">使用者介面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">電子郵件</span>資料夾畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
+</li></ul>
+<p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">保存電子郵件</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.import">父主題:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.inboxcategories.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.inboxcategories.html
index e899f9b57..b40f63cb1 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.inboxcategories.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.inboxcategories.html
@@ -39,7 +39,7 @@
 <li class="listitem"><p role="presentation">將收到的郵件指派到分類中</p></li>
 <li class="listitem"><p role="presentation">編輯收件匣分類畫面</p></li>
 </ul>
-<p role="presentation" class="feat-io-ox-core-categories">註:此處的收件匣分類僅對電子郵件有效。視設定而定,您可以使用不同分類來顯示約會、聯絡人與任務。請參考 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a>。</p>
+<p role="presentation" class="feat-io-ox-core-categories">註:此處的收件匣分類僅對電子郵件有效。視設定而定,您可以使用不同分類來顯示郵件、約會、聯絡人與任務。請參考 <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">為新郵件預設使用行內 PGP</a>。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.inboxcategories.activate">
 <p class="title">如何開啟或關閉收件匣分頁:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -47,7 +47,7 @@
 <p role="presentation">要開啟收件匣分頁,請點擊選單列中的<span class="guibutton"><strong>設定</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.activate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>收件匣分類</strong></span>。</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">您也可以使用電子郵件設定中的<span class="guibutton"><strong>閱讀</strong></span>下方的<span class="guibutton"><strong>設定收件匣分類</strong></span>按鈕。</p></li></ul>
 <p role="presentation">將開啟 <span class="guilabel"><strong>設定分類</strong></span> 視窗。將顯示可用的收件匣分類。點擊<span class="guibutton"><strong>啟用分類</strong></span>。</p>
-<p role="presentation">在右邊的選單列下方會顯示分頁列。</p>
+<p role="presentation">收件匣分頁列將顯示於選單列下方。</p>
 </li>
 <li class="step">
 <p role="presentation">要停用收件匣分頁,請點擊選單列中的<span class="guibutton"><strong>設定</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.deactivate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>收件匣分類</strong></span>。</p>
@@ -63,7 +63,7 @@
 <p role="presentation">尚未指派到任何收件匣分類的郵件將顯示於<span class="guibutton"><strong>一般</strong></span>分頁。</p>
 </li>
 <li class="step">
-<p role="presentation">從清單畫面拖曳郵件至分頁列中的分頁放下。</p>
+<p role="presentation">從清單畫面拖曳郵件至收件匣分類列中的分類放下。</p>
 <p role="presentation">您也可以選擇郵件。點下工具列中的<span class="guibutton"><strong>設定分類</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>。在選單中選擇分頁。</p>
 </li>
 <li class="step"><p role="presentation">要完成過程,進行下列操作:<ul class="itemizedlist" style="list-style-type: disc; ">
@@ -77,14 +77,14 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>收件匣分類</strong></span>。</p>
-<p role="presentation">您也可以點擊分類列中的<span class="guibutton"><strong>設定分類</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p>
+<p role="presentation">您也可以點擊收件匣分類列中的<span class="guibutton"><strong>設定分類</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p>
 <p role="presentation">將開啟 <span class="guilabel"><strong>設定分類</strong></span> 視窗。</p>
 </li>
 <li class="step">
 <p role="presentation">要開啟或關閉某收件匣分類,勾選或取消勾選對應的選取盒。</p>
 <p role="presentation">要更名收件匣分類,編輯對應的文字。</p>
 <p role="presentation">註:無法編輯某些分類。</p>
-<p role="presentation">要隱藏分類列,點擊<span class="guibutton"><strong>關閉分類</strong></span>。</p>
+<p role="presentation">要隱藏收件匣分類列,點擊<span class="guibutton"><strong>關閉分類</strong></span>。</p>
 </li>
 <li class="step"><p role="presentation">點擊<span class="guibutton"><strong>儲存</strong></span>。</p></li>
 </ol></div>
@@ -93,14 +93,11 @@
 <p class="title">使用者介面:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.settingsmenu.html"><span class="phrase">電子郵件</span>設定選單</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html"><span class="phrase">電子郵件</span>分頁列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">收件匣分類列</a></p>
 </li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">檢視電子郵件</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.manage.inboxcategories">父主題:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.label.html
index 4dcee85de..2002f4eb1 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.label.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.label.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理電子郵件">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="收集地址">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="為新郵件預設使用行內 PGP">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.source.html" title="顯示電子郵件原始內容">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.categories.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.source.html">下一頁</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.label">
 <div class="titlepage"><div><div><h3 class="title">分類郵件</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.label">視設定而定,您可使用下列一種選項來分類郵件。</p>
+<a class="indexterm" name="id-1.7.15.12.2"></a><a class="indexterm" name="id-1.7.15.12.3"></a><p id="ox.appsuite.user.concept.email.manage.label">視設定而定,您可使用下列一種選項來分類郵件。</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">色彩標籤</p></li>
 <li class="listitem"><p role="presentation">旗標</p></li>
@@ -64,7 +64,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.label"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.mark.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.mark.html
index 7ddc63202..ed4aa8c32 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.mark.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.mark.html
@@ -57,7 +57,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.mark"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">檢視電子郵件</a></p></li></ul>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.movecopy.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.movecopy.html
index b222c23b3..abb595697 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.movecopy.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.movecopy.html
@@ -62,7 +62,11 @@
 </ul>
 <p id="ox.appsuite.user.related.email.manage.movecopy"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.pdfexport.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.pdfexport.html
index f7084c25f..9696ab740 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.pdfexport.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.pdfexport.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.pdfexport">
 <div class="titlepage"><div><div><h3 class="title">將郵件匯出為 PDF。</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.17.2"></a><a class="indexterm" name="id-1.7.15.17.3"></a><a class="indexterm" name="id-1.7.15.17.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">註:視設定而定,此功能可能無法使用。</p>
+<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><a class="indexterm" name="id-1.7.15.18.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">註:視設定而定,此功能可能無法使用。</p>
 <p id="ox.appsuite.user.concept.email.manage.pdfexport">您可以將郵件與 docx 格式的附件匯出為 PDF。當 PDF 檔案建立後,將儲存至 <span class="phrase">雲端空間</span>當中的資料夾。(您可以再指定)視資料量而定,可能需要花一些時間下載。處理完成後,您就會收到通知。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.pdfexport">
 <p class="title">如何將郵件匯出為 PDF:</p>
@@ -49,7 +49,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.pdfexport"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">保存電子郵件</a></p></li></ul>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.print.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.print.html
index 5189da85d..84c727d74 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.print.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.print">
 <div class="titlepage"><div><div><h3 class="title">列印電子郵件</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.print">您可以列印單封或多封郵件內容。</p>
+<a class="indexterm" name="id-1.7.15.20.2"></a><a class="indexterm" name="id-1.7.15.20.3"></a><p id="ox.appsuite.user.concept.email.manage.print">您可以列印單封或多封郵件內容。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.print">
 <p class="title">如何列印電子郵件內容:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -51,7 +51,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.print"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">封存郵件</a></p></li></ul>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.recover.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.recover.html
new file mode 100644
index 000000000..3eac1f655
--- /dev/null
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.recover.html
@@ -0,0 +1,92 @@
+<html lang="zh_tw">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>還原電子郵件</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="使用者指南&gt;">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理電子郵件">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="刪除電子郵件">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="刪除電子郵件">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">前一頁</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">下一頁</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
+<h2 class="sr-only">管理電子郵件</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.recover">
+<div class="titlepage"><div><div><h3 class="title">還原電子郵件</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.recover">有下列選項:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">從垃圾桶還原單一一封郵件。</p></li>
+<li class="listitem"><p role="presentation">還原垃圾桶中的所有郵件。</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.single">
+<p class="title">如何還原垃圾桶中的單一一封郵件:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">在資料夾畫面中選擇<span class="guibutton"><strong>垃圾桶</strong></span>。</p></li>
+<li class="step">
+<p role="presentation">選擇一封或多封郵件。</p>
+<p role="presentation">在郵件的右鍵選單點擊<span class="guibutton"><strong>移動</strong></span>。</p>
+</li>
+<li class="step"><p role="presentation">在 <span class="guilabel"><strong>移動</strong></span> 視窗中選擇資料夾。點選 <span class="guibutton"><strong>移動</strong></span>。</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>或:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">在資料夾畫面使用拖曳功能來將郵件移出垃圾桶。</p></li>
+<li class="listitem"><p role="presentation">若您選擇單一郵件,也可以使用詳細畫面中的<span class="guibutton"><strong>更多操作</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.single.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。點擊 <span class="guibutton"><strong>移動</strong></span>。</p></li>
+</ul>
+        </div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.all">
+<p class="title">如何還原垃圾桶中的所有郵件:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">在資料夾畫面中選擇<span class="guibutton"><strong>垃圾桶</strong></span>。</p></li>
+<li class="step">
+<p role="presentation">使用以下方式之一:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">點擊<span class="guibutton"><strong>垃圾桶</strong></span>旁的<span class="guibutton"><strong>更多操作</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
+<li class="listitem"><p role="presentation">點下清單上方的<span class="guibutton"><strong>更多操作</strong></span> 圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p></li>
+</ul></p>
+<p role="presentation">點擊<span class="guibutton"><strong>移動所有訊息</strong></span>按鈕。</p>
+</li>
+<li class="step"><p role="presentation">在 <span class="guilabel"><strong>移動</strong></span> 視窗中選擇資料夾。點擊<span class="guibutton"><strong>移動全部</strong></span>。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.recover"></p>
+<p class="title">使用者介面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">電子郵件</span>資料夾畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
+</li></ul>
+<p> </p>
+<p class="title">相關主題:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">刪除電子郵件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">刪除電子郵件</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.23.7.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">還原永久刪除的電子郵件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理電子郵件信件匣</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.recover">父主題:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.reminder.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.reminder.html
index 88f6cd1d1..70e250ff6 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.reminder.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.reminder.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.reminder">
 <div class="titlepage"><div><div><h3 class="title">建立郵件提醒</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">您可以為郵件設定提醒。此功能將會建立工作,並提醒您到期日。</p>
+<a class="indexterm" name="id-1.7.15.15.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">您可以為郵件設定提醒。此功能將會建立工作,並提醒您到期日。</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.email.manage.reminder">
 <p class="title">如何建立郵件提醒:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -47,7 +47,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.reminder"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">建立新任務</a></p></li></ul>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.save.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.save.html
index fb510bfd8..b49921543 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.save.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.save.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.save">
 <div class="titlepage"><div><div><h3 class="title">保存電子郵件</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.16.2"></a><p id="ox.appsuite.user.concept.email.manage.save">您可以作為文本文件保存電子郵件。文字檔有副檔名 EML。若您選擇多封郵件,將為每封郵件建立 eml 檔案。eml 檔案將儲存為 zip 壓縮檔。</p>
+<a class="indexterm" name="id-1.7.15.17.2"></a><p id="ox.appsuite.user.concept.email.manage.save">您可以作為文本文件保存電子郵件。文字檔有副檔名 EML。若您選擇多封郵件,將為每封郵件建立 eml 檔案。eml 檔案將儲存為 zip 壓縮檔。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.save">
 <p class="title">如何保存電子郵件:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,7 +44,10 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.save"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
@@ -52,7 +55,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">匯入郵件</a></p>
 <p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">將郵件匯出為 PDF。</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.7.15.16.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下載個人資料</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.7.15.17.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下載個人資料</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.save">父主題:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.source.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.source.html
index 3a6127f1f..b460c348c 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.source.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.source.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.source">
 <div class="titlepage"><div><div><h3 class="title">顯示電子郵件原始內容</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.12.2"></a><p id="ox.appsuite.user.concept.email.manage.source">原始資料包含電子郵件的完整內容,包括完整的電子郵件檔頭詳細資訊。</p>
+<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.source">原始資料包含電子郵件的完整內容,包括完整的電子郵件檔頭詳細資訊。</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.source">
 <p class="title">如何顯示電子郵件原始內容:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,7 +46,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.manage.source"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html"><span class="phrase">電子郵件</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.undelete.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.undelete.html
new file mode 100644
index 000000000..945b3fb8f
--- /dev/null
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.undelete.html
@@ -0,0 +1,70 @@
+<html lang="zh_tw">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>還原永久刪除的電子郵件</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="使用者指南&gt;">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="管理電子郵件">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="刪除電子郵件">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="清理電子郵件信件匣">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">前一頁</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">下一頁</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
+<h2 class="sr-only">管理電子郵件</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.undelete">
+<div class="titlepage"><div><div><h3 class="title">還原永久刪除的電子郵件</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.25.2"></a><a class="indexterm" name="id-1.7.15.25.3"></a><p id="ox.appsuite.user.concept.email.manage.undelete.html">您可以在郵件永久刪除後的 14 天內還原。超過此時間後,將無法還原被永久刪除的郵件。</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
+<p class="title">如何還原永久刪除的郵件:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">在資料夾畫面中選擇<span class="guibutton"><strong>垃圾桶</strong></span>。</p></li>
+<li class="step">
+<p role="presentation">點擊<span class="guibutton"><strong>垃圾桶</strong></span>旁的<span class="guibutton"><strong>更多操作</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>。</p>
+<p role="presentation">點擊<span class="guibutton"><strong>還原已刪除的項目</strong></span>。</p>
+</li>
+<li class="step">
+<p role="presentation">在<span class="guilabel"><strong>還原已刪除的項目</strong></span>視窗中選擇要還原的郵件。</p>
+<p role="presentation">點擊<span class="guibutton"><strong>移動選擇的項目</strong></span>。</p>
+</li>
+<li class="step">
+<p role="presentation">在<span class="guilabel"><strong>移動</strong></span>視窗,指定要郵件還原後要放入的信件匣。</p>
+<p role="presentation">點擊 <span class="guibutton"><strong>移動</strong></span>。</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.undelete"></p>
+<p class="title">使用者介面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">電子郵件</span>資料夾畫面</a></p></li></ul>
+<p> </p>
+<p class="title">相關主題:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">刪除電子郵件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">還原電子郵件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">刪除電子郵件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">清理電子郵件信件匣</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.undelete">父主題:<a class="xref" href="ox.appsuite.user.sect.email.manage.html">管理電子郵件</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.unifiedmail.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.unifiedmail.html
index 6031d6949..f95e04b2b 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.unifiedmail.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.manage.unifiedmail.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.unifiedmail">
 <div class="titlepage"><div><div><h3 class="title">使用統一郵件</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">使用統一郵件在統一的資料夾中顯示多個電子郵件帳號的收件匣。這讓您可以快速取得不同郵件帳號收件匣的概觀。統一郵件可以用下列方式描述:</p>
+<a class="indexterm" name="id-1.7.15.27.2"></a><a class="indexterm" name="id-1.7.15.27.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">使用統一郵件在統一的資料夾中顯示多個電子郵件帳號的收件匣。這讓您可以快速取得不同郵件帳號收件匣的概觀。統一郵件可以用下列方式描述:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">除了每個郵件帳號的收件匣,<span class="guibutton"><strong>統一郵件匣</strong></span>也會顯示郵件帳號的內容。實際上只有一封郵件存在。</p></li>
 <li class="listitem"><p role="presentation">在收件匣的子信件匣中的郵件將不會顯示在<span class="guibutton"><strong>統一郵件</strong></span>信件匣中。</p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.openai.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.openai.html
index a4038ace5..cf2ae666c 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.openai.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.openai.html
@@ -37,7 +37,7 @@
 <li class="listitem"><p role="presentation">編輯現有郵件內容,或建議回覆內容</p></li>
 <li class="listitem"><p role="presentation">撰寫新郵件時提供文字建議</p></li>
 </ul>
-<p>註:使用 AI 整合功能時,整封郵件的內容將傳送到 Microsoft Azure OpenAI 服務</p>
+<p>註:使用 AI 整合功能時,整封郵件的內容將傳送到 OpenAI 服務</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">您首次使用 AI 整合功能時,將開啟讓您同意傳送此資料的對話框。您必須同意傳送資料才可以使用 AI 整合功能。</p></li>
 <li class="listitem"><p role="presentation">您可以隨時更改是否同意傳送資料。要這樣做,點擊郵件設定中,<span class="guibutton"><strong>AI 整合功能</strong></span>下方的<span class="guibutton"><strong>更改同意</strong></span>。</p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.openai.send.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.openai.send.html
index b997be50c..2a4de5e8a 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.openai.send.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.openai.send.html
@@ -59,7 +59,7 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">使用 AI 功能回覆郵件</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.email.openai.send">父主題:<a class="xref" href="ox.appsuite.user.sect.email.openai.html">使用 AI 整合功能</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.search.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.search.html
index ffb6af128..3795d3fca 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.search.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.search.html
@@ -93,7 +93,10 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">檢視電子郵件</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">分類郵件</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">分類郵件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">為新郵件預設使用行內 PGP</a></p>
+</li>
 </ul>
 <p id="ox.appsuite.user.parent.email.search">父主題:<a class="xref" href="ox.appsuite.user.chap.email.html"><i><span class="phrase">電子郵件</span></i></a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attachmentexisting.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attachmentexisting.html
index f54734dec..6be9e431f 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attachmentexisting.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attachmentexisting.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="新增附件">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="以連結傳送附件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
-<h2 class="sr-only">發送電子郵件</h2>
+<h2 class="sr-only">傳送 電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentexisting">
 <div class="titlepage"><div><div><h3 class="title">從現有郵件新增附件</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.9.2"></a><a class="indexterm" name="id-1.7.11.9.3"></a><p id="ox.appsuite.user.concept.email.send.attachmentexisting">視設定而定,您可以在新郵件中直接新增現有郵件的附件。</p>
@@ -54,14 +54,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachmentexisting"></p>
 <p class="title">進階操作:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p></li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">新增附件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">以連結傳送附件</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send..attachmentexisting">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p id="ox.appsuite.user.parent.email.send..attachmentexisting">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attachmentlink.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attachmentlink.html
index 55359db3d..8c1f7ead6 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attachmentlink.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attachmentlink.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="從現有郵件新增附件">
 <link rel="next" href="ox.appsuite.user.sect.email.send.templates.html" title="使用範本">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
-<h2 class="sr-only">發送電子郵件</h2>
+<h2 class="sr-only">傳送 電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentlink">
 <div class="titlepage"><div><div><h3 class="title">以連結傳送附件</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.10.2"></a><p id="ox.appsuite.user.concept.email.send.attachmentlink">此功能可讓您用郵件寄出大型附件檔案。原理如下:</p>
@@ -84,14 +84,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.attachmentlink"></p>
 <p class="title">進階操作:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p></li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">新增附件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">從現有郵件新增附件</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachmentlink">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachmentlink">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attachments.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attachments.html
index 4ca32c316..7ca139c16 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attachments.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attachments.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.replyto.html" title="設定「回覆至」地址">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="從現有郵件新增附件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
-<h2 class="sr-only">發送電子郵件</h2>
+<h2 class="sr-only">傳送 電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachments">
 <div class="titlepage"><div><div><h3 class="title">新增附件</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.8.2"></a><a class="indexterm" name="id-1.7.11.8.3"></a><p id="ox.appsuite.user.concept.emal.add.attachments">是設定而定,您可以將儲存在電腦或 <span class="phrase">雲端空間</span>應用程式中的檔案附加到信件中。</p>
@@ -57,14 +57,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachments"></p>
 <p class="title">進階操作:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p></li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">從現有郵件新增附件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">以連結傳送附件</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachments">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachments">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attendees.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attendees.html
index e65dd7c3f..4a28a966d 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attendees.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.autoforward.html" title="自動轉寄電子郵件">
 <link rel="next" href="ox.appsuite.user.sect.email.send.vacationnotice.html" title="自動傳送假期通知">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
-<h2 class="sr-only">發送電子郵件</h2>
+<h2 class="sr-only">傳送 電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attendees">
 <div class="titlepage"><div><div><h3 class="title">發送電子郵件給參與者</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.16.2"></a><div class="task" id="ox.appsuite.user.task.email.send.attendees">
@@ -47,15 +47,15 @@
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.send.attendees"></p>
-<p class="title">相關主題:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
+<p class="title">使用者介面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html"><span class="phrase">行事曆</span>彈出視窗</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html"><span class="phrase">行事曆</span>工具列</a></p>
-</li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p></li>
-</ul>
-<p id="ox.appsuite.user.parent.email.send.attendees">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+</li></ul>
+<p> </p>
+<p class="title">相關主題:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p></li></ul>
+<p id="ox.appsuite.user.parent.email.send.attendees">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.autoforward.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.autoforward.html
index e3731da90..3f19a46d9 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.autoforward.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.autoforward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.forward.html" title="轉發電子郵件">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attendees.html" title="發送電子郵件給參與者">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
-<h2 class="sr-only">發送電子郵件</h2>
+<h2 class="sr-only">傳送 電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.autoforward">
 <div class="titlepage"><div><div><h3 class="title">自動轉寄電子郵件</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.15.2"></a><p id="ox.appsuite.user.concept.email.send.autoforward">您可以讓電子郵件被自動轉寄到其他地址。</p>
@@ -60,7 +60,7 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">回覆電子郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">轉發電子郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">自動傳送假期通知</a></p>
@@ -70,7 +70,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.autoforward">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p id="ox.appsuite.user.parent.email.send.autoforward">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.forward.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.forward.html
index 9a2a0ff07..670d68d12 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.forward.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.forward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.reply.html" title="回覆電子郵件">
 <link rel="next" href="ox.appsuite.user.sect.email.send.autoforward.html" title="自動轉寄電子郵件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
-<h2 class="sr-only">發送電子郵件</h2>
+<h2 class="sr-only">傳送 電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.forward">
 <div class="titlepage"><div><div><h3 class="title">轉發電子郵件</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.14.2"></a><p id="ox.appsuite.user.concept.email.send.forward">回覆電子郵件時,窗口中預先填寫了以下輸入字段:</p>
@@ -69,11 +69,11 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">回覆電子郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">自動轉寄電子郵件</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.forward">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p id="ox.appsuite.user.parent.email.send.forward">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.html
index bec27287c..870b6899d 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.html
@@ -1,13 +1,13 @@
 <html lang="zh_tw">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>發送電子郵件</title>
+<title>傳送 電子郵件</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.attachments.html" title="檢視或儲存電子郵件附件">
-<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="發送新電子郵件">
+<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="傳送新郵件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -31,10 +31,10 @@
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.send">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">發送電子郵件</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">傳送 電子郵件</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.email.send">了解如何傳送郵件與自訂郵件內容的相關功能:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">選擇寄件地址</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">設定「回覆至」地址</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">新增附件</a></p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.new.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.new.html
index d4f3f5507..4e181764a 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.new.html
@@ -1,12 +1,12 @@
 <html lang="zh_tw">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>發送新電子郵件</title>
+<title>傳送新郵件</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
 <link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="選擇寄件地址">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
-<h2 class="sr-only">發送電子郵件</h2>
+<h2 class="sr-only">傳送 電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.new">
-<div class="titlepage"><div><div><h3 class="title">發送新電子郵件</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">傳送新郵件</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.5.2"></a><a class="indexterm" name="id-1.7.11.5.3"></a><a class="indexterm" name="id-1.7.11.5.4"></a><div class="task" id="ox.appsuite.user.task.email.send.new">
 <p class="title">如何發送新電子郵件:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -88,7 +88,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">新增郵件按鈕</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">電子郵件編輯視窗</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">其他操作:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">自動從通訊錄新增聯絡人或資源</a></p>
@@ -104,21 +104,10 @@
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">回覆電子郵件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">轉發電子郵件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">自動轉寄電子郵件</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">發送電子郵件給參與者</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">自動傳送假期通知</a></p>
-<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">傳送加密郵件</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">作為 vCard 發送聯絡人</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">在通訊錄中傳送郵件</a></p>
-</li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">在撰寫郵件時使用 AI 功能</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">在撰寫郵件時使用 AI 功能</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.new">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p id="ox.appsuite.user.parent.email.send.new">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.reply.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.reply.html
index 6195b1c3b..50332e3b2 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.reply.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.reply.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.signatures.html" title="使用簽名檔">
 <link rel="next" href="ox.appsuite.user.sect.email.send.forward.html" title="轉發電子郵件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
-<h2 class="sr-only">發送電子郵件</h2>
+<h2 class="sr-only">傳送 電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.reply">
 <div class="titlepage"><div><div><h3 class="title">回覆電子郵件</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.13.2"></a><p id="ox.appsuite.user.concept.email.send.reply">回覆電子郵件時,窗口中預先填寫了以下欄位:</p>
@@ -65,13 +65,13 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">轉發電子郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">自動傳送假期通知</a></p>
 </li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.7.11.13.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">使用 AI 功能回覆郵件</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.reply">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p id="ox.appsuite.user.parent.email.send.reply">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.replyto.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.replyto.html
index dcaa599f5..118b75ce8 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.replyto.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.replyto.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="選擇寄件地址">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="新增附件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
-<h2 class="sr-only">發送電子郵件</h2>
+<h2 class="sr-only">傳送 電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.replyto">
 <div class="titlepage"><div><div><h3 class="title">設定「回覆至」地址</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.7.2"></a><p id="ox.appsuite.user.concept.email.send.replyto">預設情況下,當收件者回覆您的信件時,會回信到您寄出郵件的電子郵件信箱。另外您也可以使用郵件編輯視窗來指定這些寄件者應回覆到哪個電子郵件信箱。</p>
@@ -42,7 +42,7 @@
 <p role="presentation">當您編輯主要郵件帳號時,指定了預設回覆至地址,將自動顯示<span class="guibutton"><strong>回覆至</strong></span>輸入欄位。輸入欄位中包含預設的回覆至地址。</p>
 </li>
 <li class="step">
-<p role="presentation">在<span class="guibutton"><strong>回覆至</strong></span>欄位輸入您想要回覆信件時要寄送到的電子郵件地址。<ul class="itemizedlist" style="list-style-type: disc; ">
+<p role="presentation">在<span class="guibutton"><strong>回覆至</strong></span>欄位輸入您想要回覆信件時,要寄送到的電子郵件地址。<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">輸入收件者時,將顯示符合的建議。若要接受該建議,請點擊該建議。</p></li>
 <li class="listitem"><p role="presentation">要從通訊錄選擇聯絡人,點擊輸入欄位右方的<span class="guibutton"><strong>選擇聯絡人</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.replyto.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span>。</p></li>
 </ul></p>
@@ -52,11 +52,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.replyto"></p>
 <p class="title">進階操作:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p></li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">編輯主要郵件帳號</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.replyto">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p id="ox.appsuite.user.parent.email.send.replyto">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.sender.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.sender.html
index 450553c63..6ed41a4b6 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.sender.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.sender.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="發送新電子郵件">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="傳送新郵件">
 <link rel="next" href="ox.appsuite.user.sect.email.send.replyto.html" title="設定「回覆至」地址">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
-<h2 class="sr-only">發送電子郵件</h2>
+<h2 class="sr-only">傳送 電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.sender">
 <div class="titlepage"><div><div><h3 class="title">選擇寄件地址</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.6.2"></a><p id="ox.appsuite.user.concept.email.send.sender">寄送郵件時,您可以於郵件編輯視窗選擇要顯示給收件者的寄件地址。</p>
@@ -54,11 +54,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.sender"></p>
 <p class="title">進階操作:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p></li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">新增電子郵件帳號</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.sender">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p id="ox.appsuite.user.parent.email.send.sender">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.signatures.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.signatures.html
index 11b6a0c9b..064647f40 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.signatures.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.signatures.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.templates.html" title="使用範本">
 <link rel="next" href="ox.appsuite.user.sect.email.send.reply.html" title="回覆電子郵件">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
-<h2 class="sr-only">發送電子郵件</h2>
+<h2 class="sr-only">傳送 電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.signatures">
 <div class="titlepage"><div><div><h3 class="title">使用簽名檔</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.12.2"></a><a class="indexterm" name="id-1.7.11.12.3"></a><p id="ox.appsuite.user.concept.email.send.signatures">電子郵件簽名是在撰寫、回覆或轉寄郵件時自動插入的文字。它通常用於在電子郵件正文的底部插入姓名、公司和聯絡地址。您可以以純文字或 HTML 格式建立簽名。以下功能可供使用:</p>
@@ -86,7 +86,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.signatures"></p>
 <p class="title">進階操作:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p></li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -94,7 +94,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">新增電子郵件帳號</a></p>
 <p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">使用範本</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.signatures">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p id="ox.appsuite.user.parent.email.send.signatures">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.templates.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.templates.html
index e441566f5..182c35856 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.templates.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.templates.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="以連結傳送附件">
 <link rel="next" href="ox.appsuite.user.sect.email.send.signatures.html" title="使用簽名檔">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
-<h2 class="sr-only">發送電子郵件</h2>
+<h2 class="sr-only">傳送 電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.templates">
 <div class="titlepage"><div><div><h3 class="title">使用範本</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.11.2"></a><a class="indexterm" name="id-1.7.11.11.3"></a><p id="ox.appsuite.user.concept.email.send.templates">範本是您可以只要撰寫一次,就可以重複插入郵件的文字段落。只要撰寫一次常用的訊息內容即可。範本、簽名檔與郵件草稿的差異如下:</p>
@@ -83,7 +83,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.templates"></p>
 <p class="title">進階操作:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p></li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -91,7 +91,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">使用簽名檔</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">使用電子郵件草稿</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.templates">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p id="ox.appsuite.user.parent.email.send.templates">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.vacationnotice.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.vacationnotice.html
index b46fdb5bc..23fbbb8a0 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.vacationnotice.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.send.vacationnotice.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="發送電子郵件">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="傳送 電子郵件">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attendees.html" title="發送電子郵件給參與者">
 <link rel="next" href="ox.appsuite.user.sect.email.openai.html" title="使用 AI 整合功能">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">電子郵件</span></h1>
-<h2 class="sr-only">發送電子郵件</h2>
+<h2 class="sr-only">傳送 電子郵件</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.vacationnotice">
 <div class="titlepage"><div><div><h3 class="title">自動傳送假期通知</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.17.2"></a><a class="indexterm" name="id-1.7.11.17.3"></a><p id="ox.appsuite.user.concept.email.send.vacationnotice">假期通知將可以自動發送郵件,告知寄件者您暫時沒有辦法處理郵件。您可以設定下列選項:</p>
@@ -76,14 +76,14 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">回覆電子郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">轉發電子郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">自動轉寄電子郵件</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">使用電子郵件過濾器</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.vacationnotice">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">發送電子郵件</a></p>
+<p id="ox.appsuite.user.parent.email.send.vacationnotice">父主題:<a class="xref" href="ox.appsuite.user.sect.email.send.html">傳送 電子郵件</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.settings.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.settings.html
index 2f11cf6df..a11f2848d 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.settings.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.settings.html
@@ -50,8 +50,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.composereply">撰寫與回覆</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.20.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">範本</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.rules">規則</a></p></li>
-<li class="listitem feat-zoom" id="id-1.7.20.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">AI 整合</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.7.20.5.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">進階設定</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">AI 整合</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">進階設定</a></p></li>
 </ul>
 <p>也請參考:<a class="xref" href="ox.appsuite.user.sect.settings.search.html">搜尋設定</a></p>
 <p id="ox.appsuite.user.reference.email.settings.reading"></p>
@@ -63,8 +63,9 @@
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.list"><b>聯絡人圖片、選取盒、簡單. </b>定義是否在清單畫面中顯示聯絡人圖片、選取盒或不顯示。</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.preview"><b>顯示文字預覽. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.2.1.2"></a>定義是否在郵件清單中畫面顯示郵件內容開頭的部分文字。</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>總是顯示完整日期與時間. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>定義是否在郵件清單畫面中顯示收到郵件的日期與時間。</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>顯示訊息大小. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>定義是否在郵件清單畫面中顯示郵件大小。</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.20.6.2.1.2.1.3.1.3"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>顯示分類. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>定義是否在郵件清單畫面中顯示郵件分類。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>總是顯示完整日期與時間. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>定義是否在郵件清單畫面中顯示收到郵件的日期與時間。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>顯示訊息大小. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.5.1.2"></a>定義是否在郵件清單畫面中顯示郵件大小。</p></li>
 </ul>
 </li>
 <li class="listitem">
@@ -145,7 +146,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>顯示送達回執的請求. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.1.2"></a>設定是否在收到包含請求送達回執的郵件時顯示該回執。</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>永久移除已刪除的電子郵件. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.1.2"></a>定義刪除郵件時,要永久刪除電子郵件還是將電子郵件移到垃圾筒。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span> 無法恢復已永久刪除的電子郵件。</p>
+<p role="presentation"><span class="phrase"><strong>警告:</strong></span>視設定而定,可能<span class="bold">無法</span>還原已刪除的郵件。</p>
 <p role="presentation">參見<a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">刪除電子郵件</a></p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.selectrecent"><b>一開始就自動選擇最新的已讀訊息. </b><a class="indexterm" name="id-1.7.20.12.2.1.4.1.2"></a>設定是否要在開啟應用程式時,就自動選擇最新的已讀訊息。</p></li>
@@ -169,7 +170,7 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">編輯主要郵件帳號</a></p>
 </li>
@@ -177,7 +178,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html"><span class="phrase">電子郵件</span>資料夾畫面</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">電子郵件設定</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">檢視電子郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">收集地址</a></p>
 </li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.email.view.html b/help/l10n/zh_TW/ox.appsuite.user.sect.email.view.html
index 474607129..4cef00229 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.email.view.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.email.view.html
@@ -77,11 +77,10 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html"><span class="phrase">電子郵件</span>清單畫面</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html"><span class="phrase">電子郵件</span>詳細畫面</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">使用收件匣分類</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">檢視或儲存電子郵件附件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">顯示電子郵件原始內容</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">將郵件標示為已讀或未讀</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.autocrypt.manage.html b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.autocrypt.manage.html
index d77f25f26..31e3765e6 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.autocrypt.manage.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.autocrypt.manage.html
@@ -77,7 +77,7 @@
 <p id="ox.appsuite.user.related.guard.autocrypt.manage"></p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> 設定</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>設定</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">匯入 Autocrypt 金鑰</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">轉移 Autocrypt 金鑰到其他客戶端</a></p>
 </li></ul>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.email.send.html b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.email.send.html
index c4d3c20ad..f3c28e9b0 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.email.send.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.email.send.html
@@ -48,7 +48,7 @@
 <p role="presentation">您也可以點擊應用程式啟動器中的<span class="guibutton"><strong>設定</strong></span>。</p>
 <p role="presentation">將開啟<span class="guilabel"><strong>設定</strong></span>視窗。</p>
 </li>
-<li class="step"><p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p></li>
+<li class="step"><p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的 <span class="guibutton"><strong>S/MIME</strong></span>。</p></li>
 <li class="step">
 <p role="presentation">勾選<span class="guibutton"><strong>開啟 S/MIME</strong></span>。</p>
 <p role="presentation">若要預設使用 S/MIME 加密,勾選<span class="guibutton"><strong>預設</strong></span>下方的<span class="guibutton"><strong>預設使用 S/MIME 進行簽署與加密</strong></span>。</p>
@@ -74,7 +74,7 @@
 <li class="listitem"><p role="presentation">為了讓收件者也可以加密傳送回覆,收件者需要擁有您的公鑰。您可以將公鑰作為附件傳送。要這樣做,勾選<span class="guibutton"><strong>附加我的金鑰</strong></span>。</p></li>
 <li class="listitem">
 <p role="presentation">使用 PGP 時,可有以下選項:</p>
-<p role="presentation">若 <span class="phrase">Guard</span> 設定當中開啟了<span class="guibutton"><strong>顯示進階設定</strong></span>,您可設定 PGP 格式。</p>
+<p role="presentation">若在 <span class="phrase">Guard</span> 的<span class="guibutton"><strong>進階</strong></span>設定中開啟<span class="guibutton"><strong>撰寫郵件時顯示進階設定</strong></span>,即可設定 PGP 格式。</p>
 <p role="presentation">預設情況下,加密電子郵件將使用 <span class="guibutton"><strong>MIME</strong></span> 格式寄出。某些較舊的郵件軟體僅支援 PGP 行內加密。若收件者使用該種客戶端,請勾選<span class="guibutton"><strong>行內</strong></span>。</p>
 <p role="presentation">註:若您使用<span class="guibutton"><strong>行內</strong></span>,將無法使用 HTML 格式寄送郵件。</p>
 </li>
@@ -97,8 +97,8 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.read.html">閱讀加密郵件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.external.html">要如何讓外部收件者讀取加密郵件?</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">發送新電子郵件</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> 設定</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">傳送新郵件</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>設定</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.email.send">父主題:<a class="xref" href="ox.appsuite.user.sect.guard.email.html">加密郵件通訊</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.html b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.html
index f43a7437b..df7fad506 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="使用 Guard 加密資料">
-<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="密碼管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="移除密碼重設功能">
 <link rel="next" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="管理自己的 PGP 金鑰">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">下一頁</a></li>
@@ -43,9 +43,17 @@
 <p id="ox.appsuite.user.possibilities.guard.keys">有下列選項:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的 PGP 金鑰</a></p></li>
-<li class="listitem cap-smime" id="id-1.14.13.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">管理自己的 S/MIME 金鑰</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理公鑰</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理收件者的 PGP 金鑰</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">管理自己的 S/MIME 金鑰</a></p></li>
+<li class="listitem cap-smime" id="id-1.14.13.4.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">管理收件者的 S/MIME 金鑰</a></p></li>
 </ul>
+<p id="ox.appsuite.user.related.guard.keys"></p>
+<p class="title">相關主題:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>設定</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.keys">父主題:<a class="xref" href="ox.appsuite.user.chap.guard.html"><i>使用 <span class="phrase">Guard</span> 加密資料</i></a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.pgppublickeys.html b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
index af3d35217..5192c6b09 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
@@ -1,13 +1,13 @@
 <html lang="zh_tw">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>管理公鑰</title>
+<title>管理收件者的 PGP 金鑰</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="金鑰管理">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="管理自己的 S/MIME 金鑰">
-<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Guard 設定">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="管理自己的 PGP 金鑰">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="管理自己的 S/MIME 金鑰">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,65 +22,46 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">下一頁</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">下一頁</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">使用 <span class="phrase">Guard</span> 加密資料</h1>
 <h2 class="sr-only">金鑰管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.pgppublickeys">
-<div class="titlepage"><div><div><h3 class="title">管理公鑰</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">在 <span class="phrase"><span class="guilabel"><strong>Guard 安全性設定</strong></span></span>頁面,您可以:</p>
+<div class="titlepage"><div><div><h3 class="title">管理收件者的 PGP 金鑰</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.8.2"></a><p id="ox.appsuite.user.concept.guard.keys.pgppublickeys">有下列選項:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">顯示公鑰</p></li>
+<li class="listitem"><p role="presentation">檢視或刪除公鑰</p></li>
 <li class="listitem"><p role="presentation">上傳公鑰</p></li>
-<li class="listitem"><p role="presentation">刪除您的公鑰</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.guard.pgppublickeys">
-<p class="title">如何使用金鑰管理功能:</p>
+<p class="title">如何顯示收件者的 PGP 金鑰:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
-<p role="presentation">您也可以點擊應用程式啟動器中的<span class="guibutton"><strong>設定</strong></span>。</p>
-<p role="presentation">將開啟<span class="guilabel"><strong>設定</strong></span>視窗。</p>
+<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
+<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的<span class="guibutton"><strong>收件者的 PGP 金鑰</strong></span>。</p>
+<p role="presentation">將顯示收件者的 PGP 公鑰。</p>
 </li>
 <li class="step">
-<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p>
-<p role="presentation">將顯示 <span class="phrase"><span class="guilabel"><strong>Guard 安全性設定</strong></span></span>頁面。</p>
-</li>
-<li class="step">
-<p role="presentation">勾選<span class="guibutton"><strong>顯示進階設定</strong></span>。</p>
-<p role="presentation">將顯示金鑰管理功能。</p>
+<p role="presentation">點擊金鑰 ID 即可顯示金鑰的詳細資訊。</p>
+<p role="presentation">要刪除金鑰,點擊金鑰旁的<span class="guibutton"><strong>刪除</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.display">
-<p class="title">如何顯示公鑰:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
+<p class="title">如何上傳收件者的公鑰:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">點擊<span class="guibutton"><strong>收件者的公鑰</strong></span>。將開啟<span class="guilabel"><strong>公鑰</strong></span>視窗。</p>
-<p role="presentation">顯示您或其他使用者分享的公鑰。若某使用者的公鑰顯示於清單,您可以傳送加密郵件給該使用者,並確認由該使用這寄送給您的郵件簽章是否正確。</p>
-</li>
-<li class="step">
-<p role="presentation">要顯示金鑰詳情,點擊金鑰旁的<span class="guibutton"><strong>詳細資訊</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span>。<span class="guilabel"><strong>公鑰詳情</strong></span> 視窗將開啟。</p>
-<p role="presentation">您可以勾選<span class="guibutton"><strong>分享金鑰</strong></span>來分享公鑰。其他的使用者將可看到並下載您分享的金鑰。公鑰僅提供 Groupware 使用者使用。</p>
+<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.pgppublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
+<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的<span class="guibutton"><strong>收件者的 PGP 金鑰</strong></span>。</p>
 </li>
+<li class="step"><p role="presentation">點擊<span class="guibutton"><strong>上傳收件者的金鑰</strong></span>。選擇包含公鑰的檔案。</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.upload">
-<p class="title">如何在<span class="guilabel"><strong>公鑰</strong></span>視窗上傳收件者的公鑰:</p>
-<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">點擊<span class="guilabel"><strong>PGP 公鑰清單</strong></span>旁邊的<span class="guibutton"><strong>新增</strong></span>圖示 <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.upload.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span>。選擇包含公鑰的檔案。</p></li></ul></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.pgppublickeys.delete">
-<p class="title">如何刪除<span class="guilabel"><strong>公鑰</strong></span>視窗當中的公鑰:</p>
-<div class="procedure"><ul class="procedure"><li class="step">
-<p role="presentation">點擊公鑰旁的<span class="guibutton"><strong>刪除</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.pgppublickeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。</p>
-<p role="presentation">確認您想要刪除該公鑰。</p>
-</li></ul></div>
-</div>
 <p id="ox.appsuite.user.related.guard.keys.pgppublickeys"></p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.smimepublickeys.html b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
new file mode 100644
index 000000000..a5b36b2bd
--- /dev/null
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
@@ -0,0 +1,75 @@
+<html lang="zh_tw">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>管理收件者的 S/MIME 金鑰</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="使用者指南&gt;">
+<link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="金鑰管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="管理自己的 S/MIME 金鑰">
+<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Guard設定">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">前一頁</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.settings.html">下一頁</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">使用 <span class="phrase">Guard</span> 加密資料</h1>
+<h2 class="sr-only">金鑰管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.keys.smimepublickeys">
+<div class="titlepage"><div><div><h3 class="title">管理收件者的 S/MIME 金鑰</h3></div></div></div>
+<a class="indexterm" name="id-1.14.13.10.2"></a><p id="ox.appsuite.user.concept.guard.keys.smimepublickeys">有下列選項:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">顯示公鑰</p></li>
+<li class="listitem"><p role="presentation">上傳公鑰</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.smimepublickeys">
+<p class="title">如何顯示收件者的 S/MIME 金鑰:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
+<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的 <span class="guibutton"><strong>S/MIME 收件者</strong></span>。</p>
+</li>
+<li class="step">
+<p role="presentation">在<span class="guibutton"><strong>搜尋憑證</strong></span>當中輸入電子郵件地址。點擊<span class="guibutton"><strong>搜尋</strong></span>。</p>
+<p role="presentation">若找到憑證,將顯示憑證資料。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.guard.keys.smimepublickeys.upload">
+<p class="title">如何上傳收件者的公鑰:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.smimepublickeys.upload"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
+<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的 <span class="guibutton"><strong>S/MIME 收件者</strong></span>。</p>
+</li>
+<li class="step"><p role="presentation">點擊<span class="guibutton"><strong>上傳收件者的憑證</strong></span>。選擇包含公鑰的檔案。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.keys.smimepublickeys"></p>
+<p class="title">相關主題:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的 PGP 金鑰</a></p>
+<p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">管理自己的 S/MIME 金鑰</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a></p>
+</li></ul>
+<p id="ox.appsuite.user.parent.guard.keys.smimepublickeys">父主題:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
index 19301a62e..2b11de26d 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="金鑰管理">
 <link rel="prev" href="ox.appsuite.user.sect.guard.keys.html" title="金鑰管理">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="管理自己的 S/MIME 金鑰">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="管理收件者的 PGP 金鑰">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">下一頁</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">下一頁</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,129 +33,103 @@
 <h2 class="sr-only">金鑰管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yourpgpkeys">
 <div class="titlepage"><div><div><h3 class="title">管理自己的 PGP 金鑰</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.5.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">在 <span class="phrase"><span class="guilabel"><strong>Guard 安全性設定</strong></span></span> 頁面,您可以:</p>
+<a class="indexterm" name="id-1.14.13.7.2"></a><p id="ox.appsuite.user.concept.guard.keys.yourpgpkeys">有下列選項:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">新增 PGP 金鑰</p></li>
 <li class="listitem"><p role="presentation">顯示自己的 PGP 金鑰、顯示詳情</p></li>
-<li class="listitem">
-<p role="presentation">新增 PGP 金鑰</p>
-<p role="presentation">若您擁有多把金鑰,可以設定要使用哪把作為預設金鑰。將使用預設金鑰來加密資料。</p>
-</li>
-<li class="listitem">
-<p role="presentation">新增使用者身分</p>
-<p role="presentation">加入其他使用者身分至金鑰後,您可在多個電子郵件帳號中使用該把金鑰。</p>
-</li>
-<li class="listitem"><p role="presentation">下載金鑰</p></li>
-<li class="listitem"><p role="presentation">刪除金鑰</p></li>
+<li class="listitem"><p role="presentation">管理自己的 PGP 金鑰:設為預設金鑰、編輯 ID、廢止、下載、刪除</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys">
-<p class="title">如何使用 PGP 金鑰管理功能:</p>
+<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.add">
+<p class="title">如何新增 PGP 金鑰:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
-<p role="presentation">您也可以點擊應用程式啟動器中的<span class="guibutton"><strong>設定</strong></span>。</p>
-<p role="presentation">將開啟<span class="guilabel"><strong>設定</strong></span>視窗。</p>
+<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.addkey"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
+<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的<span class="guibutton"><strong>您的 PGP 金鑰</strong></span>。</p>
 </li>
 <li class="step">
-<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p>
-<p role="presentation">將顯示 <span class="phrase"><span class="guilabel"><strong>Guard 安全性設定</strong></span></span>頁面。</p>
+<p role="presentation">您有下列選項:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">若要建立新的金鑰對,點擊<span class="guibutton"><strong>建立新金鑰</strong></span>。<span class="phrase"><span class="guilabel"><strong>建立 Guard 安全金鑰</strong></span></span>視窗將開啟。</p>
+<p role="presentation">為新金鑰輸入密碼。確認密碼。</p>
+<p role="presentation">新金鑰包含一把主金鑰與對應的子金鑰。</p>
 </li>
-<li class="step">
-<p role="presentation">勾選<span class="guibutton"><strong>顯示進階設定</strong></span>。</p>
-<p role="presentation">將顯示金鑰管理功能。</p>
+<li class="listitem">
+<p role="presentation">若要新增已有的私鑰,點擊<span class="guibutton"><strong>上傳私鑰</strong></span>。選擇包含私鑰的檔案。<span class="guilabel"><strong>上傳私鑰</strong></span>視窗將打開。</p>
+<p role="presentation">若要上傳新的金鑰,請輸入您的 <span class="phrase">Guard</span> 安全密碼。為新的金鑰輸入新的密碼。</p>
+</li>
+<li class="listitem"><p role="presentation">若要新增已有的公鑰,點擊<span class="guibutton"><strong>上傳公鑰</strong></span>。選擇包含公鑰的檔案。</p></li>
+</ul></p>
+<p role="presentation">新金鑰將輸入至您的金鑰清單最上方。新金鑰將成為您目前使用的金鑰。</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.display">
-<p class="title">如何顯示您的 PGP 金鑰,或將 PGP 金鑰設成預設金鑰:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.display">
+<p class="title">如何檢視您現有的 PGP 金鑰:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">點擊<span class="guilabel"><strong>金鑰</strong></span>下方的<span class="guibutton"><strong>您的金鑰</strong></span>。</p>
-<p role="presentation" class="cap-smime">視設定而定,將開啟<span class="guilabel"><strong>選擇要列出的金鑰類型</strong></span>。選擇 <span class="guibutton"><strong>PGP</strong></span>。</p>
-<p role="presentation">將開啟<span class="guilabel"><strong>您的金鑰</strong></span>視窗。</p>
-<p role="presentation"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">將顯示您的 PGP 金鑰。每把 PGP 金鑰都包含一把主金鑰與對應的子金鑰。<ul class="itemizedlist" style="list-style-type: circle; ">
+<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
+<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的<span class="guibutton"><strong>您的 PGP 金鑰</strong></span>。</p>
+<p role="presentation">將顯示您的 PGP 金鑰。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">每把 PGP 金鑰都包含一把主金鑰與對應的子金鑰。<ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">除其他項目之外,主金鑰將用來簽署您的郵件。</p></li>
 <li class="listitem"><p role="presentation">子金鑰將用來加解密。</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">視需求而定,<span class="phrase">Guard</span> 會自動選擇使用主金鑰或子金鑰。</p></li>
 </ul></p>
 </li>
-<li class="step"><p role="presentation">若您的金鑰清單有超過一把金鑰,您可以指定要使用的金鑰。要這樣做,勾選主要金鑰旁邊的<span class="guibutton"><strong>目前</strong></span>選取盒。現在起,將使用目前的金鑰進行加密。</p></li>
-<li class="step"><p role="presentation">要顯示金鑰詳情,點擊金鑰旁的<span class="guibutton"><strong>詳細資訊</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span>。<span class="guilabel"><strong>金鑰詳細資訊</strong></span>視窗將開啟。要檢視金鑰的簽章,點擊<span class="guibutton"><strong>簽章</strong></span>。</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addkey">
-<p class="title">如何在<span class="guilabel"><strong>您的金鑰</strong></span>視窗新增 PGP 金鑰:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">點擊<span class="guibutton"><strong>您的金鑰清單</strong></span>旁的<span class="guibutton"><strong>新增使用者金鑰</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span>,將開啟<span class="guilabel"><strong>新增金鑰</strong></span>視窗。</p></li>
 <li class="step">
-<p role="presentation">您有下列選項:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
-<p role="presentation">若要新增私鑰,點擊<span class="guibutton"><strong>上傳私鑰</strong></span>。選擇包含私鑰的檔案。<span class="guilabel"><strong>上傳私鑰</strong></span>視窗將打開。</p>
-<p role="presentation">若要上傳新的金鑰,請輸入您的 <span class="phrase">Guard</span> 安全密碼。為新的金鑰輸入新的密碼。</p>
-</li>
-<li class="listitem"><p role="presentation">若要新增公鑰,點擊 <span class="guibutton"><strong>僅上傳公鑰</strong></span>。選擇包含公鑰的檔案。</p></li>
-<li class="listitem">
-<p role="presentation">若要建立新的金鑰對,點擊 <span class="guibutton"><strong>建立新金鑰</strong></span>。<span class="phrase"><span class="guilabel"><strong>建立 Guard 安全金鑰</strong></span></span>視窗將開啟。</p>
-<p role="presentation">為新金鑰輸入密碼。確認密碼。</p>
-<p role="presentation">新金鑰包含一把主金鑰與對應的子金鑰。</p>
-</li>
-</ul></p>
-<p role="presentation">新金鑰將輸入至您的金鑰清單最上方。新金鑰將成為您目前使用的金鑰。</p>
+<p role="presentation">要顯示金鑰詳情,點擊主鑰旁的<span class="guibutton"><strong>管理金鑰</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>。<span class="guilabel"><strong>金鑰詳細資訊</strong></span>視窗將開啟。</p>
+<p role="presentation">要檢視金鑰的簽章,點擊<span class="guibutton"><strong>簽章</strong></span>。</p>
 </li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.addaccount">
-<p class="title">如何新增其他身分至<span class="guilabel"><strong>您的金鑰</strong></span>視窗:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yourpgpkeys.manage">
+<p class="title">如何管理您現有的 PGP 金鑰:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">點擊金鑰旁的<span class="guibutton"><strong>編輯 ID</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.addaccount.edit"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>。<span class="guilabel"><strong>新增使用者身分</strong></span>視窗將開啟。</p></li>
 <li class="step">
+<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
+<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的<span class="guibutton"><strong>您的 PGP 金鑰</strong></span>。</p>
+<p role="presentation">將顯示您的 PGP 金鑰。</p>
+</li>
+<li class="step"><p role="presentation">點擊主鑰旁的<span class="guibutton"><strong>管理金鑰</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yourpgpkeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>。使用下列功能。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">若您的金鑰清單有超過一把金鑰,您可以指定要使用的金鑰。要這樣做,點擊<span class="guibutton"><strong>標示為目前金鑰</strong></span>。現在起,將使用目前的金鑰進行加密。</p></li>
+<li class="listitem">
+<p role="presentation">若要將金鑰用於其他電子郵件帳號,點擊<span class="guibutton"><strong>編輯 ID</strong></span>。將開啟<span class="guilabel"><strong>新增使用者 ID</strong></span>視窗。</p>
 <p role="presentation">輸入該身分名稱。輸入想要讓這把金鑰使用的電子郵件地址。</p>
 <p role="presentation">輸入此金鑰的密碼。</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.download">
-<p class="title">如何下載<span class="guilabel"><strong>您的金鑰</strong></span>視窗當中的金鑰:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">點擊金鑰旁的<span class="guibutton"><strong>下載</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span>。</p></li>
-<li class="step">
+<li class="listitem">
+<p role="presentation">要下載私鑰,點擊<span class="guibutton"><strong>下載</strong></span>。</p>
 <p role="presentation">指定只要下載私鑰、只下載公鑰或兩把金鑰。</p>
 <p role="presentation"><span class="phrase"><strong>注意:</strong></span>您將以加密格式下載私鑰。您仍然不該將您的私鑰下載至可公開存取的系統。</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yourpgpkeys.delete">
-<p class="title">如何刪除<span class="guilabel"><strong>您的金鑰</strong></span>視窗當中的金鑰:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>警告:</strong></span>若刪除私鑰,將無法再解開使用該金鑰加密的物件。若您不確定,則應該不要刪除,而是註銷即可。被註銷的金鑰,無法再用來加密。但還是可以解開使用該金鑰加密過的物件。</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">點擊金鑰旁的<span class="guibutton"><strong>刪除</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yourpgpkeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。<span class="guilabel"><strong>刪除私鑰</strong></span> 視窗將打開。</p></li>
-<li class="step"><p role="presentation">您有下列選項:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">若要廢止或刪除私鑰,點擊<span class="guibutton"><strong>刪除</strong></span>。將開啟<span class="guilabel"><strong>刪除私鑰</strong></span>視窗。註:<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">若您註銷金鑰,將無法再使用。但還是可以解開使用該金鑰加密過的物件。因此,註銷金鑰會比刪除更好。</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>警告:</strong></span>若刪除私鑰,將無法再解開使用該金鑰加密的物件。</p></li>
+</ul> <p role="presentation">您有下列選項:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
-<p role="presentation">若要註銷私鑰,點擊<span class="guibutton"><strong>註銷</strong></span>。</p>
-<p role="presentation">若您註銷金鑰,將無法再使用。但還是可以解開使用該金鑰加密過的物件。因此,註銷金鑰會比刪除更好。</p>
+<p role="presentation">要註銷私鑰,點擊<span class="guibutton"><strong>廢除</strong></span>。</p>
 <p role="presentation">輸入私鑰的密碼。若需要,請選擇廢除原因。</p>
 <p role="presentation">點擊<span class="guibutton"><strong>廢除</strong></span>。</p>
+<p role="presentation">您也可以點擊選單中的<span class="guibutton"><strong>廢除</strong></span>。</p>
 </li>
 <li class="listitem">
 <p role="presentation">若要刪除私鑰,點擊<span class="guibutton"><strong>刪除</strong></span>。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span>若刪除私鑰,將無法再解開使用該金鑰加密的物件。</p>
 <p role="presentation">輸入私鑰的密碼。</p>
 <p role="presentation">點擊<span class="guibutton"><strong>刪除</strong></span>按鈕。</p>
 </li>
 </ul>刪除主金鑰時,對應的子金鑰也將被刪除。</p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yourpgpkeys"></p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理公鑰</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理收件者的 PGP 金鑰</a></p>
 <p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">管理自己的 S/MIME 金鑰</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.keys.yourpgpkeys">父主題:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yourpgpkeys">父主題:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
index ffe88fe9b..2e3b52062 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="金鑰管理">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html" title="管理自己的 PGP 金鑰">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="管理公鑰">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="管理收件者的 PGP 金鑰">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="管理收件者的 S/MIME 金鑰">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">下一頁</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">下一頁</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,46 +33,27 @@
 <h2 class="sr-only">金鑰管理</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.keys.yoursmimekeys">
 <div class="titlepage"><div><div><h3 class="title">管理自己的 S/MIME 金鑰</h3></div></div></div>
-<a class="indexterm" name="id-1.14.13.6.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">在 <span class="phrase"><span class="guilabel"><strong>Guard 安全性設定</strong></span></span> 頁面,您可以:</p>
+<a class="indexterm" name="id-1.14.13.9.2"></a><p id="ox.appsuite.user.concept.guard.keys.yoursmimekeys">有下列選項:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">新增 S/MIME 金鑰</p>
 <p role="presentation">若您擁有多把金鑰,可以設定要使用哪把作為預設金鑰。將使用預設金鑰來加密資料。</p>
 </li>
 <li class="listitem"><p role="presentation">顯示自己的 S/MIME 金鑰、顯示詳情</p></li>
-<li class="listitem"><p role="presentation">下載金鑰</p></li>
-<li class="listitem"><p role="presentation">刪除金鑰</p></li>
+<li class="listitem"><p role="presentation">管理自己的 S/MIME 金鑰:設為預設金鑰、編輯 ID、廢止、下載、刪除</p></li>
 </ul>
-<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys">
-<p class="title">如何使用 S/MIME 金鑰管理功能:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.add">
+<p class="title">如何新增 S/MIME 金鑰:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
-<p role="presentation">您也可以點擊應用程式啟動器中的<span class="guibutton"><strong>設定</strong></span>。</p>
-<p role="presentation">將開啟<span class="guilabel"><strong>設定</strong></span>視窗。</p>
-</li>
-<li class="step">
-<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p>
-<p role="presentation">將顯示 <span class="phrase"><span class="guilabel"><strong>Guard 安全性設定</strong></span></span>頁面。</p>
-</li>
-<li class="step">
+<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的 <span class="guibutton"><strong>S/MIME</strong></span>。</p>
 <p role="presentation">勾選<span class="guibutton"><strong>開啟 S/MIME</strong></span>。</p>
-<p role="presentation">勾選<span class="guibutton"><strong>顯示進階設定</strong></span>。</p>
-<p role="presentation">將顯示金鑰管理功能。</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.addkey">
-<p class="title">如何新增 S/MIME 金鑰:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">點擊<span class="guibutton"><strong>金鑰</strong></span>下方的<span class="guibutton"><strong>您的金鑰</strong></span>。將開啟<span class="guilabel"><strong>選擇要列出的金鑰類型</strong></span>視窗。</p>
-<p role="presentation">選擇<span class="guibutton"><strong>S/MIME</strong></span>。將開啟<span class="guilabel"><strong>您的憑證</strong></span>視窗。</p>
 </li>
-<li class="step"><p role="presentation">點擊<span class="guilabel"><strong>您的金鑰清單</strong></span>旁邊的<span class="guibutton"><strong>新增</strong></span>圖示 <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span>。將開啟<span class="guilabel"><strong>上傳 S/MIME 金鑰</strong></span>視窗。</p></li>
 <li class="step">
+<p role="presentation">點擊<span class="guibutton"><strong>上傳私人憑證</strong></span>。將開啟<span class="guilabel"><strong>上傳 S/MIME 金鑰</strong></span>視窗。</p>
 <p role="presentation">請出入下列密碼:<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">若要上傳新的金鑰,請輸入您的 <span class="phrase">Guard</span> 安全密碼。為新的金鑰輸入新的密碼。</p></li>
+<li class="listitem"><p role="presentation">您的 <span class="phrase">Guard</span> 安全密碼來上傳新金鑰。</p></li>
 <li class="listitem">
 <p role="presentation">加密郵件的新密碼。</p>
 <p role="presentation">確認新密碼。</p>
@@ -84,58 +65,61 @@
 </ol></div>
 </div>
 <div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.display">
-<p class="title">如何顯示您的 S/MIME 金鑰,或將 S/MIME 金鑰設成預設金鑰:</p>
+<p class="title">如何檢視您自己的 S/MIME 金鑰:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">點擊<span class="guilabel"><strong>金鑰</strong></span>下方的<span class="guibutton"><strong>您的金鑰</strong></span>。將開啟<span class="guilabel"><strong>選擇要列出的金鑰類型</strong></span>視窗。</p>
-<p role="presentation">選擇<span class="guibutton"><strong>S/MIME</strong></span>。</p>
-<p role="presentation">將開啟<span class="guilabel"><strong>您的憑證</strong></span>視窗。將顯示您的 S/MIME 金鑰。</p>
+<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
+<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的 <span class="guibutton"><strong>S/MIME</strong></span>。</p>
+<p role="presentation">勾選<span class="guibutton"><strong>開啟 S/MIME</strong></span>。</p>
+</li>
+<li class="step">
+<p role="presentation">要顯示金鑰詳情,點擊金鑰旁的<span class="guibutton"><strong>管理金鑰</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.display.details"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>。<span class="guilabel"><strong>金鑰詳細資訊</strong></span>視窗將開啟。</p>
+<p role="presentation">要檢視金鑰的簽章,點擊<span class="guibutton"><strong>簽章</strong></span>。</p>
 </li>
-<li class="step"><p role="presentation">若您的金鑰清單有超過一把金鑰,您可以指定要使用的金鑰。要這樣做,勾選主要金鑰旁邊的<span class="guibutton"><strong>目前</strong></span>選取盒。現在起,將使用目前的金鑰進行加密。</p></li>
-<li class="step"><p role="presentation">要顯示金鑰詳情,點擊金鑰旁的<span class="guibutton"><strong>詳細資訊</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.detail"><object type="image/svg+xml" data="../../images/search.svg" height="15"></object></span>。<span class="guilabel"><strong>金鑰詳細資訊</strong></span>視窗將開啟。要檢視金鑰的簽章,點擊<span class="guibutton"><strong>簽章</strong></span>。</p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.download">
-<p class="title">如何下載<span class="guilabel"><strong>您的金鑰</strong></span>視窗當中的金鑰:</p>
+<div class="task" id="ox.appsuite.user.task.guard.yoursmimekeys.manage">
+<p class="title">如何管理您目前的 S/MIME 金鑰:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">點擊金鑰旁的<span class="guibutton"><strong>下載</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.download.key"><object type="image/svg+xml" data="../../images/cloud-download.svg" height="15"></object></span>。</p></li>
 <li class="step">
+<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
+<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的 <span class="guibutton"><strong>S/MIME</strong></span>。</p>
+<p role="presentation">勾選<span class="guibutton"><strong>開啟 S/MIME</strong></span>。</p>
+</li>
+<li class="step"><p role="presentation">點擊金鑰旁的<span class="guibutton"><strong>管理金鑰</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.yoursmimekeys.manage.key"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>。使用下列功能。<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">若您的金鑰清單有超過一把金鑰,您可以指定要使用的金鑰。要這樣做,點擊<span class="guibutton"><strong>標示為目前金鑰</strong></span>。現在起,將使用目前的金鑰進行加密。</p></li>
+<li class="listitem">
+<p role="presentation">要下載私鑰,點擊<span class="guibutton"><strong>下載</strong></span>。</p>
 <p role="presentation">指定只要下載私鑰、只下載公鑰或兩把金鑰。</p>
 <p role="presentation"><span class="phrase"><strong>注意:</strong></span>您將以加密格式下載私鑰。您仍然不該將您的私鑰下載至可公開存取的系統。</p>
 </li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.keys.yoursmimekeys.delete">
-<p class="title">如何刪除<span class="guilabel"><strong>您的金鑰</strong></span>視窗當中的金鑰:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>警告:</strong></span>若刪除私鑰,將無法再解開使用該金鑰加密的物件。若您不確定,則應該不要刪除,而是註銷即可。被註銷的金鑰,無法再用來加密。但還是可以解開使用該金鑰加密過的物件。</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">點擊金鑰旁的<span class="guibutton"><strong>刪除</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.delete.trash"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>。<span class="guilabel"><strong>刪除私鑰</strong></span> 視窗將打開。</p></li>
-<li class="step"><p role="presentation">您有下列選項:<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">若要廢止或刪除私鑰,點擊<span class="guibutton"><strong>刪除</strong></span>。將開啟<span class="guilabel"><strong>刪除私鑰</strong></span>視窗。註:<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">若您註銷金鑰,將無法再使用。但還是可以解開使用該金鑰加密過的物件。因此,註銷金鑰會比刪除更好。</p></li>
+<li class="listitem"><p role="presentation"><span class="phrase"><strong>警告:</strong></span>若刪除私鑰,將無法再解開使用該金鑰加密的物件。</p></li>
+</ul> <p role="presentation">您有下列選項:</p><ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
-<p role="presentation">若要註銷私鑰,點擊<span class="guibutton"><strong>註銷</strong></span>。</p>
-<p role="presentation">若您註銷金鑰,將無法再使用。但還是可以解開使用該金鑰加密過的物件。因此,註銷金鑰會比刪除更好。</p>
+<p role="presentation">要註銷私鑰,點擊<span class="guibutton"><strong>廢除</strong></span>。</p>
 <p role="presentation">輸入私鑰的密碼。若需要,請選擇廢除原因。</p>
 <p role="presentation">點擊<span class="guibutton"><strong>廢除</strong></span>。</p>
+<p role="presentation">您也可以點擊選單中的<span class="guibutton"><strong>廢除</strong></span>。</p>
 </li>
 <li class="listitem">
 <p role="presentation">若要刪除私鑰,點擊<span class="guibutton"><strong>刪除</strong></span>。</p>
-<p role="presentation"><span class="phrase"><strong>警告:</strong></span>若刪除私鑰,將無法再解開使用該金鑰加密的物件。</p>
 <p role="presentation">輸入私鑰的密碼。</p>
 <p role="presentation">點擊<span class="guibutton"><strong>刪除</strong></span>按鈕。</p>
 </li>
 </ul></p></li>
+</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.guard.keys.yoursmimekeys"></p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的 PGP 金鑰</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理公鑰</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理收件者的 PGP 金鑰</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.keys.yoursmimekeys">父主題:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.yoursmimekeys">父主題:<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.change.html b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.change.html
new file mode 100644
index 000000000..c897542d4
--- /dev/null
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.change.html
@@ -0,0 +1,65 @@
+<html lang="zh_tw">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>更改密碼</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="使用者指南&gt;">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="密碼管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.html" title="密碼管理">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.reset.html" title="重設密碼">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.html">前一頁</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.reset.html">下一頁</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">使用 <span class="phrase">Guard</span> 加密資料</h1>
+<h2 class="sr-only">密碼管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.change">
+<div class="titlepage"><div><div><h3 class="title">更改密碼</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.6.2"></a><a class="indexterm" name="id-1.14.12.6.3"></a><p role="presentation" class="cap-smime">視設定而定,您也可以使用 S/MIME 進行加密,不使用 PGP。PGP 與 S/MIME 使用不同密碼。</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.change">
+<p class="title">如何更改 <span class="phrase">Guard</span> 密碼:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.change"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
+<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的<span class="guibutton"><strong>密碼管理(PGP)</strong></span><span class="cap-smime">或<span class="guibutton"><strong>密碼管理(S/MIME)</strong></span></span>。</p>
+</li>
+<li class="step">
+<p role="presentation">在<span class="guibutton"><strong>舊密碼</strong></span>欄位中輸入原本用來加密資料的密碼。</p>
+<p role="presentation">在<span class="guibutton"><strong>新密碼</strong></span>欄位中輸入現在起想要用來加密資料的新密碼。</p>
+<p role="presentation">在<span class="guibutton"><strong>確認新密碼</strong></span>欄位再次輸入新密碼。</p>
+</li>
+<li class="step"><p role="presentation">點擊 <span class="guibutton"><strong>更改密碼</strong></span>。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.change"></p>
+<p class="title">相關主題:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">重設密碼</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">移除密碼重設功能</a></p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.password.change">父主題:<a class="xref" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.deleterecovery.html b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.deleterecovery.html
new file mode 100644
index 000000000..90beed2df
--- /dev/null
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.deleterecovery.html
@@ -0,0 +1,64 @@
+<html lang="zh_tw">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>移除密碼重設功能</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="使用者指南&gt;">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="密碼管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.reset.html" title="重設密碼">
+<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="金鑰管理">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.reset.html">前一頁</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">下一頁</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">使用 <span class="phrase">Guard</span> 加密資料</h1>
+<h2 class="sr-only">密碼管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.deleterecovery">
+<div class="titlepage"><div><div><h3 class="title">移除密碼重設功能</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.8.2"></a><p id="ox.appsuite.user.concept.guard.password.deleterecovery">若要在必需時重設密碼,需在伺服器上儲存您加密過的密碼。若您不想在伺服器上儲存密碼,可以刪除密碼重設資訊。</p>
+<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
+<p class="title">如何移除重設密碼的功能:</p>
+<div class="taskprerequisites">
+          <p><span class="phrase"><strong>警告:</strong></span>若您移除重設密碼功能,將無法再重設密碼。若您之後忘記密碼,將無法再解開加密的資料。</p>
+        </div>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.remove"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
+<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的<span class="guibutton"><strong>進階</strong></span>。</p>
+</li>
+<li class="step"><p role="presentation">點擊<span class="guibutton"><strong>重設選項</strong></span>下方的<span class="guibutton"><strong>刪除密碼恢復資訊</strong></span>。將開啟<span class="guilabel"><strong>刪除密碼救援</strong></span>視窗。</p></li>
+<li class="step"><p role="presentation">點擊<span class="guibutton"><strong>刪除</strong></span>按鈕。</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.deleterecovery"></p>
+<p class="title">相關主題:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">更改密碼</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">重設密碼</a></p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.password.deleterecovery">父主題:<a class="xref" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.html b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.html
index 27c4ab2a2..3e0b98dd1 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="使用 Guard 加密資料">
 <link rel="prev" href="ox.appsuite.user.sect.guard.logout.html" title="從 Guard 登出">
-<link rel="next" href="ox.appsuite.user.sect.guard.keys.html" title="金鑰管理">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.change.html" title="更改密碼">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,102 +25,26 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.logout.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.keys.html">下一頁</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.change.html">下一頁</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">使用 <span class="phrase">Guard</span> 加密資料</h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.password">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">密碼管理</h2></div></div></div>
-<a class="indexterm" name="id-1.14.12.2"></a><a class="indexterm" name="id-1.14.12.3"></a><a class="indexterm" name="id-1.14.12.4"></a><a class="indexterm" name="id-1.14.12.5"></a><a class="indexterm" name="id-1.14.12.6"></a><p id="ox.appsuite.user.concept.guard.password">有下列選項:</p>
+<a class="indexterm" name="id-1.14.12.2"></a><p id="ox.appsuite.user.concept.guard.password">有下列選項:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">更改 <span class="phrase">Guard</span> 安全密碼。</p></li>
-<li class="listitem"><p role="presentation">若您忘記您的 <span class="phrase">Guard</span> 安全密碼,您可以請求寄送暫用的 <span class="phrase">Guard</span> 安全密碼來重設您的 <span class="phrase">Guard</span> 安全密碼。</p></li>
-<li class="listitem"><p role="presentation">輸入要重設密碼的電子郵件地址。</p></li>
-<li class="listitem"><p role="presentation">若要在必需時重設密碼,需在伺服器上儲存您加密過的密碼。若您不想在伺服器上儲存密碼,可以刪除密碼重設資訊。</p></li>
-<li class="listitem cap-smime" id="id-1.14.12.7.1.5"><p role="presentation">視設定而定,您也可以使用 S/MIME 進行加密,不使用 PGP。這種情況下,PGP 與 S/MIME 將使用不同密碼。</p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">更改密碼</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.reset.html">重設密碼</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">移除密碼重設功能</a></p></li>
 </ul>
 <p>註:視檔案格式而定,某些功能可能無法使用。</p>
-<div class="task help-hide-inline" id="ox.appsuite.user.task.guard.password">
-<p class="title">如何開啟密碼管理功能:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
-<p role="presentation">您也可以點擊應用程式啟動器中的<span class="guibutton"><strong>設定</strong></span>。</p>
-<p role="presentation">將開啟<span class="guilabel"><strong>設定</strong></span>視窗。</p>
-</li>
-<li class="step">
-<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p>
-<p role="presentation">將顯示 <span class="phrase"><span class="guilabel"><strong>Guard 安全性設定</strong></span></span>頁面。</p>
-<p role="presentation">將顯示密碼管理功能。</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.change">
-<p class="title">如何更改 <span class="phrase">Guard</span> 密碼:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">點擊 <span class="guibutton"><strong>更改密碼</strong></span>。</p>
-<p role="presentation" class="cap-smime">視設定而定,將開啟<span class="guilabel"><strong>選擇要列出的金鑰類型</strong></span>。是要重設密碼的加密方式而定,選擇 <span class="guibutton"><strong>PGP</strong></span> 或 <span class="guibutton"><strong>S/MIME</strong></span>。將開啟<span class="guilabel"><strong>重設密碼</strong></span>視窗。</p>
-</li>
-<li class="step">
-<p role="presentation">在<span class="phrase"><span class="guibutton"><strong>輸入目前 Guard 安全密碼</strong></span></span>欄位輸入目前用來加密資料的密碼。</p>
-<p role="presentation">在<span class="phrase"><span class="guibutton"><strong>輸入新 Guard 安全密碼</strong></span></span>欄位,輸入未來要用來加密的密碼。</p>
-<p role="presentation">在<span class="phrase"><span class="guibutton"><strong>確認新 Guard 安全密碼</strong></span></span>欄位再輸入一次新密碼。</p>
-</li>
-<li class="step"><p role="presentation">點擊 <span class="guibutton"><strong>更改密碼</strong></span>。</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.reset">
-<p class="title">如何重設 <span class="phrase">Guard</span> 密碼:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">點擊<span class="guibutton"><strong>重設密碼</strong></span>。</p>
-<p role="presentation" class="cap-smime">視設定而定,將開啟<span class="guilabel"><strong>選擇要列出的金鑰類型</strong></span>。是要重設密碼的加密方式而定,選擇 <span class="guibutton"><strong>PGP</strong></span> 或 <span class="guibutton"><strong>S/MIME</strong></span>。將開啟<span class="guilabel"><strong>重設密碼</strong></span>視窗。</p>
-<p role="presentation">點擊 <span class="guibutton"><strong>重設</strong></span>。</p>
-</li>
-<li class="step">
-<p role="presentation">新密碼將傳送到您的次要電子郵件信箱。</p>
-<p role="presentation">若未輸入次要電子郵件信箱,新密碼將寄到您的預設電子郵件信箱。</p>
-<p role="presentation">現在起,這組新密碼就是您的 <span class="phrase">Guard</span> 安全密碼。您應該立即 <a class="link" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.task.guard.settings">變更</a> 此密碼。</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.secondarymail">
-<p class="title">如何變更用來重設密碼的次要電子郵件信箱:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">點擊<span class="guibutton"><strong>用來重設密碼的信箱</strong></span>。</p>
-<p role="presentation" class="cap-smime">視設定而定,將開啟<span class="guilabel"><strong>選擇要列出的金鑰類型</strong></span>。是要重設密碼的加密方式而定,選擇 <span class="guibutton"><strong>PGP</strong></span> 或 <span class="guibutton"><strong>S/MIME</strong></span>。將開啟<span class="guilabel"><strong>次要電子郵件地址</strong></span>視窗。</p>
-</li>
-<li class="step">
-<p role="presentation">在<span class="phrase"><span class="guibutton"><strong>輸入目前 Guard 安全密碼</strong></span></span>欄位輸入目前用來加密資料的密碼。</p>
-<p role="presentation">在<span class="guibutton"><strong>輸入新次要郵件</strong></span>欄位,輸入要用來接收 <span class="phrase">Guard</span> 暫用安全密碼的信箱。</p>
-<p role="presentation">在<span class="guibutton"><strong>重新輸入電子郵件地址</strong></span>當中重新輸入電子郵件地址。</p>
-<p role="presentation">點擊 <span class="guibutton"><strong>變更電子郵件地址</strong></span>。</p>
-</li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.guard.password.deleterecovery">
-<p class="title">如何移除重設密碼的功能:</p>
-<div class="taskprerequisites">
-        <p><span class="phrase"><strong>警告:</strong></span>若您移除重設密碼功能,將無法再重設密碼。若您之後忘記密碼,將無法再解開加密的資料。</p>
-      </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">勾選<span class="guibutton"><strong>顯示進階設定</strong></span>。</p>
-<p role="presentation">點擊<span class="guibutton"><strong>刪除密碼救援資訊</strong></span>。<span class="guilabel"><strong>刪除密碼救援</strong></span>視窗將開啟。</p>
-</li>
-<li class="step"><p role="presentation">點擊<span class="guibutton"><strong>刪除</strong></span>按鈕。</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.guard.password"></p>
 <p class="title">相關主題:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的 PGP 金鑰</a></p>
-<p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">管理自己的 S/MIME 金鑰</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理公鑰</a></p>
-</li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>設定</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.guard.password">父主題:<a class="xref" href="ox.appsuite.user.chap.guard.html"><i>使用 <span class="phrase">Guard</span> 加密資料</i></a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.reset.html b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.reset.html
new file mode 100644
index 000000000..8fc449437
--- /dev/null
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.password.reset.html
@@ -0,0 +1,81 @@
+<html lang="zh_tw">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>重設密碼</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="使用者指南&gt;">
+<link rel="up" href="ox.appsuite.user.sect.guard.password.html" title="密碼管理">
+<link rel="prev" href="ox.appsuite.user.sect.guard.password.change.html" title="更改密碼">
+<link rel="next" href="ox.appsuite.user.sect.guard.password.deleterecovery.html" title="移除密碼重設功能">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.password.change.html">前一頁</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">下一頁</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">使用 <span class="phrase">Guard</span> 加密資料</h1>
+<h2 class="sr-only">密碼管理</h2>
+<div class="sect2" id="ox.appsuite.user.sect.guard.password.reset">
+<div class="titlepage"><div><div><h3 class="title">重設密碼</h3></div></div></div>
+<a class="indexterm" name="id-1.14.12.7.2"></a><a class="indexterm" name="id-1.14.12.7.3"></a><p id="ox.appsuite.user.concept.guard.password.reset">有下列選項:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">若您忘記您的 <span class="phrase">Guard</span> 密碼,您可以請求寄送暫用的 <span class="phrase">Guard</span> 密碼來重設您的 <span class="phrase">Guard</span> 密碼。</p></li>
+<li class="listitem"><p role="presentation">您可以設定重設密碼的電子郵件地址。</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.guard.password.reset">
+<p class="title">如何重設 <span class="phrase">Guard</span> 密碼:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">點擊選單列中的<span class="guibutton"><strong>選項</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.password.reset"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>。點擊<span class="guibutton"><strong>所有設定</strong></span>。</p>
+<p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。點擊右方窗格的<span class="guibutton"><strong>密碼管理(PGP)</strong></span><span class="cap-smime">或<span class="guibutton"><strong>密碼管理(S/MIME)</strong></span></span>。</p>
+</li>
+<li class="step">
+<p role="presentation">若要設定接收暫用密碼的次要信箱,請點擊<span class="guibutton"><strong>設定重設用的電子郵件地址</strong></span>。<span class="guilabel"><strong>次要電子郵件地址</strong></span>視窗將開啟。</p>
+<p role="presentation">輸入您目前的密碼。輸入要用來重設密碼的電子郵件地址。</p>
+</li>
+<li class="step">
+<p role="presentation">點擊<span class="guibutton"><strong>重設密碼</strong></span>。將會開啟<span class="guilabel"><strong>重設密碼</strong></span>視窗。</p>
+<p role="presentation">點擊 <span class="guibutton"><strong>重設</strong></span>。</p>
+</li>
+</ol></div>
+<div class="taskrelated">
+          <p>結果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">新密碼將傳送到您的次要電子郵件信箱。</p>
+<p role="presentation">若未輸入次要電子郵件信箱,新密碼將寄到您的預設電子郵件信箱。</p>
+</li>
+<li class="listitem"><p role="presentation">現在起,這組新密碼就是您的 <span class="phrase">Guard</span> 安全密碼。您應該立即變更此密碼。</p></li>
+</ul>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.guard.password.reset"></p>
+<p class="title">相關主題:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.change.html">更改密碼</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">移除密碼重設功能</a></p>
+</li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.guard.password.reset">父主題:<a class="xref" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.settings.html b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.settings.html
index 59d10e0b4..60190b174 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.guard.settings.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.guard.settings.html
@@ -1,12 +1,12 @@
 <html lang="zh_tw">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Guard 設定</title>
+<title>Guard設定</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.chap.guard.html" title="使用 Guard 加密資料">
-<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="管理公鑰">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html" title="管理收件者的 S/MIME 金鑰">
 <link rel="next" href="ox.appsuite.user.index.html" title="索引">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.index.html">下一頁</a></li>
@@ -32,7 +32,7 @@
   <h1 class="sr-only">使用 <span class="phrase">Guard</span> 加密資料</h1>
 <div class="sect1" id="ox.appsuite.user.sect.guard.settings">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<span class="phrase">Guard</span> 設定</h2></div></div></div>
+<span class="phrase">Guard</span>設定</h2></div></div></div>
 <a class="indexterm" name="id-1.14.14.2"></a><a class="indexterm" name="id-1.14.14.3"></a><a class="indexterm" name="id-1.14.14.4"></a><div class="task help-hide-inline" id="ox.appsuite.user.task.guard.settings">
 <p class="title">如何開啟 <span class="phrase">Guard</span> 設定:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -43,67 +43,119 @@
 </li>
 <li class="step"><p role="presentation">點擊左方窗格中的 <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span>。</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>將顯示 <span class="phrase"><span class="guilabel"><strong>Guard 安全性設定</strong></span></span>頁面。</p>
-      </div>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings">有以下選項:</p>
+<p id="ox.appsuite.user.reference.guard.settings">視設定而定,有下列選項可用:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.default"><span class="phrase">Guard</span> 預設設定</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.pgppasswords">密碼管理(PGP)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.smimepasswords">密碼管理(S/MIME)</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yourpgpkeys">您的 PGP 金鑰</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientpgpkeys">收件者的 PGP 金鑰</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.yoursmime">S/MIME</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.recipientsmime">S/MIME 收件者</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.advanced">進階</a></p></li>
+</ul>
+<p>也請參考:<a class="xref" href="ox.appsuite.user.sect.settings.search.html">搜尋設定</a></p>
 <p id="ox.appsuite.user.reference.guard.settings.default"></p>
-<h3 class="title">預設設定選項</h3>
+<h3 class="title">
+<span class="phrase">Guard</span> 預設設定</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.encrypt"><b>撰寫郵件時預設在寄出郵件時加密. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a>設定是否預設寄出加密郵件。</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.sign"><b>預設在外寄郵件中加入簽章. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>設定是否預設寄出加密郵件。</p></li>
-<li class="listitem cap-smime" id="id-1.14.14.7.2.1.3">
-<p id="ox.appsuite.user.task.guard.settings.default.smime"><b>預設使用 S/MIME 來簽署與加密. </b><a class="indexterm" name="id-1.14.14.7.2.1.3.1.2"></a></p>
-<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p role="presentation">指定是否預設使用 S/MIME 來簽署與加密。</p></li></ul>
-</li>
 <li class="listitem">
-<p id="ox.appsuite.user.task.guard.settings.default.inline"><b>為新郵件預設使用行內 PGP. </b><a class="indexterm" name="id-1.14.14.7.2.1.4.1.2"></a>註:此選項僅在開啟<span class="guibutton"><strong>顯示進階設定</strong></span>選取盒時,才可使用。</p>
+<p id="ox.appsuite.user.reference.guard.settings.default.create"><b>撰寫選項. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">指定是否預設使用行內 PGP 進行加密。</p></li>
-<li class="listitem"><p role="presentation">僅只在收件者的郵件軟體不支援 PGP 時使用該設定。若使用行內 PGP,收件者還是能解密訊息。</p></li>
-<li class="listitem"><p role="presentation">若您使用此選項,將無法以 HTML 格式寄出郵件。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.encrypt"><b>撰寫郵件時預設在寄出郵件時加密. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.1.1.2"></a>設定是否預設寄出加密郵件。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.create.sign"><b>預設在外寄郵件中加入簽章. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.2.1.2"></a>設定是否預設寄出加密郵件。</p></li>
+<li class="listitem cap-smime" id="id-1.14.14.7.2.1.1.1.3.1.3">
+<p id="ox.appsuite.user.task.guard.settings.default.create.smime"><b>預設使用 S/MIME 來簽署與加密. </b><a class="indexterm" name="id-1.14.14.7.2.1.1.1.3.1.3.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: square; "><li class="listitem"><p role="presentation">指定是否預設使用 S/MIME 來簽署與加密。</p></li></ul>
+</li>
 </ul>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>記住密碼預設值. </b><a class="indexterm" name="id-1.14.14.7.2.1.5.1.2"></a>設定 <span class="phrase">Guard</span> 要記住密碼的時間範圍預設值。當 <span class="phrase">Guard</span> 向您詢問密碼時,可以變更此預設設定。</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.defaultremember"><b>記住密碼預設值. </b><a class="indexterm" name="id-1.14.14.7.2.1.2.1.2"></a>設定 <span class="phrase">Guard</span> 要記住密碼的時間範圍預設值。當 <span class="phrase">Guard</span> 向您詢問密碼時,可以變更此預設設定。</p></li>
 </ul>
-<p id="ox.appsuite.user.reference.guard.settings.password"></p>
-<h3 class="title">密碼管理</h3>
+<p id="ox.appsuite.user.reference.guard.settings.pgppasswords"></p>
+<h3 class="title">密碼管理(PGP)</h3>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation">包含變更或重設密碼的功能。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">包含變更或重設 PGP 密碼的功能。</p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation">參見<a class="xref" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a></p></li>
 </ul>
-<div id="ox.appsuite.user.reference.guard.settings.smime" class="cap-smime">
-<p id="ox.appsuite.user.reference.guard.settings.smime"></p>
+<div id="ox.appsuite.user.reference.guard.settings.smimepasswords" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.smimepasswords"></p>
+<h3 class="title">密碼管理(S/MIME)</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">包含變更或重設 S/MIME 密碼的功能。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">參見<a class="xref" href="ox.appsuite.user.sect.guard.password.html">密碼管理</a></p></li>
+</ul>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.yourpgpkeys"></p>
+<h3 class="title">您的 PGP 金鑰</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">包含管理您的 PGP 金鑰的相關功能。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">參見<a class="xref" href="ox.appsuite.user.sect.guard.keys.yourpgpkeys.html">管理自己的 PGP 金鑰</a></p></li>
+</ul>
+<p id="ox.appsuite.user.reference.guard.settings.recipientpgpkeys"></p>
+<h3 class="title">收件者的 PGP 金鑰</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">包含管理收件者的 PGP 金鑰的相關功能。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">參見<a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">管理收件者的 PGP 金鑰</a></p></li>
+</ul>
+<div id="ox.appsuite.user.reference.guard.settings.yoursmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.yoursmime"></p>
 <h3 class="title">S/MIME</h3>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.smime.enable"><b>開啟 S/MIME. </b><a class="indexterm" name="id-1.14.14.9.2.1.1.1.2"></a>設定您是否可以使用 S/MIME 加密來收發電子郵件。</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">包含管理 S/MIME 加密的相關功能。</p>
+<p role="presentation">參見<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p>
+</li></ul>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings.extended"></p>
+<div id="ox.appsuite.user.reference.guard.settings.recipientsmime" class="cap-smime">
+<p id="ox.appsuite.user.reference.guard.settings.recipientsmime"></p>
+<h3 class="title">S/MIME 收件者</h3>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation">包含顯示與新增 S/MIME 收件者憑證的相關功能。</p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation">參見<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p></li>
+</ul>
+</div>
+<p id="ox.appsuite.user.reference.guard.settings.advanced"></p>
 <h3 class="title">進階</h3>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<p id="ox.appsuite.user.reference.guard.settings.extended.advanced"><b>進階設定. </b><a class="indexterm" name="id-1.14.14.10.2.1.1.1.2"></a>若勾選了<span class="guibutton"><strong>顯示進階設定</strong></span>,將可以調整下列設定與功能。</p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
+<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>電子郵件快取</strong></span></p>
-<p role="presentation">設定當顯示其他郵件或切換到其他 Groupware 應用程式時,加密的郵件是否以可讀格式保留於瀏覽器快取中。</p>
-<p role="presentation">要從瀏覽器快取移除解密的郵件,勾選<span class="guibutton"><strong>不要保留解密郵件。</strong></span>。</p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.email"><b>顯示撰寫郵件時的進階選項. </b></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<a class="indexterm" name="id-1.14.14.14.2.1.1.1.2.1.1.1"></a><p role="presentation">開啟此選項後,可以在傳送加密郵件時使用更多選項。</p>
+<p role="presentation">參見<a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">傳送加密郵件</a></p>
+</li></ul>
 </li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>金鑰</strong></span>段落</p>
-<p role="presentation">管理自己的金鑰、公鑰或 Autocrypt 金鑰。</p>
-<p role="presentation">參見<a class="xref" href="ox.appsuite.user.sect.guard.keys.html">金鑰管理</a></p>
+<p id="ox.appsuite.user.reference.guard.settings.advanced.inline"><b>為新郵件預設使用行內 PGP. </b><a class="indexterm" name="id-1.14.14.14.2.1.2.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">指定是否預設使用行內 PGP 進行加密。</p></li>
+<li class="listitem"><p role="presentation">僅只在收件者的郵件軟體不支援 PGP 時使用該設定。若使用行內 PGP,收件者還是能解密訊息。</p></li>
+<li class="listitem"><p role="presentation">若您使用此選項,將無法以 HTML 格式寄出郵件。</p></li>
+</ul>
 </li>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>Autocrypt</strong></span> 段落</p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.autocrypt"><b>Autocrypt 選項. </b><a class="indexterm" name="id-1.14.14.14.2.1.3.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
 <p role="presentation">設定對來信使用 Autocrypt。讓您可以轉移 Autocrypt 金鑰到其他客戶端。</p>
 <p role="presentation">參見<a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.html">使用 Autocrypt 加密郵件通訊</a></p>
+</li></ul>
 </li>
 <li class="listitem">
-<p role="presentation">傳送加密郵件時,有更多選項。</p>
-<p role="presentation">參見<a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">傳送加密郵件</a></p>
+<p id="ox.appsuite.user.task.guard.settings.advanced.cache"><b>電子郵件快取. </b><a class="indexterm" name="id-1.14.14.14.2.1.4.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation">設定當顯示其他郵件或切換到其他 Groupware 應用程式時,加密的郵件是否以可讀格式保留於瀏覽器快取中。</p>
+<p role="presentation">要從瀏覽器快取移除解密的郵件,勾選<span class="guibutton"><strong>不要保留解密郵件。</strong></span>。</p>
+</li></ul>
 </li>
-</ul>
+<li class="listitem">
+<p id="ox.appsuite.user.task.guard.settings.advanced.reset"><b>重設選項. </b><a class="indexterm" name="id-1.14.14.14.2.1.5.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+<p role="presentation"><span class="guibutton"><strong>刪除密碼恢復資訊</strong></span>。刪除遺失密碼時,可用來恢復的相關功能</p>
+<p role="presentation"><span class="phrase"><strong>警告:</strong></span>若您移除重設密碼功能,將無法再重設密碼。若您之後忘記密碼,將無法再解開加密的資料。</p>
+<p role="presentation">參見<a class="xref" href="ox.appsuite.user.sect.guard.password.deleterecovery.html">移除密碼重設功能</a></p>
 </li></ul>
+</li>
+</ul>
 <p id="ox.appsuite.user.parent.guard.settings">父主題:<a class="xref" href="ox.appsuite.user.chap.guard.html"><i>使用 <span class="phrase">Guard</span> 加密資料</i></a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.settings.notificationarea.html b/help/l10n/zh_TW/ox.appsuite.user.sect.settings.notificationarea.html
index 5a5bfddff..2b287fb59 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.settings.notificationarea.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.settings.notificationarea.html
@@ -64,7 +64,7 @@
 <p role="presentation" class="feat-io-ox-core-managedResources">收到受管理的資源的借用邀請時,可使用下列功能:<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">要在資源行事曆檢視借用請求,點擊該日期。</p></li>
 <li class="listitem"><p role="presentation">要接受或拒絕借用邀請,點擊各自的按鈕。</p></li>
-</ul></p>
+</ul> </p>
 <p role="presentation">若有到期任務,可以使用下列功能:<ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">點擊提醒,即可用新視窗顯示詳細資訊。</p></li>
 <li class="listitem"><p role="presentation">可使用彈出視窗中的功能來編輯任務。</p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.settings.search.html b/help/l10n/zh_TW/ox.appsuite.user.sect.settings.search.html
index 9cb9c31e5..9790edd16 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.settings.search.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.settings.search.html
@@ -65,6 +65,7 @@
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">日曆設置</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">通訊錄設定</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">雲端空間</span>設定</a></p>
+<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>設定</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.settings.search">父主題:<a class="xref" href="ox.appsuite.user.chap.settings.html"><i>自訂選項</i></a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.add.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.add.html
index e6f8176f4..bf2590d8a 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.add.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.add.html
@@ -43,7 +43,7 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">匯入任務</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">創建約會</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">建立約會</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.add">父主題:<a class="xref" href="ox.appsuite.user.chap.tasks.html"><i><span class="phrase">任務</span></i></a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.detailview.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.detailview.html
index d160567d7..ec4634c1d 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.detailview.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.detailview.html
@@ -79,14 +79,11 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任務</span>清單畫面</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.create.html">編輯視窗</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">查看任務</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">檢視或保存任務附件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">撥打電話給任務參與者。</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任務</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">如何在詳細畫面中顯示聯絡人</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.gui.detailview">父主題:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">任務</span>元件</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.foldertree.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.foldertree.html
index 528c361c0..fd4457cda 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.foldertree.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.foldertree.html
@@ -54,6 +54,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">查看任務</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">新增任務清單</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任務</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">使用資料夾管理資料</a></p>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.list.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.list.html
index b0a8cc6ce..e9839fcad 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.list.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.list.html
@@ -51,17 +51,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.list.html">清單畫面</a></p></li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.settingsmenu.html"><span class="phrase">任務</span>設定選單</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.detailview.html"><span class="phrase">任務</span>詳細畫面</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">查看任務</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.attachments.html">檢視或保存任務附件</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任務</a></p>
-</li>
-</ul>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.list">父主題:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">任務</span>元件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.settingsmenu.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
index a28d71ec8..dc0009f57 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
@@ -48,10 +48,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.menubar.html">選單列</a></p></li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任務</span>清單畫面</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">訂閱公開與共享任務清單</a></p></li>
-</ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">訂閱公開與共享任務清單</a></p></li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.settingsmenu">父主題:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">任務</span>元件</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.toolbar.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.toolbar.html
index 63037a34a..788b3538a 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.toolbar.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.gui.toolbar.html
@@ -52,13 +52,7 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">編輯任務</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">修改任務的到期日</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">將任務標記為已完成</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">將任務移至另一文件夾</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">修改任務確認</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">匯出任務</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.print.html">列印任務</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.delete.html">刪除任務</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任務</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.toolbar">父主題:<a class="xref" href="ox.appsuite.user.sect.tasks.gui.html"><span class="phrase">任務</span>元件</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.categories.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.categories.html
new file mode 100644
index 000000000..872e4f3ba
--- /dev/null
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.categories.html
@@ -0,0 +1,85 @@
+<html lang="zh_tw">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>使用任務分類</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="使用者指南&gt;">
+<link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="管理任務">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="修改任務的到期日">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="將任務移至另一文件夾">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">前一頁</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">下一頁</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">任務</span></h1>
+<h2 class="sr-only">管理任務</h2>
+<div class="sect2" id="ox.appsuite.user.sect.tasks.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">使用任務分類</h3></div></div></div>
+<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.categories">您可以透過分類,而不使用資料夾來管理任務。</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">您可以使用分類標記任務。</p></li>
+<li class="listitem"><p role="presentation">您可以顯示標記了特定分類的所有任務。</p></li>
+</ul>
+<p>您可以建立、編輯、刪除自己的分類,請參考 <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a>。</p>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories">
+<p class="title">如何用分類標記任務:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">選擇任務。點擊工具列中的<span class="guibutton"><strong>編輯聯絡人</strong></span>圖示。<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.mark.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>。</p>
+<p role="presentation">將開啟任務編輯視窗。</p>
+</li>
+<li class="step">
+<p role="presentation">要這樣做,點擊<span class="guibutton"><strong>分類</strong></span>旁的<span class="guibutton"><strong>新增分類</strong></span>。選擇分類。</p>
+<p role="presentation">要移除任務的分類,點擊分類旁的<span class="guibutton"><strong>移除分類</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories.view">
+<p class="title">如何顯示標記了特定分類的任務:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">選擇標記了特定分類的任務。</p></li>
+<li class="step"><p role="presentation">點擊詳細畫面中的分類。</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>結果:</p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">清單畫面會顯示所有標記了此分類的任務。</p></li>
+<li class="listitem"><p role="presentation">要顯示先前的清單,請點擊搜尋欄位中的<span class="guibutton"><strong>取消搜尋</strong></span>圖示<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>。</p></li>
+</ul>
+          <p>秘訣:您也可以使用搜尋功能,來搜尋分類。</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.tasks.manage.categories"></p>
+<p class="title">相關主題:</p>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">搜尋任務</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">為新郵件預設使用行內 PGP</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">使用約會分類</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">使用聯絡人分類</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.tasks.manage.categories">父主題:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任務</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.changeduedate.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.changeduedate.html
index 8896e9908..eb669e6e3 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.changeduedate.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.changeduedate.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="管理任務">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="將任務標記為已完成">
-<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="將任務移至另一文件夾">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="使用任務分類">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">下一頁</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">下一頁</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -43,7 +43,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changeduedate"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任務</span>清單畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.changestatus.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.changestatus.html
index 2f2fcc728..5231c0d28 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.changestatus.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.changestatus.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理任務</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.changestatus">
 <div class="titlepage"><div><div><h3 class="title">修改任務確認</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.10.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">若您是任務參與者,可以稍後再更改此任務的確認狀態。您可新增其他夥伴可見的留言。</p>
+<a class="indexterm" name="id-1.10.15.11.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">若您是任務參與者,可以稍後再更改此任務的確認狀態。您可新增其他夥伴可見的留言。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.changestatus">
 <p class="title">如何更改確認:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,7 +44,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.changestatus"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任務</span>清單畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.delete.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.delete.html
index 3a59b2784..d0a206d46 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.delete.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理任務</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">刪除任務</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>警告:</strong></span><span class="phrase"><strong>無法</strong></span>恢復刪除的任務。</p>
+<a class="indexterm" name="id-1.10.15.15.2"></a><a class="indexterm" name="id-1.10.15.15.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>警告:</strong></span><span class="phrase"><strong>無法</strong></span>恢復刪除的任務。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.delete">
 <p class="title">如何刪除任務:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -44,7 +44,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.delete"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任務</span>清單畫面</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.manage.delete">父主題:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任務</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.export.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.export.html
index 7ceccc95b..318b07741 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.export.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理任務</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.export">
 <div class="titlepage"><div><div><h3 class="title">匯出任務</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">您可以使用 iCal 格式匯出任務。您可以與其他行事曆應用程式,以此格式交換任務。您可以從資料夾匯出單一任務或所有任務。</p>
+<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><a class="indexterm" name="id-1.10.15.13.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">您可以使用 iCal 格式匯出任務。您可以與其他行事曆應用程式,以此格式交換任務。您可以從資料夾匯出單一任務或所有任務。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.export.selected">
 <p class="title">如何匯出單一任務:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -58,12 +58,16 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.export"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html"><span class="phrase">任務</span>資料夾畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任務</span>清單畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">匯入任務</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.10.15.12.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下載個人資料</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.10.15.13.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">下載個人資料</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.manage.export">父主題:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任務</a></p>
 </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.html
index 4afa97760..d92ed5146 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.html
@@ -36,6 +36,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">將任務標記為已完成</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">修改任務的到期日</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">使用任務分類</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">將任務移至另一文件夾</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">修改任務確認</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">匯入任務</a></p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.import.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.import.html
index 4ebc57603..e35664412 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.import.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理任務</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.import">
 <div class="titlepage"><div><div><h3 class="title">匯入任務</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.11.2"></a><a class="indexterm" name="id-1.10.15.11.3"></a><a class="indexterm" name="id-1.10.15.11.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">您可以匯入 iCal 格式的任務。</p>
+<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">您可以匯入 iCal 格式的任務。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.import">
 <p class="title">如何從 iCal 檔案匯入任務:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -50,6 +50,9 @@
         </div>
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.import"></p>
+<p class="title">使用者介面:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html"><span class="phrase">任務</span>資料夾畫面</a></p></li></ul>
+<p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.export.html">匯出任務</a></p></li>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.markasdone.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.markasdone.html
index 370432f18..320d90115 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.markasdone.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.markasdone.html
@@ -46,7 +46,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.markasdone"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任務</span>清單畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.move.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.move.html
index ec80e91fe..e8d3d9dd5 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.move.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.move.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="使用者指南&gt;">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="管理任務">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="修改任務的到期日">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="使用任務分類">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.changestatus.html" title="修改任務確認">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="法律聲明">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only"></span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">前一頁</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">前一頁</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">起始頁</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">目錄</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">下一頁</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理任務</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.move">
 <div class="titlepage"><div><div><h3 class="title">將任務移至另一文件夾</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">您可以移動任務到其他資料夾。</p>
+<a class="indexterm" name="id-1.10.15.10.2"></a><a class="indexterm" name="id-1.10.15.10.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">您可以移動任務到其他資料夾。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.move">
 <p class="title">如何將任務移動到其他資料夾:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -46,7 +46,11 @@
 <p id="ox.appsuite.user.tip.tasks.manage.move">秘訣:您也可以於資料夾畫面拖曳物件,來移動至資料夾。</p>
 <p id="ox.appsuite.user.related.tasks.manage.move"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.foldertree.html"><span class="phrase">任務</span>資料夾畫面</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任務</span>清單畫面</a></p>
+</li></ul>
 <p> </p>
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">新增個人任務清單</a></p></li></ul>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.print.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.print.html
index fbc1453f0..6d15ef67f 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.print.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">管理任務</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.print">
 <div class="titlepage"><div><div><h3 class="title">列印任務</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">您可以列印單一任務或多個任務的資料。</p>
+<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">您可以列印單一任務或多個任務的資料。</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.print.data">
 <p class="title">如何列印任務資料:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -45,7 +45,10 @@
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.print"></p>
 <p class="title">使用者介面:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.toolbar.html"><span class="phrase">任務</span>工具列</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.list.html"><span class="phrase">任務</span>清單畫面</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.tasks.manage.print">父主題:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任務</a></p>
 </div>
           </div>
diff --git a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.search.html b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.search.html
index 7dee2e18f..27f2469b6 100644
--- a/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.search.html
+++ b/help/l10n/zh_TW/ox.appsuite.user.sect.tasks.search.html
@@ -81,7 +81,7 @@
 <p class="title">相關主題:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">查看任務</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">管理分類</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">使用任務分類</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.search">父主題:<a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">管理任務</a></p>
 </div>
-- 
GitLab