diff --git a/attachment_queue/i18n/attachment_queue.pot b/attachment_queue/i18n/attachment_queue.pot
index 4218f0a60..a5972a603 100644
--- a/attachment_queue/i18n/attachment_queue.pot
+++ b/attachment_queue/i18n/attachment_queue.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -44,6 +44,11 @@ msgstr ""
 msgid "Attachment Count"
 msgstr ""
 
+#. module: attachment_queue
+#: model:mail.template,name:attachment_queue.attachment_failure_notification
+msgid "Attachment Failure notification"
+msgstr ""
+
 #. module: attachment_queue
 #: model:ir.model,name:attachment_queue.model_attachment_queue
 msgid "Attachment Queue"
@@ -55,6 +60,7 @@ msgid "Attachment URL"
 msgstr ""
 
 #. module: attachment_queue
+#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue_reschedule__attachment_ids
 #: model_terms:ir.ui.view,arch_db:attachment_queue.view_attachment_queue_search
 msgid "Attachments"
 msgstr ""
@@ -71,13 +77,8 @@ msgid "Binary"
 msgstr ""
 
 #. module: attachment_queue
-#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__changeset_change_ids
-msgid "Changeset Changes"
-msgstr ""
-
-#. module: attachment_queue
-#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__changeset_ids
-msgid "Changesets"
+#: model_terms:ir.ui.view,arch_db:attachment_queue.view_reschedule_attachment
+msgid "Cancel"
 msgstr ""
 
 #. module: attachment_queue
@@ -97,23 +98,15 @@ msgstr ""
 msgid "Company"
 msgstr ""
 
-#. module: attachment_queue
-#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__count_pending_changeset_changes
-msgid "Count Pending Changeset Changes"
-msgstr ""
-
-#. module: attachment_queue
-#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__count_pending_changesets
-msgid "Count Pending Changesets"
-msgstr ""
-
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__create_uid
+#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue_reschedule__create_uid
 msgid "Created by"
 msgstr ""
 
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__create_date
+#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue_reschedule__create_date
 msgid "Created on"
 msgstr ""
 
@@ -139,6 +132,7 @@ msgstr ""
 
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__display_name
+#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue_reschedule__display_name
 msgid "Display Name"
 msgstr ""
 
@@ -199,11 +193,6 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
-#. module: attachment_queue
-#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__message_partner_ids
 msgid "Followers (Partners)"
@@ -214,14 +203,19 @@ msgstr ""
 msgid "Group By"
 msgstr ""
 
+#. module: attachment_queue
+#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__has_message
+msgid "Has Message"
+msgstr ""
+
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__id
+#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue_reschedule__id
 msgid "ID"
 msgstr ""
 
 #. module: attachment_queue
 #: model:ir.model.fields,help:attachment_queue.field_attachment_queue__message_needaction
-#: model:ir.model.fields,help:attachment_queue.field_attachment_queue__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
@@ -263,16 +257,19 @@ msgstr ""
 
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue____last_update
+#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue_reschedule____last_update
 msgid "Last Modified on"
 msgstr ""
 
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__write_uid
+#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue_reschedule__write_uid
 msgid "Last Updated by"
 msgstr ""
 
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__write_date
+#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue_reschedule__write_date
 msgid "Last Updated on"
 msgstr ""
 
@@ -286,6 +283,11 @@ msgstr ""
 msgid "Main Attachment"
 msgstr ""
 
+#. module: attachment_queue
+#: model_terms:ir.ui.view,arch_db:attachment_queue.view_attachment_queue_form
+msgid "Manual run"
+msgstr ""
+
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__message_has_error
 msgid "Message Delivery error"
@@ -331,11 +333,6 @@ msgstr ""
 msgid "Number of messages with delivery error"
 msgstr ""
 
-#. module: attachment_queue
-#: model:ir.model.fields,help:attachment_queue.field_attachment_queue__message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__original_id
 msgid "Original (unoptimized, unresized) attachment"
@@ -352,6 +349,22 @@ msgstr ""
 msgid "Pending"
 msgstr ""
 
+#. module: attachment_queue
+#: model_terms:ir.ui.view,arch_db:attachment_queue.view_reschedule_attachment
+msgid "Requeue Attachments"
+msgstr ""
+
+#. module: attachment_queue
+#: model_terms:ir.ui.view,arch_db:attachment_queue.view_attachment_queue_form
+#: model_terms:ir.ui.view,arch_db:attachment_queue.view_reschedule_attachment
+msgid "Reschedule"
+msgstr ""
+
+#. module: attachment_queue
+#: model:ir.actions.act_window,name:attachment_queue.action_reschedule_attachment
+msgid "Reschedule Attachment"
+msgstr ""
+
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__res_field
 msgid "Resource Field"
@@ -372,18 +385,6 @@ msgstr ""
 msgid "Resource Name"
 msgstr ""
 
-#. module: attachment_queue
-#: model_terms:ir.ui.view,arch_db:attachment_queue.view_attachment_queue_form
-msgid "Run"
-msgstr ""
-
-#. module: attachment_queue
-#: model:ir.actions.server,name:attachment_queue.cronjob_run_attachment_queue_ir_actions_server
-#: model:ir.cron,cron_name:attachment_queue.cronjob_run_attachment_queue
-#: model:ir.cron,name:attachment_queue.cronjob_run_attachment_queue
-msgid "Run Attachments Queue"
-msgstr ""
-
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__message_has_sms_error
 msgid "SMS Delivery error"
@@ -394,11 +395,6 @@ msgstr ""
 msgid "Set to Done"
 msgstr ""
 
-#. module: attachment_queue
-#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__smart_search
-msgid "Smart Search"
-msgstr ""
-
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__state
 #: model_terms:ir.ui.view,arch_db:attachment_queue.view_attachment_queue_search
@@ -417,12 +413,7 @@ msgstr ""
 
 #. module: attachment_queue
 #: model:mail.template,subject:attachment_queue.attachment_failure_notification
-msgid "The attachment ${object.name} has failed"
-msgstr ""
-
-#. module: attachment_queue
-#: model:ir.model.fields,help:attachment_queue.field_attachment_queue__res_model
-msgid "The database object this attachment will be attached to."
+msgid "The attachment {{object.name}} has failed"
 msgstr ""
 
 #. module: attachment_queue
@@ -433,8 +424,8 @@ msgid ""
 msgstr ""
 
 #. module: attachment_queue
-#: model:ir.model.fields,help:attachment_queue.field_attachment_queue__res_id
-msgid "The record id this is attached to."
+#: model_terms:ir.ui.view,arch_db:attachment_queue.view_reschedule_attachment
+msgid "The selected attachments will be rescheduled."
 msgstr ""
 
 #. module: attachment_queue
@@ -448,26 +439,11 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#. module: attachment_queue
-#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: attachment_queue
-#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__url
 msgid "Url"
 msgstr ""
 
-#. module: attachment_queue
-#: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__user_can_see_changeset
-msgid "User Can See Changeset"
-msgstr ""
-
 #. module: attachment_queue
 #: model:ir.model.fields,field_description:attachment_queue.field_attachment_queue__website_message_ids
 msgid "Website Messages"
@@ -478,9 +454,22 @@ msgstr ""
 msgid "Website communication history"
 msgstr ""
 
+#. module: attachment_queue
+#: model:ir.model,name:attachment_queue.model_attachment_queue_reschedule
+msgid "Wizard to reschedule a selection of attachments"
+msgstr ""
+
 #. module: attachment_queue
 #: model:ir.model.fields,help:attachment_queue.field_attachment_queue__type
 msgid ""
 "You can either upload a file from your computer or copy/paste an internet "
 "link to your file."
 msgstr ""
+
+#. module: attachment_queue
+#. odoo-python
+#: code:addons/attachment_queue/tests/test_models.py:0
+#: code:addons/attachment_queue/tests/test_models.py:0
+#, python-format
+msgid "boom"
+msgstr ""